openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

pkcs12: Do not forcibly load the config file 

This was added as part of commit e869c86 but later it
was made unnecessary by commit 21f7a09.

Fixes #22994

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23005)
This commit is contained in:
Tomas Mraz 2023-12-11 15:03:08 +01:00
parent 7f4bf18573
commit 58eeb4350c
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/pkcs12.c
View File

@ -14,7 +14,6 @@
#include <string.h>
#include "apps.h"
#include "progs.h"
#include <openssl/conf.h>
#include <openssl/asn1.h>
#include <openssl/crypto.h>
#include <openssl/err.h>
@ -535,7 +534,6 @@ int pkcs12_main(int argc, char **argv)
EVP_MD *macmd = NULL;
unsigned char *catmp = NULL;
int i;
CONF *conf = NULL;
ASN1_OBJECT *obj = NULL;
if ((options & (NOCERTS | NOKEYS)) == (NOCERTS | NOKEYS)) {
@ -681,12 +679,6 @@ int pkcs12_main(int argc, char **argv)
if (!twopass)
OPENSSL_strlcpy(macpass, pass, sizeof(macpass));
/* Load the config file */
if ((conf = app_load_config(default_config_file)) == NULL)
goto export_end;
if (!app_load_modules(conf))
goto export_end;
if (jdktrust != NULL) {
obj = OBJ_txt2obj(jdktrust, 0);
}
@ -731,7 +723,6 @@ int pkcs12_main(int argc, char **argv)
OSSL_STACK_OF_X509_free(certs);
OSSL_STACK_OF_X509_free(untrusted_certs);
X509_free(ee_cert);
NCONF_free(conf);
ASN1_OBJECT_free(obj);
ERR_print_errors(bio_err);
goto end;