diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-17 12:29:28 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-17 12:29:28 -0800 |
| commit | d1746da04faa07ebc597f721afbe4980593564eb (patch) | |
| tree | ee1cc25cc60108e07daa273f93900a2477c7a5ee /docs | |
| parent | 3ff39ca1afd2350219bc76fa779880294bd78f61 (diff) | |
| parent | 646c2a6630ee694c86a489426386de9c0c53269b (diff) | |
| download | cryptography-d1746da04faa07ebc597f721afbe4980593564eb.tar.gz cryptography-d1746da04faa07ebc597f721afbe4980593564eb.tar.bz2 cryptography-d1746da04faa07ebc597f721afbe4980593564eb.zip | |
Merge pull request #1532 from reaperhulk/fix-1531
add OpenSSH DSS public key loading
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index a9392c7b..b523c342 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -201,8 +201,8 @@ OpenSSH Public Key The format used by OpenSSH to store public keys, as specified in :rfc:`4253`. -Currently, only RSA public keys are supported. Any other type of key will -result in an exception being thrown. +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):: @@ -215,6 +215,9 @@ purposes):: ///ImSCGHQRvhwariN2tvZ6CBNSLh3iQgeB0AkyJlng7MXB2qYq/Ci2FUOryCX 2MzHvnbv testkey@localhost +DSA keys look almost identical but begin with ``ssh-dss`` rather than +``ssh-rsa``. + .. function:: load_ssh_public_key(data, backend) .. versionadded:: 0.7 @@ -224,8 +227,10 @@ purposes):: :param bytes data: The OpenSSH encoded key data. - :param backend: An - :class:`~cryptography.hazmat.backends.interfaces.RSABackend` provider. + :param backend: A backend providing + :class:`~cryptography.hazmat.backends.interfaces.RSABackend` or + :class:`~cryptography.hazmat.backends.interfaces.DSABackend` depending + on key type. :returns: A new instance of a public key type. |