adding more info to content measurement

1 files changed, 11 insertions, 1 deletions

diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py
index ba85a71..608c655 100755
--- a/monitor/josef_experimental.py
+++ b/monitor/josef_experimental.py
@@ -133,6 +133,7 @@ def parse_entry(e, idx, log):
 
     s = log["name"]
     s += sep + str(idx) # index
+    s += sep + e["serial"] # cert serial number
     s += sep + e["subject"] # Subject
     if "SAN" in e:
         s += sep + e["SAN"] # SAN
@@ -142,6 +143,7 @@ def parse_entry(e, idx, log):
     s += sep + e["chain_length"] # path length
     s += sep + e["sig_algorithm"] # Signature algothithm
     s += sep + e["pubkey_algorithm"] # pubkey algorithm
+    s += sep + e["keylength"]
     s += sep + e["not_before"] # valid from
     s += sep + e["not_after"] # valid to
     s += sep + e["validation"] # EV?
@@ -181,9 +183,17 @@ if __name__ == '__main__':
                     print res
 
 
+    # Experimental
+    # if True:
+    #     log = CTLOGS[0]
+    #     entries = get_entries(log["url"],1000 ,1001)["entries"]
+    #     entry = entries[0]
+    #     res = check_domain_extended(entry)
+    #     print parse_entry(res,0,log)
+
     # Data gathering for Niklas
     if True:
-        logs = [CTLOGS[7]]
+        logs = [CTLOGS[9]]
         for log in logs:
             filename = log["name"] + "_content.txt"
             if os.path.exists(filename):