diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-02-25 09:08:54 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-03-18 17:52:37 +1000 |
| commit | 9500c8234d8e99396717b9e43f10cc518e8bf668 (patch) | |
| tree | 51975e210b7900643c21d2ad67b3a65a902fc591 /providers/implementations/kdfs | |
| parent | e4bec869104cf4ba51cbb1effb0f5437e327ecd8 (diff) | |
Fix misc external ossl_ symbols.
Partial fix for #12964
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14473)
Diffstat (limited to 'providers/implementations/kdfs')
| -rw-r--r-- | providers/implementations/kdfs/pbkdf2.c | 2 | ||||
| -rw-r--r-- | providers/implementations/kdfs/pbkdf2.h | 2 | ||||
| -rw-r--r-- | providers/implementations/kdfs/pbkdf2_fips.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index eb7b15de59..14c78b518c 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -119,7 +119,7 @@ static void kdf_pbkdf2_init(KDF_PBKDF2 *ctx) /* This is an error, but there is no way to indicate such directly */ ossl_prov_digest_reset(&ctx->digest); ctx->iter = PKCS5_DEFAULT_ITER; - ctx->lower_bound_checks = kdf_pbkdf2_default_checks; + ctx->lower_bound_checks = ossl_kdf_pbkdf2_default_checks; } static int pbkdf2_set_membuf(unsigned char **buffer, size_t *buflen, diff --git a/providers/implementations/kdfs/pbkdf2.h b/providers/implementations/kdfs/pbkdf2.h index c8c2e5b8a7..c0848e26fc 100644 --- a/providers/implementations/kdfs/pbkdf2.h +++ b/providers/implementations/kdfs/pbkdf2.h @@ -11,4 +11,4 @@ * Available in pbkdfe_fips.c, and compiled with different values depending * on we're in the FIPS module or not. */ -extern const int kdf_pbkdf2_default_checks; +extern const int ossl_kdf_pbkdf2_default_checks; diff --git a/providers/implementations/kdfs/pbkdf2_fips.c b/providers/implementations/kdfs/pbkdf2_fips.c index be60be1fa0..916d9ef078 100644 --- a/providers/implementations/kdfs/pbkdf2_fips.c +++ b/providers/implementations/kdfs/pbkdf2_fips.c @@ -14,7 +14,7 @@ * Extra checks are done by default in fips mode only. */ #ifdef FIPS_MODULE -const int kdf_pbkdf2_default_checks = 1; +const int ossl_kdf_pbkdf2_default_checks = 1; #else -const int kdf_pbkdf2_default_checks = 0; +const int ossl_kdf_pbkdf2_default_checks = 0; #endif /* FIPS_MODULE */ |