address initial review comments

This commit is contained in:
Paul Kehrer 2013-10-23 09:41:49 -05:00
parent 6122d129e9
commit 00dd509f18
2 changed files with 4 additions and 4 deletions

View file

@ -283,8 +283,7 @@ class HMACs(object):
def finalize_ctx(self, ctx, digest_size):
buf = self._backend.ffi.new("unsigned char[]", digest_size)
buflen = self._backend.ffi.new("unsigned int *")
buflen[0] = digest_size
buflen = self._backend.ffi.new("unsigned int *", digest_size)
res = self._backend.lib.HMAC_Final(ctx, buf, buflen)
assert res != 0
self._backend.lib.HMAC_CTX_cleanup(ctx)

View file

@ -127,6 +127,7 @@ def load_openssl_vectors(vector_data):
def load_hash_vectors(vector_data):
vectors = []
key, msg, md = None, None, None
for line in vector_data:
line = line.strip()
@ -151,9 +152,9 @@ def load_hash_vectors(vector_data):
elif line.startswith("MD"):
md = line.split(" = ")[1]
# after MD is found the Msg+MD (+ potential key) tuple is complete
try:
if key is not None:
vectors.append((msg, md, key))
except:
else:
vectors.append((msg, md))
else:
raise ValueError("Unknown line in hash vector")