aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-22 23:27:15 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-06-22 23:27:15 -0500
commit370c4da9fe2662d07152a4b78bc09ae45f34decb (patch)
tree3747182affec9eee4a43498af6ddc2c6923e803c /src
parentc952fb18053afc59104e05ea0e35c85460402d59 (diff)
downloadcryptography-370c4da9fe2662d07152a4b78bc09ae45f34decb.tar.gz
cryptography-370c4da9fe2662d07152a4b78bc09ae45f34decb.tar.bz2
cryptography-370c4da9fe2662d07152a4b78bc09ae45f34decb.zip
fix ec_cdata_to_evp_pkey bug
We weren't actually returning the object and the tests weren't catching it because we didn't try to use the evp_pkey property in the tests. The added test confirms it actually works.
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index 2fe88327..4d469c40 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -1073,6 +1073,7 @@ class Backend(object):
evp_pkey = self._ffi.gc(evp_pkey, self._lib.EVP_PKEY_free)
res = self._lib.EVP_PKEY_set1_EC_KEY(evp_pkey, ec_cdata)
assert res == 1
+ return evp_pkey
def _elliptic_curve_to_nid(self, curve):
"""