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 /crypto/evp/e_rc4_hmac_md5.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 'crypto/evp/e_rc4_hmac_md5.c')
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index e7aa1f86ad..828ed64415 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -21,15 +21,6 @@ # include <openssl/md5.h> # include "internal/evp_int.h" -# ifndef EVP_CIPH_FLAG_AEAD_CIPHER -# define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000 -# define EVP_CTRL_AEAD_TLS1_AAD 0x16 -# define EVP_CTRL_AEAD_SET_MAC_KEY 0x17 -# endif - -/* FIXME: surely this is available elsewhere? */ -# define EVP_RC4_KEY_SIZE 16 - typedef struct { RC4_KEY ks; MD5_CTX head, tail, md; |