From b2f5ac9a0a5288222fe98252202e677107c98b95 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Fri, 15 Feb 2008 13:16:43 -0700 Subject: [PATCH] Merge patch which switches to SHA-256d with patch that adds punctuation and capitalization to the comment about the hash value. --- src/allmydata/util/hashutil.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/allmydata/util/hashutil.py b/src/allmydata/util/hashutil.py index 6f6f90ea5..add0a0f18 100644 --- 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)