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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 01e3db26cb..f0ac4a4df3 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -17,10 +17,6 @@ #include <openssl/rand.h> #include "record_locl.h" -#ifndef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK -# define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 -#endif - #if defined(OPENSSL_SMALL_FOOTPRINT) || \ !( defined(AES_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ |