Merge patch which switches to SHA-256d with patch that adds punctuation and capitaliz...

diff --git a/src/allmydata/util/hashutil.py b/src/allmydata/util/hashutil.py
index 6f6f90ea58e736f50aed413b3e5be9e8f8d253f4..add0a0f18258866e31c3d66c29a5dee12c275a5b 100644 (file)
--- a/src/allmydata/util/hashutil.py
+++ b/src/allmydata/util/hashutil.py
@@ -130,9 +130,7 @@ def plaintext_segment_hasher():
 KEYLEN = 16
 
 def content_hash_key_hash(k, n, segsize, data):
-    # this is defined to return a 16-byte AES key. We use SHA-256d here..
-    # we'd like to use it everywhere, but we're only switching algorithms
-    # when we can hide the compatibility breaks in other necessary changes.
+    # This is defined to return a 16-byte AES key.
     param_tag = netstring("%d,%d,%d" % (k, n, segsize))
     tag = CONTENT_HASH_KEY_TAG + param_tag
     h = tagged_hash(tag, data, KEYLEN)