diff options
author | Jon Simons <jon@jonsimons.org> | 2019-01-29 16:32:36 -0500 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-02-07 14:22:26 +0100 |
commit | e05e4ae9712b29eee2cd46021787889c95497a96 (patch) | |
tree | 7780bf493ebcdf62d3de8bcb908ca7791972ed94 | |
parent | b6d275537e99219efff44cb544854687c7e4e2e8 (diff) | |
download | libssh-e05e4ae9712b29eee2cd46021787889c95497a96.tar.gz libssh-e05e4ae9712b29eee2cd46021787889c95497a96.tar.xz libssh-e05e4ae9712b29eee2cd46021787889c95497a96.zip |
pki_crypto: plug pki_signature_from_blob leaks
In 3341f49a49a07cbce003e487ef24a2042e800f01, 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 c0102e6a5953789ccda93e8dea956e8cc8a046e9)
-rw-r--r-- | src/pki_crypto.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/pki_crypto.c b/src/pki_crypto.c index bae51b71..62027876 100644 --- a/src/pki_crypto.c +++ b/src/pki_crypto.c @@ -1657,6 +1657,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, s = ssh_string_new(20); if (s == NULL) { + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } @@ -1665,6 +1666,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, ps = ssh_make_string_bn(s); ssh_string_free(s); if (ps == NULL) { + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } @@ -1673,6 +1675,8 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, * object */ rc = DSA_SIG_set0(sig->dsa_sig, pr, ps); if (rc == 0) { + bignum_safe_free(ps); + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } @@ -1737,6 +1741,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, rlen = ssh_buffer_get_len(b); ssh_buffer_free(b); if (s == NULL) { + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } @@ -1749,6 +1754,7 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, ssh_string_burn(s); ssh_string_free(s); if (ps == NULL) { + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } @@ -1757,6 +1763,8 @@ ssh_signature pki_signature_from_blob(const ssh_key pubkey, * ECDSA signature object */ rc = ECDSA_SIG_set0(sig->ecdsa_sig, pr, ps); if (rc == 0) { + bignum_safe_free(ps); + bignum_safe_free(pr); ssh_signature_free(sig); return NULL; } |