summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-02-28 17:04:38 +0000
committertb <>2024-02-28 17:04:38 +0000
commitbd92cc14e277cbafbda21cdf8b18114e9a78dfd4 (patch)
tree6aa8ba483f254ad966a1ae071f2bf3d6d340bc46
parent8c9c9a155f34da62313fce09c809cc91f3184a52 (diff)
downloadopenbsd-bd92cc14e277cbafbda21cdf8b18114e9a78dfd4.tar.gz
openbsd-bd92cc14e277cbafbda21cdf8b18114e9a78dfd4.tar.bz2
openbsd-bd92cc14e277cbafbda21cdf8b18114e9a78dfd4.zip
Expand only ever user of PBEPARAM_free() outside of libcrypto
-rw-r--r--src/usr.bin/openssl/pkcs12.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index c6f0476fc6..c8706904f1 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.26 2023/11/19 09:29:11 tb Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.27 2024/02/28 17:04:38 tb 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. 3 * project.
4 */ 4 */
@@ -70,6 +70,7 @@
70#include <openssl/err.h> 70#include <openssl/err.h>
71#include <openssl/pem.h> 71#include <openssl/pem.h>
72#include <openssl/pkcs12.h> 72#include <openssl/pkcs12.h>
73#include <openssl/x509.h>
73 74
74#define NOKEYS 0x1 75#define NOKEYS 0x1
75#define NOCERTS 0x2 76#define NOCERTS 0x2
@@ -1023,7 +1024,7 @@ alg_print(BIO *x, const X509_ALGOR *alg)
1023 BIO_printf(bio_err, "%s, Iteration %ld\n", 1024 BIO_printf(bio_err, "%s, Iteration %ld\n",
1024 OBJ_nid2ln(OBJ_obj2nid(aobj)), 1025 OBJ_nid2ln(OBJ_obj2nid(aobj)),
1025 ASN1_INTEGER_get(pbe->iter)); 1026 ASN1_INTEGER_get(pbe->iter));
1026 PBEPARAM_free(pbe); 1027 ASN1_item_free((ASN1_VALUE *)pbe, &PBEPARAM_it);
1027 return 1; 1028 return 1;
1028} 1029}
1029 1030