vtls: remove call to PKCS12_PBE_add()

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:
https://github.com/openssl/openssl/commit/b8f702a0affa2087758230967b55df504a176774

Closes #19201

diff --git a/lib/setup-vms.h b/lib/setup-vms.h
index 0fd5e542b775075f3fef2c7e64ad716dba3e8819..e3777ded6e10d5ab26f33ccebe3389e350195397 100644 (file)
--- a/lib/setup-vms.h
+++ b/lib/setup-vms.h
@@ -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

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 336902b95105d7c8e7236d126a23318686534cf3..535e4118da815e5a77bfcee0de09d32d6cb0ec2f 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -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