diff options
Diffstat (limited to 'providers')
-rw-r--r-- | providers/common/capabilities.c | 4 | ||||
-rw-r--r-- | providers/common/include/prov/providercommon.h | 2 | ||||
-rw-r--r-- | providers/defltprov.c | 3 | ||||
-rw-r--r-- | providers/fips/fipsprov.c | 12 | ||||
-rw-r--r-- | providers/implementations/ciphers/cipher_aes_xts.c | 2 | ||||
-rw-r--r-- | providers/implementations/ciphers/cipher_aes_xts.h | 2 | ||||
-rw-r--r-- | providers/implementations/ciphers/cipher_aes_xts_fips.c | 4 |
7 files changed, 15 insertions, 14 deletions
diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c index d455d498ea..781acae8db 100644 --- a/providers/common/capabilities.c +++ b/providers/common/capabilities.c @@ -214,8 +214,8 @@ static int tls_group_capability(OSSL_CALLBACK *cb, void *arg) return 1; } -int provider_get_capabilities(void *provctx, const char *capability, - OSSL_CALLBACK *cb, void *arg) +int ossl_prov_get_capabilities(void *provctx, const char *capability, + OSSL_CALLBACK *cb, void *arg) { if (strcasecmp(capability, "TLS-GROUP") == 0) return tls_group_capability(cb, arg); diff --git a/providers/common/include/prov/providercommon.h b/providers/common/include/prov/providercommon.h index 33bd8bd732..6906554b0e 100644 --- a/providers/common/include/prov/providercommon.h +++ b/providers/common/include/prov/providercommon.h @@ -15,7 +15,7 @@ const OSSL_CORE_HANDLE *FIPS_get_core_handle(OSSL_LIB_CTX *ctx); int ossl_cipher_capable_aes_cbc_hmac_sha1(void); int ossl_cipher_capable_aes_cbc_hmac_sha256(void); -OSSL_FUNC_provider_get_capabilities_fn provider_get_capabilities; +OSSL_FUNC_provider_get_capabilities_fn ossl_prov_get_capabilities; /* Set the error state if this is a FIPS module */ void ossl_set_error_state(const char *type); diff --git a/providers/defltprov.c b/providers/defltprov.c index 01e3f9ced4..63e8f67509 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -512,7 +512,8 @@ static const OSSL_DISPATCH deflt_dispatch_table[] = { { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))deflt_gettable_params }, { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))deflt_get_params }, { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))deflt_query }, - { OSSL_FUNC_PROVIDER_GET_CAPABILITIES, (void (*)(void))provider_get_capabilities }, + { OSSL_FUNC_PROVIDER_GET_CAPABILITIES, + (void (*)(void))ossl_prov_get_capabilities }, { 0, NULL } }; diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 70826181e5..56892aa4c8 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -477,7 +477,7 @@ static const OSSL_DISPATCH fips_dispatch_table[] = { { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))fips_get_params }, { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))fips_query }, { OSSL_FUNC_PROVIDER_GET_CAPABILITIES, - (void (*)(void))provider_get_capabilities }, + (void (*)(void))ossl_prov_get_capabilities }, { OSSL_FUNC_PROVIDER_SELF_TEST, (void (*)(void))fips_self_test }, { 0, NULL } }; @@ -647,11 +647,11 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle, * the provider context of this inner instance with the same library context * that was used in the EVP call that initiated this recursive call. */ -OSSL_provider_init_fn fips_intern_provider_init; -int fips_intern_provider_init(const OSSL_CORE_HANDLE *handle, - const OSSL_DISPATCH *in, - const OSSL_DISPATCH **out, - void **provctx) +OSSL_provider_init_fn ossl_fips_intern_provider_init; +int ossl_fips_intern_provider_init(const OSSL_CORE_HANDLE *handle, + const OSSL_DISPATCH *in, + const OSSL_DISPATCH **out, + void **provctx) { OSSL_FUNC_core_get_libctx_fn *c_internal_get_libctx = NULL; diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index 5cfb22778e..dce2032986 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/providers/implementations/ciphers/cipher_aes_xts.c @@ -54,7 +54,7 @@ static OSSL_FUNC_cipher_settable_ctx_params_fn aes_xts_settable_ctx_params; static int aes_xts_check_keys_differ(const unsigned char *key, size_t bytes, int enc) { - if ((!allow_insecure_decrypt || enc) + if ((!ossl_aes_xts_allow_insecure_decrypt || enc) && CRYPTO_memcmp(key, key + bytes, bytes) == 0) { ERR_raise(ERR_LIB_PROV, PROV_R_XTS_DUPLICATED_KEYS); return 0; diff --git a/providers/implementations/ciphers/cipher_aes_xts.h b/providers/implementations/ciphers/cipher_aes_xts.h index 95b5c9074c..8fca63bc4b 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.h +++ b/providers/implementations/ciphers/cipher_aes_xts.h @@ -15,7 +15,7 @@ * Available in cipher_fips.c, and compiled with different values depending * on we're in the FIPS module or not. */ -extern const int allow_insecure_decrypt; +extern const int ossl_aes_xts_allow_insecure_decrypt; PROV_CIPHER_FUNC(void, xts_stream, (const unsigned char *in, unsigned char *out, size_t len, diff --git a/providers/implementations/ciphers/cipher_aes_xts_fips.c b/providers/implementations/ciphers/cipher_aes_xts_fips.c index b294bdecaf..60d4d0772a 100644 --- a/providers/implementations/ciphers/cipher_aes_xts_fips.c +++ b/providers/implementations/ciphers/cipher_aes_xts_fips.c @@ -17,7 +17,7 @@ #include "cipher_aes_xts.h" #ifdef FIPS_MODULE -const int allow_insecure_decrypt = 0; +const int ossl_aes_xts_allow_insecure_decrypt = 0; #else -const int allow_insecure_decrypt = 1; +const int ossl_aes_xts_allow_insecure_decrypt = 1; #endif /* FIPS_MODULE */ |