diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-01-05 09:58:35 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-01-05 10:58:35 -0500 |
| commit | bade58f1566683cb5b110b341e01e3d3397b972f (patch) | |
| tree | 0f920d42af3ea40ce5856cb5abecab840fa89f84 /src/cryptography/hazmat | |
| parent | 754c693bc76e91150ad06de13f74c42b48f59231 (diff) | |
| download | cryptography-bade58f1566683cb5b110b341e01e3d3397b972f.tar.gz | |
just a quick confirmation that it really is an x25519 evp key (#4070)
* just a quick confirmation that it really is an x25519 evp key
* openssl assert. take that python -O
Diffstat (limited to 'src/cryptography/hazmat')
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 3 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index ca1aafe07..c0b3afe0f 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -1914,6 +1914,9 @@ class Backend(object): evp_pkey = backend._lib.d2i_PrivateKey_bio(bio.bio, self._ffi.NULL) self.openssl_assert(evp_pkey != self._ffi.NULL) evp_pkey = self._ffi.gc(evp_pkey, self._lib.EVP_PKEY_free) + self.openssl_assert( + self._lib.EVP_PKEY_id(evp_pkey) == self._lib.EVP_PKEY_X25519 + ) return _X25519PrivateKey(self, evp_pkey) def x25519_generate_key(self): diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 8bc74c979..b87ae9066 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -232,6 +232,7 @@ def cryptography_has_x509_store_ctx_get_issuer(): def cryptography_has_x25519(): return [ + "EVP_PKEY_X25519", "NID_X25519", ] |