diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-09 15:26:17 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:38 +1000 |
| commit | c8830891e6cb8d0782986662ca50b8fa7c97f49f (patch) | |
| tree | af20cb71778e85265c8aa2adb004907b5e0be3a3 /crypto | |
| parent | 3022b7f40407aa9d50d1e4193e22a092b23c7717 (diff) | |
Add ossl_provider symbols
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/http/http_local.h | 1 | ||||
| -rw-r--r-- | crypto/provider_core.c | 2 | ||||
| -rw-r--r-- | crypto/provider_local.h | 2 | ||||
| -rw-r--r-- | crypto/provider_predefined.c | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/crypto/http/http_local.h b/crypto/http/http_local.h index 1dfa03ce8e..3164f62a77 100644 --- a/crypto/http/http_local.h +++ b/crypto/http/http_local.h @@ -14,6 +14,7 @@ # include <openssl/ocsp.h> BIO *ossl_http_asn1_item2bio(const ASN1_ITEM *it, const ASN1_VALUE *val); + OSSL_HTTP_REQ_CTX *ossl_http_req_ctx_new(BIO *wbio, BIO *rbio, int use_http_proxy, const char *server, const char *port, diff --git a/crypto/provider_core.c b/crypto/provider_core.c index cd295809be..4d77108c33 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -157,7 +157,7 @@ static void *provider_store_new(OSSL_LIB_CTX *ctx) } store->use_fallbacks = 1; - for (p = predefined_providers; p->name != NULL; p++) { + for (p = ossl_predefined_providers; p->name != NULL; p++) { OSSL_PROVIDER *prov = NULL; /* diff --git a/crypto/provider_local.h b/crypto/provider_local.h index e4c649a736..b0130eadc5 100644 --- a/crypto/provider_local.h +++ b/crypto/provider_local.h @@ -15,4 +15,4 @@ struct predefined_providers_st { unsigned int is_fallback:1; }; -extern const struct predefined_providers_st predefined_providers[]; +extern const struct predefined_providers_st ossl_predefined_providers[]; diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c index 6acf2ea1af..cfb67d9fe3 100644 --- a/crypto/provider_predefined.c +++ b/crypto/provider_predefined.c @@ -13,13 +13,13 @@ OSSL_provider_init_fn ossl_default_provider_init; OSSL_provider_init_fn ossl_base_provider_init; OSSL_provider_init_fn ossl_null_provider_init; -OSSL_provider_init_fn fips_intern_provider_init; +OSSL_provider_init_fn ossl_fips_intern_provider_init; #ifdef STATIC_LEGACY OSSL_provider_init_fn ossl_legacy_provider_init; #endif -const struct predefined_providers_st predefined_providers[] = { +const struct predefined_providers_st ossl_predefined_providers[] = { #ifdef FIPS_MODULE - { "fips", fips_intern_provider_init, 1 }, + { "fips", ossl_fips_intern_provider_init, 1 }, #else { "default", ossl_default_provider_init, 1 }, # ifdef STATIC_LEGACY |