summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2015-06-09 14:17:50 +0200
committerEmilia Kasper <emilia@openssl.org>2015-06-10 13:55:11 +0200
commita8e4ac6a2fe67c19672ecf0c6aeafa15801ce3a5 (patch)
tree934aed3d0461152ac51aa12d6829e1934a31c743 /include
parent91d13f1a76216f7d67f7a3068bab2287831ca615 (diff)
Remove SSL_OP_TLS_BLOCK_PADDING_BUG
This is a workaround so old that nobody remembers what buggy clients it was for. It's also been broken in stable branches for two years and nobody noticed (see https://boringssl-review.googlesource.com/#/c/1694/). Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/ssl.h3
-rw-r--r--include/openssl/ssl3.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 4e18b65605..cd932e5edf 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -360,7 +360,8 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040L
# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
# define SSL_OP_TLS_D5_BUG 0x00000100L
-# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L
+/* Removed from OpenSSL 1.1.0 */
+# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0L
/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
# define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index 66bc8c6e85..138b80c81a 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -362,7 +362,8 @@ extern "C" {
# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001
# define SSL3_FLAGS_DELAY_CLIENT_FINISHED 0x0002
# define SSL3_FLAGS_POP_BUFFER 0x0004
-# define TLS1_FLAGS_TLS_PADDING_BUG 0x0008
+/* Removed from OpenSSL 1.1.0 */
+# define TLS1_FLAGS_TLS_PADDING_BUG 0x0
# define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010
# define TLS1_FLAGS_KEEP_HANDSHAKE 0x0020
/*