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

pki_crypto: plug pki_signature_from_blob leaks

Browse Source 
In 3341f49a49, some direct assignments
to OpenSSL structures was replaced with usage of getter and setter
macros.  Ensure to `bignum_safe_free` a couple of intermediate values
in error paths for `pki_signature_from_blob` DSS and ECDSA cases.

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

8
src/pki_crypto.c
View File

@@ -1657,6 +1657,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
s = ssh_string_new(20); s = ssh_string_new(20);
if (s == NULL) { if (s == NULL) {
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }
@@ -1665,6 +1666,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
ps = ssh_make_string_bn(s); ps = ssh_make_string_bn(s);
ssh_string_free(s); ssh_string_free(s);
if (ps == NULL) { if (ps == NULL) {
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }
@@ -1673,6 +1675,8 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
* object */ * object */
rc = DSA_SIG_set0(sig->dsa_sig, pr, ps); rc = DSA_SIG_set0(sig->dsa_sig, pr, ps);
if (rc == 0) { if (rc == 0) {
bignum_safe_free(ps);
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }
@@ -1737,6 +1741,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
rlen = ssh_buffer_get_len(b); rlen = ssh_buffer_get_len(b);
ssh_buffer_free(b); ssh_buffer_free(b);
if (s == NULL) { if (s == NULL) {
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }
@@ -1749,6 +1754,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
ssh_string_burn(s); ssh_string_burn(s);
ssh_string_free(s); ssh_string_free(s);
if (ps == NULL) { if (ps == NULL) {
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }
@@ -1757,6 +1763,8 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey,
* ECDSA signature object */ * ECDSA signature object */
rc = ECDSA_SIG_set0(sig->ecdsa_sig, pr, ps); rc = ECDSA_SIG_set0(sig->ecdsa_sig, pr, ps);
if (rc == 0) { if (rc == 0) {
bignum_safe_free(ps);
bignum_safe_free(pr);
ssh_signature_free(sig); ssh_signature_free(sig);
return NULL; return NULL;
} }