aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/asymmetric
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-12-24 14:36:14 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-12-24 14:36:14 -0800
commit6db8f988b8f920b7ea7786479e00b8b2b8a96f70 (patch)
treeeea7d89bc0b33e1e1abbb9cb9678bb1a9aca6690 /docs/hazmat/primitives/asymmetric
parent2c2d182cf781361117402f5dd0d8f9ee5387fd1a (diff)
downloadcryptography-6db8f988b8f920b7ea7786479e00b8b2b8a96f70.tar.gz
cryptography-6db8f988b8f920b7ea7786479e00b8b2b8a96f70.tar.bz2
cryptography-6db8f988b8f920b7ea7786479e00b8b2b8a96f70.zip
Update the docs a bit
Diffstat (limited to 'docs/hazmat/primitives/asymmetric')
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index b523c342..f0f18fd8 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -201,9 +201,6 @@ OpenSSH Public Key
The format used by OpenSSH to store public keys, as specified in :rfc:`4253`.
-Currently, only RSA and DSA public keys are supported. Any other type of key
-will result in an exception being thrown.
-
An example RSA key in OpenSSH format (line breaks added for formatting
purposes)::
@@ -216,7 +213,8 @@ purposes)::
2MzHvnbv testkey@localhost
DSA keys look almost identical but begin with ``ssh-dss`` rather than
-``ssh-rsa``.
+``ssh-rsa``. ECDSA keys have a slightly different format, they begin with
+``ecdsa-sha2-{curve}``.
.. function:: load_ssh_public_key(data, backend)
@@ -228,9 +226,10 @@ DSA keys look almost identical but begin with ``ssh-dss`` rather than
:param bytes data: The OpenSSH encoded key data.
:param backend: A backend providing
- :class:`~cryptography.hazmat.backends.interfaces.RSABackend` or
- :class:`~cryptography.hazmat.backends.interfaces.DSABackend` depending
- on key type.
+ :class:`~cryptography.hazmat.backends.interfaces.RSABackend`,
+ :class:`~cryptography.hazmat.backends.interfaces.DSABackend`, or
+ :class:`~cryptography.hazmat.backends.interfaces.EllipticCurveBackend`
+ depending on the key's type.
:returns: A new instance of a public key type.