This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit e9cab314133824494d6adb578bff1a84491989f7 Author: Mark Thomas <[email protected]> AuthorDate: Fri Sep 29 10:00:49 2023 +0100 Remove unused variable --- native/src/ssl.c | 145 ------------------------------------------------------- 1 file changed, 145 deletions(-) diff --git a/native/src/ssl.c b/native/src/ssl.c index a1ab58fa0..b114be67c 100644 --- a/native/src/ssl.c +++ b/native/src/ssl.c @@ -43,151 +43,6 @@ static void ssl_keylog_callback(const SSL *ssl, const char *line) static jclass byteArrayClass; static jclass stringClass; -/* - * supported_ssl_opts is a bitmask that contains all supported SSL_OP_* - * options at compile-time. - * - * Note that at least up through OpenSSL 0.9.8o, checking SSL_OP_ALL will - * return JNI_FALSE because SSL_OP_ALL is a mask that covers all bug - * workarounds for OpenSSL including future workarounds that are defined - * to be in the least-significant 3 nibbles of the SSL_OP_* bit space. - * - * This implementation has chosen NOT to simply set all those lower bits - * so that the return value for SSL_OP_FUTURE_WORKAROUND will only be - * reported by versions that actually support that specific workaround. - */ -static const jint supported_ssl_opts = 0 -/* - Specifically skip SSL_OP_ALL -#ifdef SSL_OP_ALL - | SSL_OP_ALL -#endif -*/ -#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION - | SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION -#endif - -#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE - | SSL_OP_CIPHER_SERVER_PREFERENCE -#endif - -#ifdef SSL_OP_CRYPTOPRO_TLSEXT_BUG - | SSL_OP_CRYPTOPRO_TLSEXT_BUG -#endif - -#ifdef SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS - | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS -#endif - -#ifdef SSL_OP_EPHEMERAL_RSA - | SSL_OP_EPHEMERAL_RSA -#endif - -#ifdef SSL_OP_LEGACY_SERVER_CONNECT - | SSL_OP_LEGACY_SERVER_CONNECT -#endif - -#ifdef SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER - | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER -#endif - -#ifdef SSL_OP_MICROSOFT_SESS_ID_BUG - | SSL_OP_MICROSOFT_SESS_ID_BUG -#endif - -#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING - | SSL_OP_MSIE_SSLV2_RSA_PADDING -#endif - -#ifdef SSL_OP_NETSCAPE_CA_DN_BUG - | SSL_OP_NETSCAPE_CA_DN_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_CHALLENGE_BUG - | SSL_OP_NETSCAPE_CHALLENGE_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG - | SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG -#endif - -#ifdef SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG - | SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG -#endif - -#ifdef SSL_OP_NO_COMPRESSION - | SSL_OP_NO_COMPRESSION -#endif - -#ifdef SSL_OP_NO_QUERY_MTU - | SSL_OP_NO_QUERY_MTU -#endif - -#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION - | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION -#endif - -#ifdef SSL_OP_NO_SSLv2 - | SSL_OP_NO_SSLv2 -#endif - -#ifdef SSL_OP_NO_SSLv3 - | SSL_OP_NO_SSLv3 -#endif - -#ifdef SSL_OP_NO_TICKET - | SSL_OP_NO_TICKET -#endif - -#ifdef SSL_OP_NO_TLSv1 - | SSL_OP_NO_TLSv1 -#endif - -#ifdef SSL_OP_PKCS1_CHECK_1 - | SSL_OP_PKCS1_CHECK_1 -#endif - -#ifdef SSL_OP_PKCS1_CHECK_2 - | SSL_OP_PKCS1_CHECK_2 -#endif - -#ifdef SSL_OP_NO_TLSv1_1 - | SSL_OP_NO_TLSv1_1 -#endif - -#ifdef SSL_OP_NO_TLSv1_2 - | SSL_OP_NO_TLSv1_2 -#endif - -#ifdef SSL_OP_SINGLE_DH_USE - | SSL_OP_SINGLE_DH_USE -#endif - -#ifdef SSL_OP_SINGLE_ECDH_USE - | SSL_OP_SINGLE_ECDH_USE -#endif - -#ifdef SSL_OP_SSLEAY_080_CLIENT_DH_BUG - | SSL_OP_SSLEAY_080_CLIENT_DH_BUG -#endif - -#ifdef SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG - | SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG -#endif - -#ifdef SSL_OP_TLS_BLOCK_PADDING_BUG - | SSL_OP_TLS_BLOCK_PADDING_BUG -#endif - -#ifdef SSL_OP_TLS_D5_BUG - | SSL_OP_TLS_D5_BUG -#endif - -#ifdef SSL_OP_TLS_ROLLBACK_BUG - | SSL_OP_TLS_ROLLBACK_BUG -#endif - | 0; - /* * Grab well-defined DH parameters from OpenSSL, see the BN_get_rfc* * functions in <openssl/bn.h> for all available primes. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
