diff options
author | Matthew Braithwaite <mab@google.com> | 2016-09-08 01:09:58 +0300 |
---|---|---|
committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2016-09-16 06:06:36 +0300 |
commit | 8aaa9e12c288c49134181aa4a8bb27ea5abfd4da (patch) | |
tree | 898a91a6f5cf4caca5b0e4ff8633b018b2b64a5d /include/openssl | |
parent | 6e3f5cc7e16b8ab1b0a924c60f14332cb1697217 (diff) |
Remove RC4 from TLS for real.
This withdraws support for -DBORINGSSL_ENABLE_RC4_TLS, and removes the
RC4 AEADs.
Change-Id: I1321b76bfe047d180743fa46d1b81c5d70c64e81
Reviewed-on: https://boringssl-review.googlesource.com/10940
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'include/openssl')
-rw-r--r-- | include/openssl/aead.h | 10 | ||||
-rw-r--r-- | include/openssl/ssl.h | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/openssl/aead.h b/include/openssl/aead.h index 0cad405e..458d73bc 100644 --- a/include/openssl/aead.h +++ b/include/openssl/aead.h @@ -266,9 +266,6 @@ OPENSSL_EXPORT int EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, uint8_t *out, * unpredictable. They only accept an |ad| parameter of length 11 (the standard * TLS one with length omitted). */ -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_rc4_md5_tls(void); -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_rc4_sha1_tls(void); - OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_128_cbc_sha1_tls(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_128_cbc_sha1_tls_implicit_iv(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_128_cbc_sha256_tls(void); @@ -292,8 +289,6 @@ OPENSSL_EXPORT const EVP_AEAD *EVP_aead_null_sha1_tls(void); * and may not be used concurrently. They only accept an |ad| parameter of * length 9 (the standard TLS one with length and version omitted). */ -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_rc4_md5_ssl3(void); -OPENSSL_EXPORT const EVP_AEAD *EVP_aead_rc4_sha1_ssl3(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_128_cbc_sha1_ssl3(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_aes_256_cbc_sha1_ssl3(void); OPENSSL_EXPORT const EVP_AEAD *EVP_aead_des_ede3_cbc_sha1_ssl3(void); @@ -315,11 +310,6 @@ OPENSSL_EXPORT int EVP_AEAD_CTX_init_with_direction( EVP_AEAD_CTX *ctx, const EVP_AEAD *aead, const uint8_t *key, size_t key_len, size_t tag_len, enum evp_aead_direction_t dir); -/* EVP_AEAD_CTX_get_rc4_state sets |*out_key| to point to an RC4 key structure. - * It returns one on success or zero if |ctx| doesn't have an RC4 key. */ -OPENSSL_EXPORT int EVP_AEAD_CTX_get_rc4_state(const EVP_AEAD_CTX *ctx, - const RC4_KEY **out_key); - /* EVP_AEAD_CTX_get_iv sets |*out_len| to the length of the IV for |ctx| and * sets |*out_iv| to point to that many bytes of the current IV. This is only * meaningful for AEADs with implicit IVs (i.e. CBC mode in SSLv3 and TLS 1.0). diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 996ee7b5..21825da5 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1168,9 +1168,6 @@ OPENSSL_EXPORT int SSL_CIPHER_is_CHACHA20POLY1305(const SSL_CIPHER *cipher); /* SSL_CIPHER_is_NULL returns one if |cipher| does not encrypt. */ OPENSSL_EXPORT int SSL_CIPHER_is_NULL(const SSL_CIPHER *cipher); -/* SSL_CIPHER_is_RC4 returns one if |cipher| uses RC4. */ -OPENSSL_EXPORT int SSL_CIPHER_is_RC4(const SSL_CIPHER *cipher); - /* SSL_CIPHER_is_block_cipher returns one if |cipher| is a block cipher. */ OPENSSL_EXPORT int SSL_CIPHER_is_block_cipher(const SSL_CIPHER *cipher); @@ -2761,12 +2758,6 @@ OPENSSL_EXPORT int SSL_CTX_get_ex_new_index(long argl, void *argp, /* Low-level record-layer state. */ -/* SSL_get_rc4_state sets |*read_key| and |*write_key| to the RC4 states for - * the read and write directions. It returns one on success or zero if |ssl| - * isn't using an RC4-based cipher suite. */ -OPENSSL_EXPORT int SSL_get_rc4_state(const SSL *ssl, const RC4_KEY **read_key, - const RC4_KEY **write_key); - /* SSL_get_ivs sets |*out_iv_len| to the length of the IVs for the ciphers * underlying |ssl| and sets |*out_read_iv| and |*out_write_iv| to point to the * current IVs for the read and write directions. This is only meaningful for |