summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-01-25 08:55:40 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-01-25 10:12:23 +0100
commita3dadb294a05ac625230db8130bc335bd3317f91 (patch)
tree5ef13e146ff101c2cc3a3999728adf00fa9d6fbe
parentbde535c3abbfb316b7c18406cabe145d60b97796 (diff)
downloadgnutls-tmp-better-abi-check.tar.gz
pkcs7 decryption: addressed memory leak in PBES1-DES-CBC-MD5 handlingtmp-better-abi-check
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--lib/x509/pkcs7-crypt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c
index e62500c84d..c15752f995 100644
--- a/lib/x509/pkcs7-crypt.c
+++ b/lib/x509/pkcs7-crypt.c
@@ -1027,6 +1027,7 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
ret = _gnutls_x509_read_value(pkcs8_asn, root, &enc);
if (ret < 0) {
gnutls_assert();
+ enc.data = NULL;
goto cleanup;
}
@@ -1035,6 +1036,8 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, ASN1_TYPE pkcs8_asn,
kdf_params,
enc_params, &enc,
decrypted_data);
+ if (ret < 0)
+ goto error;
goto cleanup;
}