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

pki_crypto: Fix a possible null pointer dereference

Browse Source 
CID 1401438
CID 1401437

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2019-05-28 08:24:33 +02:00
parent 30997a098c
commit 123db84b2c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/pki_crypto.c
View File

@@ -1370,14 +1370,19 @@ static ssh_string pki_dsa_signature_to_blob(const ssh_signature sig)
ssh_string s = NULL; ssh_string s = NULL;
int s_len, s_offset_in, s_offset_out; int s_len, s_offset_in, s_offset_out;
const unsigned char *raw_sig_data = ssh_string_data(sig->raw_sig); const unsigned char *raw_sig_data = NULL;
size_t raw_sig_len = ssh_string_len(sig->raw_sig); size_t raw_sig_len;
DSA_SIG *dsa_sig; DSA_SIG *dsa_sig;
if (sig == NULL || sig->raw_sig == NULL || raw_sig_data == NULL) { if (sig == NULL || sig->raw_sig == NULL) {
return NULL; return NULL;
} }
raw_sig_data = ssh_string_data(sig->raw_sig);
if (raw_sig_data == NULL) {
return NULL;
}
raw_sig_len = ssh_string_len(sig->raw_sig);
dsa_sig = d2i_DSA_SIG(NULL, &raw_sig_data, raw_sig_len); dsa_sig = d2i_DSA_SIG(NULL, &raw_sig_data, raw_sig_len);
if (dsa_sig == NULL) { if (dsa_sig == NULL) {
@@ -1444,16 +1449,21 @@ static ssh_string pki_ecdsa_signature_to_blob(const ssh_signature sig)
const BIGNUM *pr = NULL, *ps = NULL; const BIGNUM *pr = NULL, *ps = NULL;
const unsigned char *raw_sig_data = ssh_string_data(sig->raw_sig); const unsigned char *raw_sig_data = NULL;
size_t raw_sig_len = ssh_string_len(sig->raw_sig); size_t raw_sig_len;
ECDSA_SIG *ecdsa_sig; ECDSA_SIG *ecdsa_sig;
int rc; int rc;
if (sig == NULL || sig->raw_sig == NULL || raw_sig_data == NULL) { if (sig == NULL || sig->raw_sig == NULL) {
return NULL; return NULL;
} }
raw_sig_data = ssh_string_data(sig->raw_sig);
if (raw_sig_data == NULL) {
return NULL;
}
raw_sig_len = ssh_string_len(sig->raw_sig);
ecdsa_sig = d2i_ECDSA_SIG(NULL, &raw_sig_data, raw_sig_len); ecdsa_sig = d2i_ECDSA_SIG(NULL, &raw_sig_data, raw_sig_len);
if (ecdsa_sig == NULL) { if (ecdsa_sig == NULL) {