diff options
author | Jon Simons <jon@jonsimons.org> | 2017-08-24 18:14:38 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2017-08-24 18:18:41 +0200 |
commit | 6252aab88ae0616e112d7e59a4013e35ac7c42d4 (patch) | |
tree | 9719562e6faf028b8fe654c00287ed4aa1f62696 /src/session.c | |
parent | 74d17a6531517d6fcd5aa0505063a0beb52806e8 (diff) | |
download | libssh-6252aab88ae0616e112d7e59a4013e35ac7c42d4.tar.gz libssh-6252aab88ae0616e112d7e59a4013e35ac7c42d4.tar.xz libssh-6252aab88ae0616e112d7e59a4013e35ac7c42d4.zip |
ecdh: enable ecdh_sha2_nistp{384,521} kex methods
Summary:
Based on Dirkjan's original patch series here:
* https://www.libssh.org/archive/libssh/2015-08/0000029.html
Here the changes are adapted for the current master
branch, and expanded to include libgcrypt support.
Co-Authored-By: Dirkjan Bussink <d.bussink@gmail.com>
Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Test Plan:
* Ran pkd tests for libcrypto and libgcrypt builds.
* Ran client torture_algorithms.c tests for libcrypto and libgcrypt builds.
* Tested across multiple libgcrypts ("1.6.3" and "1.7.6-beta").
Reviewers: aris, asn
Tags: #libssh
Differential Revision: https://bugs.libssh.org/D7
Diffstat (limited to 'src/session.c')
-rw-r--r-- | src/session.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/session.c b/src/session.c index 01773c52..60c72b92 100644 --- a/src/session.c +++ b/src/session.c @@ -357,6 +357,10 @@ const char* ssh_get_kex_algo(ssh_session session) { return "diffie-hellman-group14-sha1"; case SSH_KEX_ECDH_SHA2_NISTP256: return "ecdh-sha2-nistp256"; + case SSH_KEX_ECDH_SHA2_NISTP384: + return "ecdh-sha2-nistp384"; + case SSH_KEX_ECDH_SHA2_NISTP521: + return "ecdh-sha2-nistp521"; case SSH_KEX_CURVE25519_SHA256_LIBSSH_ORG: return "curve25519-sha256@libssh.org"; default: |