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:47:10 +0100 |
| commit | 9d6fcd4295fef7ebc4232aab85718a99d36cc50a (patch) | |
| tree | 1f6428efe38c98f4417d63c265a1955a124dfd1e /apps/speed.c | |
| parent | 7928ee4d685b727619555bc1ec0aee805f6fc8c4 (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)
Diffstat (limited to 'apps/speed.c')
| -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 10b7f97370..8f2950e369 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2274,7 +2274,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) & @@ -2291,7 +2290,6 @@ int speed_main(int argc, char **argv) ret = 0; goto end; } -#endif for (testnum = 0; testnum < SIZE_NUM; testnum++) { if (evp_cipher) { |