aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/libssh/crypto.h5
-rw-r--r--include/libssh/session.h6
2 files changed, 5 insertions, 6 deletions
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 <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 */
};
diff --git a/include/libssh/session.h b/include/libssh/session.h
index ac2ca76e..fd83ed0d 100644
--- a/include/libssh/session.h
+++ b/include/libssh/session.h
@@ -27,7 +27,6 @@
#include "libssh/auth.h"
#include "libssh/channels.h"
#include "libssh/poll.h"
-#include "libssh/kex.h"
/* These are the different states a SSH session can be into its life */
enum ssh_session_state_e {
@@ -123,11 +122,6 @@ struct ssh_session_struct {
struct ssh_agent_state_struct *agent_state;
struct ssh_auth_auto_state_struct *auth_auto_state;
- /* kex sent by server, client, and mutually elected methods */
- KEX server_kex;
- KEX client_kex;
- char *kex_methods[SSH_KEX_METHODS];
-
ssh_buffer in_hashbuf;
ssh_buffer out_hashbuf;
struct ssh_crypto_struct *current_crypto;