Merge pull request #698 from reaperhulk/hash-fix
Be more pedantic in checking the written size of the hash digest
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index f3febd9..aa6dc83 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -594,12 +594,12 @@
def finalize(self):
buf = self._backend._ffi.new("unsigned char[]",
self.algorithm.digest_size)
- buflen = self._backend._ffi.new("unsigned int *",
- self.algorithm.digest_size)
+ outlen = self._backend._ffi.new("unsigned int *")
res = self._backend._lib.Cryptography_HMAC_Final(
- self._ctx, buf, buflen
+ self._ctx, buf, outlen
)
assert res != 0
+ assert outlen[0] == self.algorithm.digest_size
self._backend._lib.HMAC_CTX_cleanup(self._ctx)
return self._backend._ffi.buffer(buf)[:]
diff --git a/cryptography/hazmat/bindings/openssl/hmac.py b/cryptography/hazmat/bindings/openssl/hmac.py
index 5f9e094..4b81c9d 100644
--- a/cryptography/hazmat/bindings/openssl/hmac.py
+++ b/cryptography/hazmat/bindings/openssl/hmac.py
@@ -55,11 +55,11 @@
}
int Cryptography_HMAC_Final(HMAC_CTX *ctx, unsigned char *digest,
- unsigned int *digest_len) {
+ unsigned int *outlen) {
#if OPENSSL_VERSION_NUMBER >= 0x010000000
- return HMAC_Final(ctx, digest, digest_len);
+ return HMAC_Final(ctx, digest, outlen);
#else
- HMAC_Final(ctx, digest, digest_len);
+ HMAC_Final(ctx, digest, outlen);
return 1;
#endif
}