From ac41a083efd64d94dfb15845c6c25ba5667ba8b8 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Sat, 17 Sep 2011 00:17:45 +0200 Subject: kex: moved KEX structures to ssh_crypto_struct --- include/libssh/crypto.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/libssh/crypto.h') diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index 2b155944..5f301ff2 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -44,6 +44,7 @@ #include #endif #include "libssh/ecdh.h" +#include "libssh/kex.h" enum ssh_key_exchange_e { /* diffie-hellman-group1-sha1 */ @@ -78,6 +79,10 @@ struct ssh_crypto_struct { int delayed_compress_out; void *compress_out_ctx; /* don't touch it */ void *compress_in_ctx; /* really, don't */ + /* kex sent by server, client, and mutually elected methods */ + KEX server_kex; + KEX client_kex; + char *kex_methods[SSH_KEX_METHODS]; enum ssh_key_exchange_e kex_type; enum ssh_mac_e mac_type; /* Mac operations to use for key gen */ }; -- cgit