1 files changed, 1 insertions, 47 deletions
diff --git a/tools/fetchallcerts.py b/tools/fetchallcerts.py
index d2afb6a..3b8c2f1 100755
--- a/tools/fetchallcerts.py
+++ b/tools/fetchallcerts.py
@@ -49,52 +49,6 @@ def print_layer(layer):
     for entry in layer:
         print base64.b16encode(entry)
 
-def get_hash_from_certfile(cert):
-    for line in cert.split("\n"):
-        if line.startswith("-----"):
-            return None
-        if line.startswith("Leafhash: "):
-            return base64.b16decode(line[len("Leafhash: "):])
-    return None
-
-def get_certs_from_zipfiles(zipfiles, firstleaf, lastleaf):
-    for i in range(firstleaf, lastleaf + 1):
-        try:
-            yield zipfiles[i / 10000].read("%08d" % i)
-        except KeyError:
-            return
-
-def get_merkle_hash_64k(store, blocknumber):
-    hashfilename = "%s/%04x.64khash" % (store, blocknumber)
-    try:
-        hash = base64.b16decode(open(hashfilename).read())
-        assert len(hash) == 32
-        return ("hash", hash)
-    except IOError:
-        pass
-    firstleaf = blocknumber * 65536
-    lastleaf = firstleaf + 65535
-    firstfile = firstleaf / 10000
-    lastfile = lastleaf / 10000
-    zipfiles = {}
-    for i in range(firstfile, lastfile + 1):
-        try:
-            zipfiles[i] = zipfile.ZipFile("%s/%04d.zip" % (store, i))
-        except IOError:
-            break
-    certs = get_certs_from_zipfiles(zipfiles, firstleaf, lastleaf)
-    layer0 = [get_hash_from_certfile(cert) for cert in certs]
-    tree = build_merkle_tree(layer0)
-    calculated_hash = tree[-1][0]
-    for zf in zipfiles.values():
-        zf.close()
-    if len(layer0) != 65536:
-        return ("incomplete", (len(layer0), calculated_hash))
-    f = open(hashfilename, "w")
-    f.write(base64.b16encode(calculated_hash))
-    f.close()
-    return ("hash", calculated_hash)
-
 sth = get_sth(args.baseurl)
 check_sth_signature(args.baseurl, sth)
 tree_size = sth["tree_size"]
@@ -195,7 +149,7 @@ else:
         zf.close()
 
     for blocknumber in range(ncerts / 65536, (tree_size / 65536) + 1):
-        (resulttype, result) = get_merkle_hash_64k(args.store, blocknumber)
+        (resulttype, result) = get_merkle_hash_64k(args.store, blocknumber, write_to_cache=True)
         if resulttype == "incomplete":
             (incompletelength, hash) = result
             ncerts = blocknumber * 65536 + incompletelength