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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index dbb2bb63..84867efb 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -376,10 +376,6 @@ DSA keys look almost identical but begin with ``ssh-dss`` rather than Deserialize a public key from OpenSSH (:rfc:`4253`) encoded data to an instance of the public key type for the specified backend. - .. note:: - - Currently Ed25519 keys are not supported. - :param bytes data: The OpenSSH encoded key data. :param backend: A backend which implements @@ -391,8 +387,9 @@ DSA keys look almost identical but begin with ``ssh-dss`` rather than :returns: One of :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey`, :class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey`, - or :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey` + , or + :class:`~cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PublicKey`, depending on the contents of ``data``. :raises ValueError: If the OpenSSH data could not be properly decoded or |