diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-31 23:28:45 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-06 12:07:53 +0000 |
| commit | 5ce87e11de21835255ea11cc330ebf9931e21329 (patch) | |
| tree | 95b488894f32a0c964d83f1ccec645227f124820 /providers | |
| parent | 9aa78c36ec3bdcf09742f6dea403fc09d40d420f (diff) | |
Fix builds with no-dh
The various functions in bn_const.c return primes that are
specified for use in DH. However they were not being excluded from
a no-dh build - and was therefore causing the build to fail.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10990)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/fipsprov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index c89fa64264..0301954c30 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -130,6 +130,7 @@ static OSSL_PARAM core_params[] = * The array of hex_data is used to get around compilers that dont like * strings longer than 509 bytes, */ +#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA) static int hextobn(const char *hex_data[], BIGNUM **bn) { int ret = 0; @@ -156,7 +157,9 @@ err: OPENSSL_free(str); return ret; } +#endif /* !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA) */ +#ifndef OPENSSL_NO_DH static int hextobin(const char *hex_data[], unsigned char **out, size_t *len) { int ret = 0, sz; @@ -181,6 +184,7 @@ err: BN_free(bn); return ret; } +#endif #ifndef OPENSSL_NO_DSA static int dsa_key_signature_test(OPENSSL_CTX *libctx) |