lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

pki: Check the type of the key blob earlier.

Browse Source
This commit is contained in:
Andreas Schneider
2011-08-30 22:35:01 +02:00
parent e5a39a3ae9
commit b5b3db6c90
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pki.c
View File

@@ -655,6 +655,7 @@ int ssh_pki_import_pubkey_blob(const ssh_string key_blob,
ssh_buffer buffer; ssh_buffer buffer;
ssh_string type_s = NULL; ssh_string type_s = NULL;
char *type_c = NULL; char *type_c = NULL;
enum ssh_keytypes_e type;
int rc; int rc;
if (key_blob == NULL || pkey == NULL) { if (key_blob == NULL || pkey == NULL) {
@@ -687,10 +688,16 @@ int ssh_pki_import_pubkey_blob(const ssh_string key_blob,
} }
ssh_string_free(type_s); ssh_string_free(type_s);
rc = pki_import_pubkey_buffer(buffer, ssh_key_type_from_name(type_c), pkey); type = ssh_key_type_from_name(type_c);
free(type_c);
if (type == SSH_KEYTYPE_UNKNOWN) {
ssh_pki_log("Unknown key type found!");
goto fail;
}
rc = pki_import_pubkey_buffer(buffer, type, pkey);
ssh_buffer_free(buffer); ssh_buffer_free(buffer);
free(type_c);
return rc; return rc;
fail: fail: