diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-17 08:42:42 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-12-17 08:42:42 -0600 |
| commit | 2cfa45fd168273eaf3b616730255fc063faf5257 (patch) | |
| tree | 38f5fedbf4e5385bf4ed0147109fd79c794c27a7 /docs | |
| parent | 75257daa6d21a1e79565176f7ee90c3ebb4a4680 (diff) | |
| download | cryptography-2cfa45fd168273eaf3b616730255fc063faf5257.tar.gz cryptography-2cfa45fd168273eaf3b616730255fc063faf5257.tar.bz2 cryptography-2cfa45fd168273eaf3b616730255fc063faf5257.zip | |
update docs, hoist b64decode up and re-add test for it
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. |