aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/asymmetric/serialization.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-06-03 13:04:26 -0700
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-06-03 13:04:26 -0700
commit949892938735c0cf14a6689d68779c2ce2410585 (patch)
tree17077680d9c0583458d21662904fdc48dc3f4f5b /docs/hazmat/primitives/asymmetric/serialization.rst
parent6eeaf0bd76f5d40e9fbd9bc17b1b2fd08df186c4 (diff)
downloadcryptography-949892938735c0cf14a6689d68779c2ce2410585.tar.gz
cryptography-949892938735c0cf14a6689d68779c2ce2410585.tar.bz2
cryptography-949892938735c0cf14a6689d68779c2ce2410585.zip
SSH serialization for public keys (#2957)
* SSH serialization for public keys * name errors ahoy! * id, ego, superego * dsa support * EC support * Don't keyerror * Documentation OpenSSH * flake8 * fix * bytes bytes bytes * skip curve unsupported * bytes! * Move a function * reorganize code for coverage
Diffstat (limited to 'docs/hazmat/primitives/asymmetric/serialization.rst')
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index b94c0e10..7cef77fd 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -360,6 +360,13 @@ Serialization Formats
Just the public key elements (without the algorithm identifier). This
format is RSA only, but is used by some older systems.
+ .. attribute:: OpenSSH
+
+ .. versionadded:: 1.4
+
+ The public key format used by OpenSSH (e.g. as found in
+ ``~/.ssh/id_rsa.pub`` or ``~/.ssh/authorized_keys``).
+
Serialization Encodings
~~~~~~~~~~~~~~~~~~~~~~~
@@ -389,6 +396,12 @@ Serialization Encodings
For DER format. This is a binary format.
+ .. attribute:: OpenSSH
+
+ .. versionadded:: 1.4
+
+ The format used by OpenSSH public keys. This is a text format.
+
Serialization Encryption Types
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~