commit 00dd509f180b6229cfd4b913274a94df3bc05a00
author Paul Kehrer <paul.l.kehrer@gmail.com> Wed Oct 23 09:41:49 2013 -0500
committer Paul Kehrer <paul.l.kehrer@gmail.com> Mon Oct 28 17:34:37 2013 -0500
tree 1901c5c6d715b34a36f5b7c1e54f4c952c51d31a
parent 6122d129e97efc49390bd2c41f644b85b1056cce

address initial review comments

cryptography/hazmat/bindings/openssl/backend.py

diff --git a/cryptography/hazmat/bindings/openssl/backend.py b/cryptography/hazmat/bindings/openssl/backend.py
index db5a9e1..635d6a0 100644
--- a/cryptography/hazmat/bindings/openssl/backend.py
+++ b/cryptography/hazmat/bindings/openssl/backend.py
@@ -283,8 +283,7 @@
 
     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)

tests/utils.py

diff --git a/tests/utils.py b/tests/utils.py
index a97cdf7..25291d5 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -127,6 +127,7 @@
 
 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 @@
         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")