upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-21 07:10:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix for correct openssl error when adding windows CA certificates to

Browse source 
the openssl trust store.
This commit is contained in:
George Thessalonikefs 2022-07-03 22:41:39 +02:00
parent 317bab9f1d
commit a30286502c
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -3,6 +3,8 @@
mode on openssl3. mode on openssl3.
- Merge PR #660 from Petr Menšík: Sha1 runtime insecure. - Merge PR #660 from Petr Menšík: Sha1 runtime insecure.
- For #660: formatting, less verbose logging, add EDE information. - For #660: formatting, less verbose logging, add EDE information.
- Fix for correct openssl error when adding windows CA certificates to
the openssl trust store.
1 July 2022: George 1 July 2022: George
- Merge PR #706: NXNS fallback. - Merge PR #706: NXNS fallback.

8
util/net_help.c
View file

@ -1162,10 +1162,11 @@ add_WIN_cacerts_to_openssl_store(SSL_CTX* tls_ctx)
(const unsigned char **)&pTargetCert->pbCertEncoded, (const unsigned char **)&pTargetCert->pbCertEncoded,
pTargetCert->cbCertEncoded); pTargetCert->cbCertEncoded);
if (!cert1) { if (!cert1) {
unsigned long error = ERR_get_error();
/* return error if a cert fails */ /* return error if a cert fails */
verbose(VERB_ALGO, "%s %d:%s", verbose(VERB_ALGO, "%s %d:%s",
"Unable to parse certificate in memory", "Unable to parse certificate in memory",
(int)ERR_get_error(), ERR_error_string(ERR_get_error(), NULL)); (int)error, ERR_error_string(error, NULL));
return 0; return 0;
} }
else { else {
@ -1177,9 +1178,10 @@ add_WIN_cacerts_to_openssl_store(SSL_CTX* tls_ctx)
* certificate is already in the store. */ * certificate is already in the store. */
if(ERR_GET_LIB(error) != ERR_LIB_X509 || if(ERR_GET_LIB(error) != ERR_LIB_X509 ||
ERR_GET_REASON(error) != X509_R_CERT_ALREADY_IN_HASH_TABLE) { ERR_GET_REASON(error) != X509_R_CERT_ALREADY_IN_HASH_TABLE) {
error = ERR_get_error();
verbose(VERB_ALGO, "%s %d:%s\n", verbose(VERB_ALGO, "%s %d:%s\n",
"Error adding certificate", (int)ERR_get_error(), "Error adding certificate", (int)error,
ERR_error_string(ERR_get_error(), NULL)); ERR_error_string(error, NULL));
X509_free(cert1); X509_free(cert1);
return 0; return 0;
} }