diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-24 22:42:15 -0700 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-24 22:42:15 -0700 |
commit | 30e409d73f846dbf5cc40c77656965b382356d3e (patch) | |
tree | 0999fa7792de8ed01bd40ecb9f3796a8e1ad2eb5 /src | |
parent | 06f6a4e7b2e89e588c75c4bf755c1bd0563f9e28 (diff) | |
parent | c360dee08d1661f5bb7a14da6f0e98f33804ff02 (diff) | |
download | cryptography-30e409d73f846dbf5cc40c77656965b382356d3e.tar.gz cryptography-30e409d73f846dbf5cc40c77656965b382356d3e.tar.bz2 cryptography-30e409d73f846dbf5cc40c77656965b382356d3e.zip |
Merge pull request #1577 from alex/remove-deprecated
Removed some deprecated code
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptography/hazmat/primitives/asymmetric/ec.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/cryptography/hazmat/primitives/asymmetric/ec.py b/src/cryptography/hazmat/primitives/asymmetric/ec.py index 202f1c97..c9124249 100644 --- a/src/cryptography/hazmat/primitives/asymmetric/ec.py +++ b/src/cryptography/hazmat/primitives/asymmetric/ec.py @@ -152,10 +152,7 @@ class EllipticCurvePublicNumbers(object): self._curve = curve def public_key(self, backend): - try: - return backend.load_elliptic_curve_public_numbers(self) - except AttributeError: - return backend.elliptic_curve_public_key_from_numbers(self) + return backend.load_elliptic_curve_public_numbers(self) curve = utils.read_only_property("_curve") x = utils.read_only_property("_x") @@ -191,10 +188,7 @@ class EllipticCurvePrivateNumbers(object): self._public_numbers = public_numbers def private_key(self, backend): - try: - return backend.load_elliptic_curve_private_numbers(self) - except AttributeError: - return backend.elliptic_curve_private_key_from_numbers(self) + return backend.load_elliptic_curve_private_numbers(self) private_value = utils.read_only_property("_private_value") public_numbers = utils.read_only_property("_public_numbers") |