shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-07 18:50:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

priv: Move kex functions to kex header.

Browse Source
This commit is contained in:
Andreas Schneider
2011-09-17 12:10:34 +02:00
parent 519291558d
commit d7fa15df83
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/client.c
View File

@@ -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) \

10
src/kex.c
View File

@@ -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;

2
src/server.c
View File

@@ -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;