diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-01-16 22:07:17 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-01-16 23:07:17 -0500 |
| commit | b480d2d4dbc6339f476d49faa0900eae2f4c1d07 (patch) | |
| tree | 6e2345d51feefdec0abbdc878b44b84bdb859628 /src | |
| parent | bfc6fae472457c37abafb3818b44f0bd639be6cc (diff) | |
| download | cryptography-b480d2d4dbc6339f476d49faa0900eae2f4c1d07.tar.gz cryptography-b480d2d4dbc6339f476d49faa0900eae2f4c1d07.tar.bz2 cryptography-b480d2d4dbc6339f476d49faa0900eae2f4c1d07.zip | |
support byteslike in hash updates (#4702)
This is needed to handle keying material in some of the KDFs
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/hashes.py | 5 | ||||
| -rw-r--r-- | src/cryptography/hazmat/primitives/hashes.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/hashes.py b/src/cryptography/hazmat/backends/openssl/hashes.py index c39f57dc..e9a50705 100644 --- a/src/cryptography/hazmat/backends/openssl/hashes.py +++ b/src/cryptography/hazmat/backends/openssl/hashes.py @@ -47,7 +47,10 @@ class _HashContext(object): return _HashContext(self._backend, self.algorithm, ctx=copied_ctx) def update(self, data): - res = self._backend._lib.EVP_DigestUpdate(self._ctx, data, len(data)) + data_ptr = self._backend._ffi.from_buffer(data) + res = self._backend._lib.EVP_DigestUpdate( + self._ctx, data_ptr, len(data) + ) self._backend.openssl_assert(res != 0) def finalize(self): diff --git a/src/cryptography/hazmat/primitives/hashes.py b/src/cryptography/hazmat/primitives/hashes.py index 35b7d646..0d6e47fb 100644 --- a/src/cryptography/hazmat/primitives/hashes.py +++ b/src/cryptography/hazmat/primitives/hashes.py @@ -82,7 +82,7 @@ class Hash(object): def update(self, data): if self._ctx is None: raise AlreadyFinalized("Context was already finalized.") - utils._check_bytes("data", data) + utils._check_byteslike("data", data) self._ctx.update(data) def copy(self): |