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

Check return values of option setter.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@377 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-03 08:38:33 +00:00
parent 2aa81c0544
commit 41dd2a2a3b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libssh/server.c
View File

@@ -224,12 +224,19 @@ static int server_set_kex(SSH_SESSION * session) {
else else
ssh_get_random(server->cookie, 16,0); ssh_get_random(server->cookie, 16,0);
if (session->dsa_key && session->rsa_key) { if (session->dsa_key && session->rsa_key) {
ssh_options_set_wanted_algos(options,SSH_HOSTKEYS,"ssh-dss,ssh-rsa"); if (ssh_options_set_wanted_algos(options, SSH_HOSTKEYS, "ssh-dss,ssh-rsa") < 0) {
return -1;
}
} else { } else {
if(session->dsa_key) if (session->dsa_key) {
ssh_options_set_wanted_algos(options,SSH_HOSTKEYS,"ssh-dss"); if (ssh_options_set_wanted_algos(options, SSH_HOSTKEYS, "ssh-dss") < 0) {
else return -1;
ssh_options_set_wanted_algos(options,SSH_HOSTKEYS,"ssh-rsa"); }
} else {
if (ssh_options_set_wanted_algos(options, SSH_HOSTKEYS, "ssh-rsa") < 0) {
return -1;
}
}
} }
server->methods = malloc(10 * sizeof(char **)); server->methods = malloc(10 * sizeof(char **));
if (server->methods == NULL) { if (server->methods == NULL) {
@@ -246,7 +253,6 @@ static int server_set_kex(SSH_SESSION * session) {
SAFE_FREE(server->methods); SAFE_FREE(server->methods);
return -1; return -1;
} }
//printf("server->methods[%d]=%s\n",i,wanted);
} }
return 0; return 0;
} }
@@ -326,7 +332,9 @@ int ssh_accept(SSH_SESSION *session){
ssh_crypto_init(); ssh_crypto_init();
session->alive=1; session->alive=1;
session->clientbanner=ssh_get_banner(session); session->clientbanner=ssh_get_banner(session);
server_set_kex(session); if (server_set_kex(session) < 0) {
return -1;
}
ssh_send_kex(session,1); ssh_send_kex(session,1);
if(ssh_get_kex(session,1)) if(ssh_get_kex(session,1))
return -1; return -1;