summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinoguchi <>2020-01-12 07:11:13 +0000
committerinoguchi <>2020-01-12 07:11:13 +0000
commit23772d25ea2d9f0c22b6fcc0ea8e281694436352 (patch)
treee93a232539b7c39d2374ec3f0067e919f8f09dfd
parentada8f0655f3fb8aa20a5f6b3f9e48d5a4bba8308 (diff)
downloadopenbsd-23772d25ea2d9f0c22b6fcc0ea8e281694436352.tar.gz
openbsd-23772d25ea2d9f0c22b6fcc0ea8e281694436352.tar.bz2
openbsd-23772d25ea2d9f0c22b6fcc0ea8e281694436352.zip
Avoid leak in error path of PKCS5_PBE_keyivgen
ok jsing@ tb@
-rw-r--r--src/lib/libcrypto/evp/p5_crpt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index 75a631bf98..98e4549db1 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_crpt.c,v 1.18 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: p5_crpt.c,v 1.19 2020/01/12 07:11:13 inoguchi Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -108,6 +108,7 @@ PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
108 iter = 1; 108 iter = 1;
109 else if ((iter = ASN1_INTEGER_get(pbe->iter)) <= 0) { 109 else if ((iter = ASN1_INTEGER_get(pbe->iter)) <= 0) {
110 EVPerror(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS); 110 EVPerror(EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS);
111 PBEPARAM_free(pbe);
111 return 0; 112 return 0;
112 } 113 }
113 salt = pbe->salt->data; 114 salt = pbe->salt->data;