summaryrefslogtreecommitdiff
path: root/tools/certtools.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-09-26 14:50:10 +0200
committerLinus Nordberg <linus@nordberg.se>2014-10-08 15:02:49 +0200
commite54e051600fc7f46fb7eafce74d311a61d5bd823 (patch)
tree4a922ed507f1dad4ecd2704020ff539e3c5c0d26 /tools/certtools.py
parent294ac576ab050b6c46c011825d89337794404f66 (diff)
Simplify submitcert
Diffstat (limited to 'tools/certtools.py')
-rw-r--r--tools/certtools.py48
1 files changed, 40 insertions, 8 deletions
diff --git a/tools/certtools.py b/tools/certtools.py
index 13dad17..fe345cd 100644
--- a/tools/certtools.py
+++ b/tools/certtools.py
@@ -8,6 +8,20 @@ import sys
import hashlib
import ecdsa
+publickeys = {
+ "https://ct.googleapis.com/pilot/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTD"
+ "M0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
+
+ "https://127.0.0.1:8080/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
+ "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
+
+ "https://flimsy.ct.nordu.net/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
+ "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
+}
+
def get_cert_info(s):
p = subprocess.Popen(
["openssl", "x509", "-noout", "-subject", "-issuer", "-inform", "der"],
@@ -15,7 +29,8 @@ def get_cert_info(s):
stderr=subprocess.PIPE)
parsed = p.communicate(s)
if parsed[1]:
- print "error:", parsed[1]
+ print "ERROR:", parsed[1]
+ sys.exit(1)
result = {}
for line in parsed[0].split("\n"):
(key, sep, value) = line.partition("=")
@@ -34,7 +49,7 @@ def get_certs_from_file(certfile):
cert = ""
incert = True
elif line == "-----END CERTIFICATE-----":
- certs.append(cert)
+ certs.append(base64.decodestring(cert))
incert = False
elif incert:
cert += line
@@ -49,7 +64,6 @@ def get_root_cert(issuer):
for accepted_cert in accepted_certs:
subject = get_cert_info(base64.decodestring(accepted_cert))["subject"]
if subject == issuer:
- print "found root cert"
root_cert = base64.decodestring(accepted_cert)
return root_cert
@@ -62,12 +76,11 @@ def get_proof_by_hash(baseurl, hash, tree_size):
try:
params = urllib.urlencode({"hash":base64.b64encode(hash),
"tree_size":tree_size})
- print params
result = \
urllib2.urlopen(baseurl + "ct/v1/get-proof-by-hash?" + params).read()
return json.loads(result)
except urllib2.HTTPError, e:
- print e.read()
+ print "ERROR:", e.read()
sys.exit(1)
def tls_array(data, length_len):
@@ -90,7 +103,7 @@ def add_chain(baseurl, submission):
return json.loads(urllib2.urlopen(baseurl + "ct/v1/add-chain",
json.dumps(submission)).read())
except urllib2.HTTPError, e:
- print e.read()
+ print "ERROR:", e.read()
sys.exit(1)
def get_entries(baseurl, start, end):
@@ -99,7 +112,7 @@ def get_entries(baseurl, start, end):
result = urllib2.urlopen(baseurl + "ct/v1/get-entries?" + params).read()
return json.loads(result)
except urllib2.HTTPError, e:
- print e.read()
+ print "ERROR:", e.read()
sys.exit(1)
def decode_certificate_chain(packed_certchain):
@@ -118,7 +131,8 @@ def decode_signature(signature):
assert rest == ""
return (hash_alg, signature_alg, unpacked_signature)
-def check_signature(publickey, leafcert, sct):
+def check_signature(baseurl, leafcert, sct):
+ publickey = base64.decodestring(publickeys[baseurl])
calculated_logid = hashlib.sha256(publickey).digest()
received_logid = base64.decodestring(sct["id"])
assert calculated_logid == received_logid, \
@@ -146,3 +160,21 @@ def check_signature(publickey, leafcert, sct):
vk = ecdsa.VerifyingKey.from_der(publickey)
vk.verify(unpacked_signature, signed_struct, hashfunc=hashlib.sha256,
sigdecode=ecdsa.util.sigdecode_der)
+
+def pack_mtl(timestamp, leafcert):
+ entry_type = struct.pack(">H", 0)
+ extensions = ""
+
+ timestamped_entry = struct.pack(">Q", timestamp) + entry_type + \
+ tls_array(leafcert, 3) + tls_array(extensions, 2)
+ version = struct.pack(">b", 0)
+ leaf_type = struct.pack(">b", 0)
+ merkle_tree_leaf = version + leaf_type + timestamped_entry
+ return merkle_tree_leaf
+
+def get_leaf_hash(merkle_tree_leaf):
+ leaf_hash = hashlib.sha256()
+ leaf_hash.update(struct.pack(">b", 0))
+ leaf_hash.update(merkle_tree_leaf)
+
+ return leaf_hash.digest()