aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-25 07:40:24 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-26 16:02:37 -0500
commitfc5f4f97c52b07f0345efd11b03b7996ff1168d6 (patch)
tree4bf12245db600fcf6484f45942c75f8b29f783c1 /cryptography
parentc5e43429c26dd1b1baddeec9fddf3cb5d98bcfc1 (diff)
downloadcryptography-fc5f4f97c52b07f0345efd11b03b7996ff1168d6.tar.gz
cryptography-fc5f4f97c52b07f0345efd11b03b7996ff1168d6.tar.bz2
cryptography-fc5f4f97c52b07f0345efd11b03b7996ff1168d6.zip
CURVE_TYPES back to private, removed unneeded point creation
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py5
-rw-r--r--cryptography/hazmat/primitives/asymmetric/ec.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 65fcbcb1..46ecde15 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -492,9 +492,6 @@ class Backend(object):
curve = self._sn_to_elliptic_curve(sn)
- point = self._lib.EC_POINT_new(group)
- assert point != self._ffi.NULL
- point = self._ffi.gc(point, self._lib.EC_POINT_free)
return _EllipticCurvePrivateKey(self, ec_cdata, curve)
else:
raise UnsupportedAlgorithm("Unsupported key type.")
@@ -1066,7 +1063,7 @@ class Backend(object):
def _sn_to_elliptic_curve(self, sn):
try:
- return ec.CURVE_TYPES[sn]()
+ return ec._CURVE_TYPES[sn]()
except KeyError:
raise UnsupportedAlgorithm(
"{0} is not a supported elliptic curve".format(sn),
diff --git a/cryptography/hazmat/primitives/asymmetric/ec.py b/cryptography/hazmat/primitives/asymmetric/ec.py
index 813e2c9e..98eca276 100644
--- a/cryptography/hazmat/primitives/asymmetric/ec.py
+++ b/cryptography/hazmat/primitives/asymmetric/ec.py
@@ -184,7 +184,7 @@ class SECP192R1(object):
return 192
-CURVE_TYPES = {
+_CURVE_TYPES = {
"prime192v1": SECP192R1,
"prime256v1": SECP256R1,