aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-12-24 15:49:25 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-12-24 15:49:25 -0800
commiteeb8143a716c995dcd9c4cb883ce8b538735b0a1 (patch)
tree10647cd82dc1de013dbea4707bc1bb0d46a7aeaa /docs/hazmat/primitives
parent4b223434b4ca96de265334df036689264a82f9b8 (diff)
downloadcryptography-eeb8143a716c995dcd9c4cb883ce8b538735b0a1.tar.gz
cryptography-eeb8143a716c995dcd9c4cb883ce8b538735b0a1.tar.bz2
cryptography-eeb8143a716c995dcd9c4cb883ce8b538735b0a1.zip
Bring back text about unsupported formats
Diffstat (limited to 'docs/hazmat/primitives')
-rw-r--r--docs/hazmat/primitives/asymmetric/serialization.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/asymmetric/serialization.rst b/docs/hazmat/primitives/asymmetric/serialization.rst
index f0f18fd8..9ca493ab 100644
--- a/docs/hazmat/primitives/asymmetric/serialization.rst
+++ b/docs/hazmat/primitives/asymmetric/serialization.rst
@@ -223,6 +223,10 @@ DSA keys look almost identical but begin with ``ssh-dss`` rather than
Deserialize a public key from OpenSSH (:rfc:`4253`) encoded data to an
instance of the public key type for the specified backend.
+ .. note::
+
+ Currently Ed25519 keys are not supported.
+
:param bytes data: The OpenSSH encoded key data.
:param backend: A backend providing