diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-17 00:17:45 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-09-18 20:34:16 +0200 |
| commit | ac41a083efd64d94dfb15845c6c25ba5667ba8b8 (patch) | |
| tree | 3642f3995daf89d56e99f3da2ba57950a46608be /include/libssh/crypto.h | |
| parent | 48980573c1918034216ac307fd3e687d09d352bc (diff) | |
| download | libssh-ac41a083efd64d94dfb15845c6c25ba5667ba8b8.tar.gz libssh-ac41a083efd64d94dfb15845c6c25ba5667ba8b8.tar.xz libssh-ac41a083efd64d94dfb15845c6c25ba5667ba8b8.zip | |
kex: moved KEX structures to ssh_crypto_struct
Diffstat (limited to 'include/libssh/crypto.h')
| -rw-r--r-- | include/libssh/crypto.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index 2b15594..5f301ff 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -44,6 +44,7 @@ #include <openssl/ecdh.h> #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 */ }; |