From e42a423a247c8c9f0bd58d32a8b80c522f7b43f6 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Wed, 23 Dec 2015 12:50:00 +0100 Subject: kex: use runtime callbacks (server) Signed-off-by: Aris Adamantiadis Reviewed-by: Jakub Jelen Reviewed-by: Andreas Schneider --- include/libssh/curve25519.h | 2 +- include/libssh/dh.h | 3 +++ include/libssh/ecdh.h | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/libssh/curve25519.h b/include/libssh/curve25519.h index 96018000..f0cc6348 100644 --- a/include/libssh/curve25519.h +++ b/include/libssh/curve25519.h @@ -50,7 +50,7 @@ typedef unsigned char ssh_curve25519_privkey[CURVE25519_PRIVKEY_SIZE]; int ssh_client_curve25519_init(ssh_session session); #ifdef WITH_SERVER -int ssh_server_curve25519_init(ssh_session session, ssh_buffer packet); +void ssh_server_curve25519_init(ssh_session session); #endif /* WITH_SERVER */ #endif /* CURVE25519_H_ */ diff --git a/include/libssh/dh.h b/include/libssh/dh.h index 2198a9fa..3d7312c5 100644 --- a/include/libssh/dh.h +++ b/include/libssh/dh.h @@ -57,4 +57,7 @@ int ssh_hashbufin_add_cookie(ssh_session session, unsigned char *cookie); int ssh_hashbufout_add_cookie(ssh_session session); int ssh_generate_session_keys(ssh_session session); +#ifdef WITH_SERVER +void ssh_server_dh_init(ssh_session session); +#endif /* WITH_SERVER */ #endif /* DH_H_ */ diff --git a/include/libssh/ecdh.h b/include/libssh/ecdh.h index c5212bc7..17fe02e7 100644 --- a/include/libssh/ecdh.h +++ b/include/libssh/ecdh.h @@ -22,6 +22,7 @@ #define ECDH_H_ #include "config.h" +#include "libssh/callbacks.h" #ifdef HAVE_LIBCRYPTO #ifdef HAVE_OPENSSL_ECDH_H @@ -42,13 +43,14 @@ #endif extern struct ssh_packet_callbacks_struct ssh_ecdh_client_callbacks; - /* Backend-specific functions. */ int ssh_client_ecdh_init(ssh_session session); int ecdh_build_k(ssh_session session); #ifdef WITH_SERVER -int ssh_server_ecdh_init(ssh_session session, ssh_buffer packet); +extern struct ssh_packet_callbacks_struct ssh_ecdh_server_callbacks; +void ssh_server_ecdh_init(ssh_session session); +SSH_PACKET_CALLBACK(ssh_packet_server_ecdh_init); #endif /* WITH_SERVER */ #endif /* ECDH_H_ */ -- cgit v1.2.3