diff options
| author | Mark Adams <mark@markadams.me> | 2014-12-13 22:54:34 -0600 |
|---|---|---|
| committer | Mark Adams <mark@markadams.me> | 2014-12-13 22:54:34 -0600 |
| commit | 1832e24256c5984cfe534a24839657609522b7a4 (patch) | |
| tree | 1a5c1e2288c53d1d8b1cdf98be7c934d5d4bf5c1 | |
| parent | 3aeac8c132f53f07393f85e260e135b64f204482 (diff) | |
| download | cryptography-1832e24256c5984cfe534a24839657609522b7a4.tar.gz cryptography-1832e24256c5984cfe534a24839657609522b7a4.tar.bz2 cryptography-1832e24256c5984cfe534a24839657609522b7a4.zip | |
Minor documentation corrections for load_ssh_public_key
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/serialization.rst | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5b1f48e6..0394ebd9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -20,7 +20,7 @@ Changelog :doc:`/hazmat/primitives/asymmetric/utils`. * Added :func:`~cryptography.hazmat.primitives.serialization.load_ssh_public_key` - to support the loading of OpenSSH public keys (RFC 4253). Currently, only RSA + to support the loading of OpenSSH public keys (:rfc:`4253`). Currently, only RSA is supported. 0.6.1 - 2014-10-15 diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst index ec35c3cf..45c7a5bc 100644 --- a/docs/hazmat/primitives/asymmetric/serialization.rst +++ b/docs/hazmat/primitives/asymmetric/serialization.rst @@ -199,12 +199,13 @@ KEY-----`` or ``-----BEGIN DSA PRIVATE KEY-----``. OpenSSH Public Key ~~~~~~~~~~~~~~~~~~ -The format used by OpenSSH to store public keys as specified in :rfc:`4253` +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. -Example RSA key in OpenSSH format (line breaks added for formatting purposes):: +An example RSA key in OpenSSH format (line breaks added for formatting +purposes):: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDu/XRP1kyK6Cgt36gts9XAk FiiuJLW6RU0j3KKVZSs1I7Z3UmU9/9aVh/rZV43WQG8jaR6kkcP4stOR0DEtll |