From: Matt Caswell Date: Wed, 14 Oct 2020 16:31:59 +0000 (+0100) Subject: Remove fuzzing of deprecated functions in a no-deprecated build X-Git-Tag: openssl-3.0.0-alpha10~245 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb64795f962e756b9ac5f033bd512b609c3b1468;p=thirdparty%2Fopenssl.git Remove fuzzing of deprecated functions in a no-deprecated build d2i_DHparams and i2d_DHparam as well as the equivalent DHX functions are deprecated. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/13138) --- diff --git a/fuzz/asn1.c b/fuzz/asn1.c index 9a4e454b2f8..a6f1405881e 100644 --- a/fuzz/asn1.c +++ b/fuzz/asn1.c @@ -331,7 +331,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) DO_TEST_NO_PRINT(ESS_SIGNING_CERT, d2i_ESS_SIGNING_CERT, i2d_ESS_SIGNING_CERT); DO_TEST_NO_PRINT(ESS_CERT_ID_V2, d2i_ESS_CERT_ID_V2, i2d_ESS_CERT_ID_V2); DO_TEST_NO_PRINT(ESS_SIGNING_CERT_V2, d2i_ESS_SIGNING_CERT_V2, i2d_ESS_SIGNING_CERT_V2); -#ifndef OPENSSL_NO_DH +#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0) DO_TEST_NO_PRINT(DH, d2i_DHparams, i2d_DHparams); DO_TEST_NO_PRINT(DH, d2i_DHxparams, i2d_DHxparams); #endif