diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-10-15 05:41:59 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-26 15:22:14 +0100 |
| commit | 5b5eea4b60b682009d2b15587c9ceeae5e9c73f8 (patch) | |
| tree | 4a3261cb27a582770270a07b40ecf05ecb71c89a /fuzz/asn1.c | |
| parent | Add functions to set values into an EVP_PKEY (diff) | |
| download | openssl-5b5eea4b60b682009d2b15587c9ceeae5e9c73f8.tar.xz openssl-5b5eea4b60b682009d2b15587c9ceeae5e9c73f8.zip | |
Deprecate EC_KEY + Update ec apps to use EVP_PKEY
Co-author: Richard Levitte <levitte@openssl.org>
Co-author: Tomas Mraz <tmraz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13139)
Diffstat (limited to 'fuzz/asn1.c')
| -rw-r--r-- | fuzz/asn1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fuzz/asn1.c b/fuzz/asn1.c index b0d2ecd14e..e85a9607a4 100644 --- a/fuzz/asn1.c +++ b/fuzz/asn1.c @@ -96,7 +96,7 @@ static ASN1_ITEM_EXP *item_type[] = { ASN1_ITEM_ref(DISPLAYTEXT), ASN1_ITEM_ref(DIST_POINT), ASN1_ITEM_ref(DIST_POINT_NAME), -#ifndef OPENSSL_NO_EC +#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DEPRECATED_3_0) ASN1_ITEM_ref(ECPARAMETERS), ASN1_ITEM_ref(ECPKPARAMETERS), #endif @@ -347,10 +347,10 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) DO_TEST_NO_PRINT(RSA, d2i_RSAPublicKey, i2d_RSAPublicKey); #endif #ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_DEPRECATED_3_0 DO_TEST_PRINT_OFFSET(EC_GROUP, d2i_ECPKParameters, i2d_ECPKParameters, ECPKParameters_print); DO_TEST_PRINT_OFFSET(EC_KEY, d2i_ECPrivateKey, i2d_ECPrivateKey, EC_KEY_print); DO_TEST(EC_KEY, d2i_ECParameters, i2d_ECParameters, ECParameters_print); -# ifndef OPENSSL_NO_DEPRECATED_3_0 DO_TEST_NO_PRINT(ECDSA_SIG, d2i_ECDSA_SIG, i2d_ECDSA_SIG); # endif #endif |