diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-09-21 19:59:43 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-09-21 20:59:43 -0400 |
| commit | eba71712349f275bec51e3176c51ecbfa883e066 (patch) | |
| tree | ddd08fdf44512de9e0abd582fcb29611f393058c | |
| parent | a5865d9b630df7586785b683ed145b977ad7e0c4 (diff) | |
| download | cryptography-eba71712349f275bec51e3176c51ecbfa883e066.tar.gz cryptography-eba71712349f275bec51e3176c51ecbfa883e066.tar.bz2 cryptography-eba71712349f275bec51e3176c51ecbfa883e066.zip | |
fix warnings in cffi 1.8.3 due to wrong buffer types (#3155)
5 files changed, 6 insertions, 6 deletions
diff --git a/src/cryptography/hazmat/backends/commoncrypto/backend.py b/src/cryptography/hazmat/backends/commoncrypto/backend.py index 1205b6a6..838e5727 100644 --- a/src/cryptography/hazmat/backends/commoncrypto/backend.py +++ b/src/cryptography/hazmat/backends/commoncrypto/backend.py @@ -133,7 +133,7 @@ class Backend(object): def derive_pbkdf2_hmac(self, algorithm, length, salt, iterations, key_material): alg_enum = self._supported_pbkdf2_hmac_algorithms[algorithm.name] - buf = self._ffi.new("char[]", length) + buf = self._ffi.new("uint8_t[]", length) res = self._lib.CCKeyDerivationPBKDF( self._lib.kCCPBKDF2, key_material, diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index 955b1977..7efab2be 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -307,7 +307,7 @@ class Backend(object): def derive_pbkdf2_hmac(self, algorithm, length, salt, iterations, key_material): - buf = self._ffi.new("char[]", length) + buf = self._ffi.new("unsigned char[]", length) evp_md = self._lib.EVP_get_digestbyname( algorithm.name.encode("ascii")) self.openssl_assert(evp_md != self._ffi.NULL) diff --git a/src/cryptography/hazmat/backends/openssl/ec.py b/src/cryptography/hazmat/backends/openssl/ec.py index 1e45e402..aa5267b4 100644 --- a/src/cryptography/hazmat/backends/openssl/ec.py +++ b/src/cryptography/hazmat/backends/openssl/ec.py @@ -102,7 +102,7 @@ class _ECDSASignatureContext(object): max_size = self._backend._lib.ECDSA_size(ec_key) self._backend.openssl_assert(max_size > 0) - sigbuf = self._backend._ffi.new("char[]", max_size) + sigbuf = self._backend._ffi.new("unsigned char[]", max_size) siglen_ptr = self._backend._ffi.new("unsigned int[]", 1) res = self._backend._lib.ECDSA_sign( 0, diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py index a85f7da1..ba830dd9 100644 --- a/src/cryptography/hazmat/backends/openssl/rsa.py +++ b/src/cryptography/hazmat/backends/openssl/rsa.py @@ -103,7 +103,7 @@ def _enc_dec_rsa_pkey_ctx(backend, key, data, padding_enum, padding): backend.openssl_assert(res > 0) outlen = backend._ffi.new("size_t *", buf_size) - buf = backend._ffi.new("char[]", buf_size) + buf = backend._ffi.new("unsigned char[]", buf_size) res = crypt(pkey_ctx, buf, outlen, data, len(data)) if res <= 0: _handle_rsa_enc_dec_error(backend, key) diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 4ec8d84e..bf794c3a 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -182,7 +182,7 @@ class TestOpenSSL(object): assert size == length return sample_data monkeypatch.setattr(os, "urandom", notrandom) - buf = backend._ffi.new("char[]", length) + buf = backend._ffi.new("unsigned char[]", length) backend._lib.RAND_bytes(buf, length) assert backend._ffi.buffer(buf)[0:length] == sample_data @@ -247,7 +247,7 @@ class TestOpenSSLRandomEngine(object): def test_osrandom_sanity_check(self): # This test serves as a check against catastrophic failure. - buf = backend._ffi.new("char[]", 500) + buf = backend._ffi.new("unsigned char[]", 500) res = backend._lib.RAND_bytes(buf, 500) assert res == 1 assert backend._ffi.buffer(buf)[:] != "\x00" * 500 |