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/include/internal/evp_int.h | |
| 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/include/internal/evp_int.h')
| -rw-r--r-- | crypto/include/internal/evp_int.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index bb8a278ba7..b5b6a13004 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -384,3 +384,10 @@ struct evp_pkey_st { void openssl_add_all_ciphers_int(void); void openssl_add_all_digests_int(void); void evp_cleanup_int(void); + +/* Pulling defines out of C soure files */ + +#define EVP_RC4_KEY_SIZE 16 +#ifndef TLS1_1_VERSION +# define TLS1_1_VERSION 0x0302 +#endif |