diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-06-13 10:40:22 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-06-15 18:01:59 +1000 |
| commit | dfdbc113eefb80712fefc3187367fe6050610da5 (patch) | |
| tree | 8cf009ea7879509c693da7877f89a6b22b993596 /include | |
| parent | 3691f1e5567d6b61ed917adf48b40ae95ac5cb17 (diff) | |
Partially revert #18070 (Add support for Windows CA certificate store)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21190)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/common.h | 8 | ||||
| -rw-r--r-- | include/openssl/x509.h.in | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/internal/common.h b/include/internal/common.h index 6921a3ccd0..f941eddbe1 100644 --- a/include/internal/common.h +++ b/include/internal/common.h @@ -75,14 +75,6 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, # define CTLOG_FILE "OSSL$DATAROOT:[000000]ct_log_list.cnf" # endif -#ifndef OPENSSL_NO_WINSTORE -# define X509_CERT_URI "org.openssl.winstore://" -#else -# define X509_CERT_URI "" -#endif - -# define X509_CERT_URI_EVP "SSL_CERT_URI" -# define X509_CERT_PATH_EVP "SSL_CERT_PATH" # define X509_CERT_DIR_EVP "SSL_CERT_DIR" # define X509_CERT_FILE_EVP "SSL_CERT_FILE" # define CTLOG_FILE_EVP "CTLOG_FILE" diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in index d45ce19e32..d74f944bdc 100644 --- a/include/openssl/x509.h.in +++ b/include/openssl/x509.h.in @@ -495,11 +495,8 @@ ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s, ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj); const char *X509_get_default_cert_area(void); -const char *X509_get_default_cert_uri(void); const char *X509_get_default_cert_dir(void); const char *X509_get_default_cert_file(void); -const char *X509_get_default_cert_uri_env(void); -const char *X509_get_default_cert_path_env(void); const char *X509_get_default_cert_dir_env(void); const char *X509_get_default_cert_file_env(void); const char *X509_get_default_private_dir(void); |