summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/p5_pbev2.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbev2.c')
-rw-r--r--src/lib/libcrypto/asn1/p5_pbev2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index 54dd1eb614..d88a4dfc64 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p5_pbev2.c,v 1.26 2021/12/12 21:30:13 tb Exp $ */ 1/* $OpenBSD: p5_pbev2.c,v 1.27 2021/12/25 13:17:48 jsing 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-2004. 3 * project 1999-2004.
4 */ 4 */
@@ -274,10 +274,10 @@ PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
274 274
275 return ret; 275 return ret;
276 276
277merr: 277 merr:
278 ASN1error(ERR_R_MALLOC_FAILURE); 278 ASN1error(ERR_R_MALLOC_FAILURE);
279 279
280err: 280 err:
281 PBE2PARAM_free(pbe2); 281 PBE2PARAM_free(pbe2);
282 /* Note 'scheme' is freed as part of pbe2 */ 282 /* Note 'scheme' is freed as part of pbe2 */
283 X509_ALGOR_free(kalg); 283 X509_ALGOR_free(kalg);
@@ -366,7 +366,7 @@ PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
366 PBKDF2PARAM_free(kdf); 366 PBKDF2PARAM_free(kdf);
367 return keyfunc; 367 return keyfunc;
368 368
369merr: 369 merr:
370 ASN1error(ERR_R_MALLOC_FAILURE); 370 ASN1error(ERR_R_MALLOC_FAILURE);
371 PBKDF2PARAM_free(kdf); 371 PBKDF2PARAM_free(kdf);
372 X509_ALGOR_free(keyfunc); 372 X509_ALGOR_free(keyfunc);