diff options
| author | Matt Caswell <matt@openssl.org> | 2019-05-13 06:41:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-05-23 11:02:04 +0100 |
| commit | 319e518a5ae17fb8def2bd9209675acbaa6c22c2 (patch) | |
| tree | 34d515cc857f1a4adf37311228925330ad635dd3 /crypto/property | |
| parent | 3593266d1c924ea595a1074e78381890f964392c (diff) | |
Make some EVP code available from within the FIPS module
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8728)
Diffstat (limited to 'crypto/property')
| -rw-r--r-- | crypto/property/build.info | 2 | ||||
| -rw-r--r-- | crypto/property/property.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crypto/property/build.info b/crypto/property/build.info index 3a86b6e141..3bdf307c92 100644 --- a/crypto/property/build.info +++ b/crypto/property/build.info @@ -1,3 +1,5 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=property_string.c property_parse.c property.c \ property_err.c defn_cache.c +SOURCE[../../providers/fips]=\ + property_string.c property_parse.c property.c defn_cache.c diff --git a/crypto/property/property.c b/crypto/property/property.c index 9dd8f6a3ff..4c328ffbd8 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -391,6 +391,8 @@ IMPLEMENT_LHASH_DOALL_ARG(QUERY, IMPL_CACHE_FLUSH); */ static void impl_cache_flush_cache(QUERY *c, IMPL_CACHE_FLUSH *state) { +#if !defined(FIPS_MODE) +/* TODO(3.0): No RAND_bytes yet in FIPS module. Add this back when available */ OSSL_METHOD_STORE *store = state->store; unsigned int n; @@ -404,6 +406,7 @@ static void impl_cache_flush_cache(QUERY *c, IMPL_CACHE_FLUSH *state) OPENSSL_free(lh_QUERY_delete(state->cache, c)); else state->nelem++; +#endif /* !defined(FIPS_MODE) */ } static void impl_cache_flush_one_alg(ossl_uintmax_t idx, ALGORITHM *alg, |