From 2dae14877e091d1c303ee4577d9bdb606ec05fdd Mon Sep 17 00:00:00 2001 From: Paul Aurich Date: Wed, 12 Jun 2013 18:38:44 -0700 Subject: [PATCH] options: Remove dead code The workaround for 'no_compression' on older OpenSSL is handled in context.c; set_option_flag (which uses ssl_options) is never called, so this shouldn't exist. --- src/options.h | 6 +----- src/options.lua | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/options.h b/src/options.h index f0daa29..fade1e6 100644 --- a/src/options.h +++ b/src/options.h @@ -12,7 +12,7 @@ /* If you need to generate these options again, see options.lua */ /* - OpenSSL version: OpenSSL 1.0.1 14 Mar 2012 + OpenSSL version: OpenSSL 1.0.1e 2013-06-12 */ struct ssl_option_s { @@ -123,10 +123,6 @@ static ssl_option_t ssl_options[] = { #endif #if defined(SSL_OP_TLS_ROLLBACK_BUG) {"tls_rollback_bug", SSL_OP_TLS_ROLLBACK_BUG}, -#endif -#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL) - /* Add SSL_OP_NO_COMPRESSION manually if built against 0.9.8. */ - {"no_compression", 0L}, #endif {NULL, 0L} }; diff --git a/src/options.lua b/src/options.lua index 1cf5ccc..6669db8 100644 --- a/src/options.lua +++ b/src/options.lua @@ -51,11 +51,6 @@ typedef struct ssl_option_s ssl_option_t; print(string.format([[ {"%s", %s},]], name, option)) print([[#endif]]) end - print([[ -#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL) - /* Add SSL_OP_NO_COMPRESSION manually if built against 0.9.8. */ - {"no_compression", 0L}, -#endif]]) print([[ {NULL, 0L}]]) print([[ };