summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/ed25519key.py10
-rw-r--r--sites/docs/api/keys.rst5
2 files changed, 15 insertions, 0 deletions
diff --git a/paramiko/ed25519key.py b/paramiko/ed25519key.py
index aa5e885d..434b3f45 100644
--- a/paramiko/ed25519key.py
+++ b/paramiko/ed25519key.py
@@ -45,6 +45,16 @@ def unpad(data):
class Ed25519Key(PKey):
+ """
+ Representation of an `Ed25519 <https://ed25519.cr.yp.to/>`_ key.
+
+ .. note::
+ Ed25519 key support was added to OpenSSH in version 6.5.
+
+ .. versionadded:: 2.2
+ .. versionchanged:: 2.3
+ Added a ``file_obj`` parameter to match other key classes.
+ """
def __init__(self, msg=None, data=None, filename=None, password=None,
file_obj=None):
verifying_key = signing_key = None
diff --git a/sites/docs/api/keys.rst b/sites/docs/api/keys.rst
index c6412f77..a456f502 100644
--- a/sites/docs/api/keys.rst
+++ b/sites/docs/api/keys.rst
@@ -21,3 +21,8 @@ ECDSA
=====
.. automodule:: paramiko.ecdsakey
+
+Ed25519
+=======
+
+.. automodule:: paramiko.ed25519key