diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-09-17 12:10:34 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-09-18 21:37:17 +0200 |
| commit | d7fa15df83619dd300580a444ab330a2a8592d4a (patch) | |
| tree | f739e3c116412465a2e295eebb166f188760188d /src | |
| parent | 519291558d5c702775d60253e6b9d9ca9249b59a (diff) | |
| download | libssh-d7fa15df83619dd300580a444ab330a2a8592d4a.tar.gz libssh-d7fa15df83619dd300580a444ab330a2a8592d4a.tar.xz libssh-d7fa15df83619dd300580a444ab330a2a8592d4a.zip | |
priv: Move kex functions to kex header.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.c | 1 | ||||
| -rw-r--r-- | src/kex.c | 10 | ||||
| -rw-r--r-- | src/server.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/client.c b/src/client.c index ef996ff..d6923e4 100644 --- a/src/client.c +++ b/src/client.c @@ -41,6 +41,7 @@ #include "libssh/threads.h" #include "libssh/misc.h" #include "libssh/pki.h" +#include "libssh/kex.h" #define set_status(session, status) do {\ if (session->common.callbacks && session->common.callbacks->connect_status_function) \ @@ -327,7 +327,7 @@ error: return SSH_PACKET_USED; } -void ssh_list_kex(ssh_session session, KEX *kex) { +void ssh_list_kex(ssh_session session, struct ssh_kex_struct *kex) { int i = 0; #ifdef DEBUG_CRYPTO @@ -348,7 +348,7 @@ void ssh_list_kex(ssh_session session, KEX *kex) { * in function of the options and available methods. */ int set_client_kex(ssh_session session){ - KEX *client= &session->next_crypto->client_kex; + struct ssh_kex_struct *client= &session->next_crypto->client_kex; int i; const char *wanted; enter_function(); @@ -368,8 +368,8 @@ int set_client_kex(ssh_session session){ * server's kex messages, and watches out if a match is possible. */ int ssh_kex_select_methods (ssh_session session){ - KEX *server = &session->next_crypto->server_kex; - KEX *client = &session->next_crypto->client_kex; + struct ssh_kex_struct *server = &session->next_crypto->server_kex; + struct ssh_kex_struct *client = &session->next_crypto->client_kex; int rc = SSH_ERROR; int i; @@ -400,7 +400,7 @@ error: /* this function only sends the predefined set of kex methods */ int ssh_send_kex(ssh_session session, int server_kex) { - KEX *kex = (server_kex ? &session->next_crypto->server_kex : + struct ssh_kex_struct *kex = (server_kex ? &session->next_crypto->server_kex : &session->next_crypto->client_kex); ssh_string str = NULL; int i; diff --git a/src/server.c b/src/server.c index 8777e17..5acbd4a 100644 --- a/src/server.c +++ b/src/server.c @@ -84,7 +84,7 @@ extern const char *supported_methods[]; */ static int server_set_kex(ssh_session session) { - KEX *server = &session->next_crypto->server_kex; + struct ssh_kex_struct *server = &session->next_crypto->server_kex; int i, j; const char *wanted; |