git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 13:01:42 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

vtls: remove call to PKCS12_PBE_add()

Browse Source 
Curl is one of the last callers of PKCS12_PBE_add(). It has been a noop
since OpenSSL 0.9.8k (2006) stubbed it out when moving the built-in PBE
algorithms to a static table:
b8f702a0af

Closes #19201
This commit is contained in:
Theo Buehler 2025-10-23 13:12:48 +02:00 committed by Daniel Stenberg
parent 9752d5fe0b
commit 2edce44065
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/setup-vms.h
View File

@ -257,7 +257,6 @@ static struct passwd *vms_getpwuid(uid_t uid)
#endif
#define PEM_read_X509 PEM_READ_X509
#define PEM_write_bio_X509 PEM_WRITE_BIO_X509
#define PKCS12_PBE_add PKCS12_PBE_ADD
#define PKCS12_free PKCS12_FREE
#define PKCS12_parse PKCS12_PARSE
#define RAND_add RAND_ADD

2
lib/vtls/openssl.c
View File

@ -1578,8 +1578,6 @@ static int pkcs12load(struct Curl_easy *data,
return 0;
}
PKCS12_PBE_add();
if(!PKCS12_parse(p12, key_passwd, &pri, &x509, &ca)) {
failf(data,
"could not parse PKCS12 file, check password, " OSSL_PACKAGE