diff --git a/docs/dependencies.md b/docs/dependencies.md index 39aa4f5e5..04331b6b4 100644 --- a/docs/dependencies.md +++ b/docs/dependencies.md @@ -93,10 +93,10 @@ implementation. This is also an **optional** dependency and must be add explicit ## [ed25519-java](https://github.com/str4d/ed25519-java) -Required for supporting [ssh-ed25519](https://tools.ietf.org/html/draft-bjh21-ssh-ed25519-02) keys -and [ed25519-sha-512](https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02) signatures. **Note:** -the required Maven module(s) are defined as `optional` so must be added as an **explicit** dependency in -order to be included in the classpath: +Can optionally be provided to support [ssh-ed25519](https://tools.ietf.org/html/draft-bjh21-ssh-ed25519-02) keys +and [ed25519-sha-512](https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02) signatures where [Bouncy Castle](#bouncy-castle) is not suitable. **Note:** +use of this dependency is not recommended, but it can be added as an **explicit** dependency in +order to provide Ed25519 support as follows: ```xml @@ -108,5 +108,3 @@ order to be included in the classpath: ``` - -The code contains support for reading _ed25519_ [OpenSSH formatted private keys](https://issues.apache.org/jira/browse/SSHD-703). diff --git a/docs/files-parsing.md b/docs/files-parsing.md index c8c8368e4..a26b6eea1 100644 --- a/docs/files-parsing.md +++ b/docs/files-parsing.md @@ -18,8 +18,8 @@ and `HostConfigEntry#readHostConfigEntries`. ### PEM/OpenSSH The common code contains built-in support for parsing PEM and/or _OpenSSH_ formatted key files and using them for authentication purposes. -As mentioned previously, it can leverage _Bouncycastle_ if available, but can do most of the work without it as well. For _ed25519_ support, -one must provide the _eddsa_ artifact dependency. +As mentioned previously, it can leverage _Bouncy Castle_ if available, but can do most of the work without it as well. For _ed25519_ support, +one must provide either `net.i2p.crypto.eddsa` or _Bouncy Castle_ as a dependency; if both are present `net.i2p.crypto.eddsa` is used. ### [PUTTY](https://www.putty.org/) diff --git a/docs/standards.md b/docs/standards.md index 58314f57e..34cf56a56 100644 --- a/docs/standards.md +++ b/docs/standards.md @@ -110,7 +110,8 @@ mlkem1024nistp384-sha384. ### Signatures/Keys * ssh-dss, ssh-rsa, rsa-sha2-256, rsa-sha2-512, nistp256, nistp384, nistp521 -, ssh-ed25519 (requires `eddsa` optional module), sk-ecdsa-sha2-nistp256@openssh.com, sk-ssh-ed25519@openssh.com +, ssh-ed25519 (requires Bouncy Castle or `net.i2p.crypto.eddsa` as an optional dependency - if both are present, `net.i2p.crypto.eddsa` is used) +, sk-ecdsa-sha2-nistp256@openssh.com, sk-ssh-ed25519@openssh.com , ssh-rsa-cert-v01@openssh.com, ssh-dss-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com , ecdsa-sha2-nistp256-cert-v01@openssh.com, ecdsa-sha2-nistp384-cert-v01@openssh.com , ecdsa-sha2-nistp521-cert-v01@openssh.com