aboutsummaryrefslogtreecommitdiff
path: root/src/server.c
diff options
context:
space:
mode:
authorJon Simons <jon@jonsimons.org>2017-08-24 18:14:38 +0200
committerAndreas Schneider <asn@cryptomilk.org>2017-08-24 18:19:25 +0200
commit7204d2f48556210e3e6894aebb20db24819a3e86 (patch)
tree344b3cb22c947b0083aa1eca491278b0e9b12038 /src/server.c
parent4c602f225574d0da5833aa7ddf9bffe642046b7b (diff)
parent6252aab88ae0616e112d7e59a4013e35ac7c42d4 (diff)
downloadlibssh-7204d2f48556210e3e6894aebb20db24819a3e86.tar.gz
libssh-7204d2f48556210e3e6894aebb20db24819a3e86.tar.xz
libssh-7204d2f48556210e3e6894aebb20db24819a3e86.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> 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 Reviewed By: asn Tags: #libssh Differential Revision: https://bugs.libssh.org/D7
Diffstat (limited to 'src/server.c')
-rw-r--r--src/server.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server.c b/src/server.c
index 3c1ee74c..25fdd0c5 100644
--- a/src/server.c
+++ b/src/server.c
@@ -198,6 +198,8 @@ SSH_PACKET_CALLBACK(ssh_packet_kexdh_init){
break;
#ifdef HAVE_ECDH
case SSH_KEX_ECDH_SHA2_NISTP256:
+ case SSH_KEX_ECDH_SHA2_NISTP384:
+ case SSH_KEX_ECDH_SHA2_NISTP521:
rc = ssh_server_ecdh_init(session, packet);
break;
#endif