diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-02-27 20:44:06 +0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2019-02-27 07:44:06 -0500 |
commit | 1f4e64615836dc59968ca104b19461caee477f3f (patch) | |
tree | e4ee8644954c3ced0e2b6fe621b3ea3f431f996c /src/cryptography/hazmat/backends/openssl/backend.py | |
parent | 871e97a89f0276e57c01f7692111fca42e819b59 (diff) | |
download | cryptography-1f4e64615836dc59968ca104b19461caee477f3f.tar.gz cryptography-1f4e64615836dc59968ca104b19461caee477f3f.tar.bz2 cryptography-1f4e64615836dc59968ca104b19461caee477f3f.zip |
support ed25519 openssh public keys (#4785)
* support ed25519 openssh public keys
* don't need this check
Diffstat (limited to 'src/cryptography/hazmat/backends/openssl/backend.py')
-rw-r--r-- | src/cryptography/hazmat/backends/openssl/backend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py index eab60778..b040b809 100644 --- a/src/cryptography/hazmat/backends/openssl/backend.py +++ b/src/cryptography/hazmat/backends/openssl/backend.py @@ -38,7 +38,7 @@ from cryptography.hazmat.backends.openssl.ec import ( _EllipticCurvePrivateKey, _EllipticCurvePublicKey ) from cryptography.hazmat.backends.openssl.ed25519 import ( - _ED25519_KEY_SIZE, _Ed25519PrivateKey, _Ed25519PublicKey + _Ed25519PrivateKey, _Ed25519PublicKey ) from cryptography.hazmat.backends.openssl.ed448 import ( _ED448_KEY_SIZE, _Ed448PrivateKey, _Ed448PublicKey @@ -70,7 +70,7 @@ from cryptography.hazmat.backends.openssl.x509 import ( ) from cryptography.hazmat.bindings.openssl import binding from cryptography.hazmat.primitives import hashes, serialization -from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa +from cryptography.hazmat.primitives.asymmetric import dsa, ec, ed25519, rsa from cryptography.hazmat.primitives.asymmetric.padding import ( MGF1, OAEP, PKCS1v15, PSS ) @@ -2212,7 +2212,7 @@ class Backend(object): def ed25519_load_public_bytes(self, data): utils._check_bytes("data", data) - if len(data) != _ED25519_KEY_SIZE: + if len(data) != ed25519._ED25519_KEY_SIZE: raise ValueError("An Ed25519 public key is 32 bytes long") evp_pkey = self._lib.EVP_PKEY_new_raw_public_key( @@ -2224,7 +2224,7 @@ class Backend(object): return _Ed25519PublicKey(self, evp_pkey) def ed25519_load_private_bytes(self, data): - if len(data) != _ED25519_KEY_SIZE: + if len(data) != ed25519._ED25519_KEY_SIZE: raise ValueError("An Ed25519 private key is 32 bytes long") utils._check_byteslike("data", data) |