[merge] Disable all things verifycert when --noverify.

1 files changed, 5 insertions, 3 deletions

diff --git a/tools/merge.py b/tools/merge.py
index 69d503b..6e95206 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -224,8 +224,9 @@ for hash in new_entries:
             entries_to_fetch[storagenode["name"]].append(hash)
             break
 
-verifycert = subprocess.Popen([paths["verifycert_bin"], paths["known_roots"]],
-                              stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+if not noverify:
+    verifycert = subprocess.Popen([paths["verifycert_bin"], paths["known_roots"]],
+                                stdin=subprocess.PIPE, stdout=subprocess.PIPE)
 
 added_entries = 0
 for storagenode in storagenodes:
@@ -251,7 +252,8 @@ timing_point(timing, "add entries")
 print >>sys.stderr, "added", added_entries, "entries"
 sys.stderr.flush()
 
-verifycert.communicate(struct.pack("I", 0))
+if not noverify:
+    verifycert.communicate(struct.pack("I", 0))
 
 tree = build_merkle_tree(logorder)
 tree_size = len(logorder)