diff options
| author | Todd Short <tshort@akamai.com> | 2017-01-09 15:29:42 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-01-24 18:48:16 +0100 |
| commit | f5eab25a7c03c5fb1d3fab55c506907f8fbd427e (patch) | |
| tree | be2800bd1caa617a677bf995ac399b6323f8b911 /apps | |
| parent | 75249be2ce76a75953869f9d249ef0ec8f701d94 (diff) | |
Cleanup EVP_CIPH/EP_CTRL duplicate defines
Remove duplicate defines from EVP source files.
Most of them were in evp.h, which is always included.
Add new ones evp_int.h
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK is now always defined in evp.h, so
remove conditionals on it
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2201)
(cherry picked from commit 9d6fcd4295fef7ebc4232aab85718a99d36cc50a)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/speed.c b/apps/speed.c index cdd0da1100..df22422ea8 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2273,7 +2273,6 @@ int speed_main(int argc, char **argv) #endif if (doit[D_EVP]) { -#ifdef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK if (multiblock && evp_cipher) { if (! (EVP_CIPHER_flags(evp_cipher) & @@ -2290,7 +2289,6 @@ int speed_main(int argc, char **argv) ret = 0; goto end; } -#endif for (testnum = 0; testnum < SIZE_NUM; testnum++) { if (evp_cipher) { |