Cleanup EVP_CIPH/EP_CTRL duplicate defines
authorTodd Short <tshort@akamai.com>
Mon, 9 Jan 2017 20:29:42 +0000 (15:29 -0500)
committerRichard Levitte <levitte@openssl.org>
Tue, 24 Jan 2017 17:48:16 +0000 (18:48 +0100)
commitf5eab25a7c03c5fb1d3fab55c506907f8fbd427e
treebe2800bd1caa617a677bf995ac399b6323f8b911
parent75249be2ce76a75953869f9d249ef0ec8f701d94
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)
apps/speed.c
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/evp/e_aes_cbc_hmac_sha256.c
crypto/evp/e_rc4.c
crypto/evp/e_rc4_hmac_md5.c
crypto/include/internal/evp_int.h
ssl/record/rec_layer_s3.c