lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

Improve check_public_key().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@632 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-27 17:59:48 +00:00
parent a19aebba18
commit b39fcd6470
1 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
libssh/keyfiles.c
View File

@@ -1104,74 +1104,104 @@ static char **ssh_get_knownhost_line(SSH_SESSION *session, FILE **file,
return NULL; return NULL;
} }
/** \brief Check the public key in the known host line matches the /**
* \brief Check the public key in the known host line matches the
* public key of the currently connected server. * public key of the currently connected server.
* \param tokens list of tokens in the known_hosts line. * \param tokens list of tokens in the known_hosts line.
* \return 1 if the key matches * \return 1 if the key matches
* \return 0 if the key doesn't match * \return 0 if the key doesn't match
* \return -1 on error * \return -1 on error
*/ */
static int check_public_key(SSH_SESSION *session, char **tokens) {
STRING *pubkey = session->current_crypto->server_pubkey;
BUFFER *pubkey_buffer;
char *pubkey_64;
static int check_public_key(SSH_SESSION *session, char **tokens){ /* ok we found some public key in known hosts file. now un-base64it */
char *pubkey_64; if (alldigits(tokens[1])) {
BUFFER *pubkey_buffer; /* openssh rsa1 format */
STRING *pubkey=session->current_crypto->server_pubkey; bignum tmpbn;
/* ok we found some public key in known hosts file. now un-base64it */ STRING *tmpstring;
if (alldigits(tokens[1])) { unsigned int len;
/* openssh rsa1 format */ int i;
bignum tmpbn;
int i;
unsigned int len;
STRING *tmpstring;
pubkey_buffer = buffer_new(); pubkey_buffer = buffer_new();
tmpstring = string_from_char("ssh-rsa1"); if (pubkey_buffer == NULL) {
buffer_add_ssh_string(pubkey_buffer, tmpstring); return -1;
}
for (i = 2; i < 4; i++) { /* e, then n */ tmpstring = string_from_char("ssh-rsa1");
tmpbn = NULL; if (tmpstring == NULL) {
bignum_dec2bn(tokens[i], &tmpbn); buffer_free(pubkey_buffer);
/* for some reason, make_bignum_string does not work return -1;
because of the padding which it does --kv */ }
/* tmpstring = make_bignum_string(tmpbn); */
/* do it manually instead */ if (buffer_add_ssh_string(pubkey_buffer, tmpstring) < 0) {
len = bignum_num_bytes(tmpbn); buffer_free(pubkey_buffer);
tmpstring = malloc(4 + len); string_free(tmpstring);
if (tmpstring == NULL) { return -1;
return -1; }
ssh_set_error(session, SSH_FATAL, "No space left"); string_free(tmpstring);
}
tmpstring->size = htonl(len); for (i = 2; i < 4; i++) { /* e, then n */
tmpbn = NULL;
bignum_dec2bn(tokens[i], &tmpbn);
if (tmpbn == NULL) {
buffer_free(pubkey_buffer);
return -1;
}
/* for some reason, make_bignum_string does not work
because of the padding which it does --kv */
/* tmpstring = make_bignum_string(tmpbn); */
/* do it manually instead */
len = bignum_num_bytes(tmpbn);
tmpstring = malloc(4 + len);
if (tmpstring == NULL) {
buffer_free(pubkey_buffer);
bignum_free(tmpbn);
return -1;
}
tmpstring->size = htonl(len);
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
bignum_bn2bin(tmpbn, len, tmpstring->string); bignum_bn2bin(tmpbn, len, tmpstring->string);
#elif defined HAVE_LIBCRYPTO #elif defined HAVE_LIBCRYPTO
bignum_bn2bin(tmpbn, tmpstring->string); bignum_bn2bin(tmpbn, tmpstring->string);
#endif #endif
bignum_free(tmpbn); bignum_free(tmpbn);
buffer_add_ssh_string(pubkey_buffer, tmpstring); if (buffer_add_ssh_string(pubkey_buffer, tmpstring) < 0) {
free(tmpstring); buffer_free(pubkey_buffer);
} string_free(tmpstring);
} else { bignum_free(tmpbn);
/* ssh-dss or ssh-rsa */ return -1;
pubkey_64=tokens[2]; }
pubkey_buffer=base64_to_bin(pubkey_64); string_free(tmpstring);
} }
} else {
/* ssh-dss or ssh-rsa */
pubkey_64 = tokens[2];
pubkey_buffer = base64_to_bin(pubkey_64);
}
if(!pubkey_buffer){ if (pubkey_buffer == NULL) {
ssh_set_error(session,SSH_FATAL,"verifying that server is a known host : base 64 error"); ssh_set_error(session, SSH_FATAL,
return -1; "Verifying that server is a known host: base64 error");
} return -1;
if(buffer_get_len(pubkey_buffer)!=string_len(pubkey)){ }
buffer_free(pubkey_buffer);
return 0; if (buffer_get_len(pubkey_buffer) != string_len(pubkey)) {
} buffer_free(pubkey_buffer);
/* now test that they are identical */ return 0;
if(memcmp(buffer_get(pubkey_buffer),pubkey->string,buffer_get_len(pubkey_buffer))!=0){ }
buffer_free(pubkey_buffer);
return 0; /* now test that they are identical */
} if (memcmp(buffer_get(pubkey_buffer), pubkey->string,
buffer_free(pubkey_buffer); buffer_get_len(pubkey_buffer)) != 0) {
return 1; buffer_free(pubkey_buffer);
return 0;
}
buffer_free(pubkey_buffer);
return 1;
} }
/** \brief checks if a hostname matches a openssh-style hashed known host /** \brief checks if a hostname matches a openssh-style hashed known host