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

pki: NULL check pki_signature_from_rsa_blob result

Browse Source 
Check for a potential NULL result from `pki_signature_from_rsa_blob`
in `pki_signature_from_blob`.  Otherwise the following `sig->type_c`
will result in a segfault.

Introduced in 7f83a1efae.

Signed-off-by: Jon Simons <jon@jonsimons.org>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit ccd73db90c)
This commit is contained in:
Jon Simons
2019-01-29 16:16:29 -05:00
committed by Andreas Schneider
parent e69fb89e98
commit b6d275537e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pki_crypto.c
View File

@@ -1681,6 +1681,9 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA:
case SSH_KEYTYPE_RSA1: case SSH_KEYTYPE_RSA1:
sig = pki_signature_from_rsa_blob(pubkey, sig_blob, sig); sig = pki_signature_from_rsa_blob(pubkey, sig_blob, sig);
if (sig == NULL) {
return NULL;
}
sig->type_c = ssh_key_signature_to_char(type, hash_type); sig->type_c = ssh_key_signature_to_char(type, hash_type);
break; break;
case SSH_KEYTYPE_ECDSA: case SSH_KEYTYPE_ECDSA:

3
src/pki_mbedcrypto.c
View File

@@ -917,6 +917,9 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
switch(type) { switch(type) {
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA:
sig = pki_signature_from_rsa_blob(pubkey, sig_blob, sig); sig = pki_signature_from_rsa_blob(pubkey, sig_blob, sig);
if (sig == NULL) {
return NULL;
}
sig->type_c = ssh_key_signature_to_char(type, hash_type); sig->type_c = ssh_key_signature_to_char(type, hash_type);
break; break;
case SSH_KEYTYPE_ECDSA: { case SSH_KEYTYPE_ECDSA: {