diff options
| author | Hugo Landau <hlandau@openssl.org> | 2022-04-08 13:20:44 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-09-14 14:10:18 +0100 |
| commit | 606e0426a148034c8c131de9f31f7d3e38be99ea (patch) | |
| tree | 2d91031e79f6b5bb2f83076924e4f1de54655d7e /crypto/x509/by_store.c | |
| parent | 021859bf810a3614758c2f4871b9cd7202fac9b2 (diff) | |
| download | openssl-new-606e0426a148034c8c131de9f31f7d3e38be99ea.tar.gz | |
Add support for loading root CAs from Windows crypto API
Fixes #18020.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18070)
Diffstat (limited to 'crypto/x509/by_store.c')
| -rw-r--r-- | crypto/x509/by_store.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c index 8c7ae83fae..96bd46d602 100644 --- a/crypto/x509/by_store.c +++ b/crypto/x509/by_store.c @@ -116,11 +116,8 @@ static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp, argp = ossl_safe_getenv(X509_get_default_cert_uri_env()); /* If not set, see if we have a URI in the older cert dir envvar. */ - if (argp == NULL) { + if (argp == NULL) argp = ossl_safe_getenv(X509_get_default_cert_dir_env()); - if (argp != NULL && !ossl_is_uri(argp)) - argp = NULL; - } /* Fallback to default store URI. */ if (argp == NULL) |