aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-27 10:18:04 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-27 10:18:26 -0500
commitcff58d8d28ad15a8f7abaaa6ff5320a7d1f5b2f9 (patch)
tree8645894150322408d44d200c6e303fa20e868f99 /cryptography
parente04f6fc6fcc5105ce66279eacd9df0683d538ee9 (diff)
downloadcryptography-cff58d8d28ad15a8f7abaaa6ff5320a7d1f5b2f9.tar.gz
cryptography-cff58d8d28ad15a8f7abaaa6ff5320a7d1f5b2f9.tar.bz2
cryptography-cff58d8d28ad15a8f7abaaa6ff5320a7d1f5b2f9.zip
EC public/private key loader functions try deprecated as fallback
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/primitives/asymmetric/ec.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/cryptography/hazmat/primitives/asymmetric/ec.py b/cryptography/hazmat/primitives/asymmetric/ec.py
index 3893cc2f..6dcf39cf 100644
--- a/cryptography/hazmat/primitives/asymmetric/ec.py
+++ b/cryptography/hazmat/primitives/asymmetric/ec.py
@@ -238,7 +238,10 @@ class EllipticCurvePublicNumbers(object):
self._curve = curve
def public_key(self, backend):
- return backend.load_elliptic_curve_public_numbers(self)
+ try:
+ return backend.load_elliptic_curve_public_numbers(self)
+ except AttributeError:
+ return backend.elliptic_curve_public_key_from_numbers(self)
@property
def curve(self):
@@ -268,7 +271,10 @@ class EllipticCurvePrivateNumbers(object):
self._public_numbers = public_numbers
def private_key(self, backend):
- return backend.load_elliptic_curve_private_numbers(self)
+ try:
+ return backend.load_elliptic_curve_private_numbers(self)
+ except AttributeError:
+ return backend.elliptic_curve_private_key_from_numbers(self)
@property
def private_value(self):