diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-10-15 13:41:59 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-26 15:22:14 +0100 |
| commit | 5b5eea4b60b682009d2b15587c9ceeae5e9c73f8 (patch) | |
| tree | 4a3261cb27a582770270a07b40ecf05ecb71c89a /apps/speed.c | |
| parent | 98dbf2c1c8143c0cc6dd05be7950d90bc6792064 (diff) | |
| download | openssl-5b5eea4b60b682009d2b15587c9ceeae5e9c73f8.zip openssl-5b5eea4b60b682009d2b15587c9ceeae5e9c73f8.tar.gz openssl-5b5eea4b60b682009d2b15587c9ceeae5e9c73f8.tar.bz2 | |
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 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/speed.c b/apps/speed.c index c8c4f65..e2b98c8 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -583,7 +583,9 @@ typedef struct loopargs_st { DSA *dsa_key[DSA_NUM]; #endif #ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_DEPRECATED_3_0 EC_KEY *ecdsa[ECDSA_NUM]; +# endif EVP_PKEY_CTX *ecdh_ctx[EC_NUM]; EVP_MD_CTX *eddsa_ctx[EdDSA_NUM]; EVP_MD_CTX *eddsa_ctx2[EdDSA_NUM]; @@ -4082,8 +4084,10 @@ int speed_main(int argc, char **argv) DSA_free(loopargs[i].dsa_key[k]); #endif #ifndef OPENSSL_NO_EC +# if !defined(OPENSSL_NO_DEPRECATED_3_0) for (k = 0; k < ECDSA_NUM; k++) EC_KEY_free(loopargs[i].ecdsa[k]); +# endif for (k = 0; k < EC_NUM; k++) EVP_PKEY_CTX_free(loopargs[i].ecdh_ctx[k]); for (k = 0; k < EdDSA_NUM; k++) { |