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

Reformat signature_verify() and fix match check.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@512 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-16 17:15:50 +00:00
parent 55791d1fe6
commit 07506763ff
1 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
libssh/dh.c
View File

@@ -967,46 +967,54 @@ static int sig_verify(SSH_SESSION *session, PUBLIC_KEY *pubkey,
return -1; return -1;
} }
int signature_verify(SSH_SESSION *session,STRING *signature){ int signature_verify(SSH_SESSION *session, STRING *signature) {
PUBLIC_KEY *pubkey; PUBLIC_KEY *pubkey = NULL;
SIGNATURE *sign; SIGNATURE *sign = NULL;
int err; int err;
enter_function();
if(session->options->dont_verify_hostkey){
ssh_log(session, SSH_LOG_FUNCTIONS, "Host key wasn't verified");
leave_function();
return 0;
}
pubkey=publickey_from_string(session,session->next_crypto->server_pubkey);
if(!pubkey){
leave_function();
return -1;
}
if(session->options->wanted_methods[SSH_HOSTKEYS]){ enter_function();
if(match(session->options->wanted_methods[SSH_HOSTKEYS],pubkey->type_c)){
ssh_set_error(session,SSH_FATAL,"Public key from server (%s) doesn't match user preference (%s)", if (session->options->dont_verify_hostkey) {
pubkey->type_c,session->options->wanted_methods[SSH_HOSTKEYS]); ssh_log(session, SSH_LOG_FUNCTIONS, "Host key wasn't verified");
publickey_free(pubkey); leave_function();
leave_function(); return 0;
return -1; }
}
pubkey = publickey_from_string(session,session->next_crypto->server_pubkey);
if(pubkey == NULL) {
leave_function();
return -1;
}
if (session->options->wanted_methods[SSH_HOSTKEYS]) {
if(!match(session->options->wanted_methods[SSH_HOSTKEYS],pubkey->type_c)) {
ssh_set_error(session, SSH_FATAL,
"Public key from server (%s) doesn't match user preference (%s)",
pubkey->type_c, session->options->wanted_methods[SSH_HOSTKEYS]);
publickey_free(pubkey);
leave_function();
return -1;
} }
sign=signature_from_string(session, signature,pubkey,pubkey->type); }
if(!sign){
ssh_set_error(session,SSH_FATAL,"Invalid signature blob"); sign = signature_from_string(session, signature, pubkey, pubkey->type);
publickey_free(pubkey); if (sign == NULL) {
leave_function(); ssh_set_error(session, SSH_FATAL, "Invalid signature blob");
return -1;
}
ssh_log(session, SSH_LOG_FUNCTIONS,
"Going to verify a %s type signature", pubkey->type_c);
err=sig_verify(session,pubkey,sign,session->next_crypto->session_id);
signature_free(sign);
session->next_crypto->server_pubkey_type=pubkey->type_c;
publickey_free(pubkey); publickey_free(pubkey);
leave_function(); leave_function();
return err; return -1;
}
ssh_log(session, SSH_LOG_FUNCTIONS,
"Going to verify a %s type signature", pubkey->type_c);
err = sig_verify(session,pubkey,sign,session->next_crypto->session_id);
signature_free(sign);
session->next_crypto->server_pubkey_type = pubkey->type_c;
publickey_free(pubkey);
leave_function();
return err;
} }
/** @} */ /** @} */