This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 1c013b3ad Remove unused code
1c013b3ad is described below
commit 1c013b3ad5b4cebbb0c13bd23d6407f8dd348d2c
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 27 11:37:23 2026 +0100
Remove unused code
---
native/include/ssl_private.h | 66 +-------------------------------------------
1 file changed, 1 insertion(+), 65 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 7f4865044..d032267a6 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -82,8 +82,6 @@
#define SSL_MODE_COMBINED (2)
#define SSL_DEFAULT_CACHE_SIZE (256)
-#define SSL_DEFAULT_VHOST_NAME ("_default_:443")
-#define SSL_MAX_STR_LEN (2048)
#define SSL_MAX_PASSWORD_LEN (256)
#define SSL_CVERIFY_UNSET (-1)
@@ -93,57 +91,6 @@
#define SSL_CVERIFY_OPTIONAL_NO_CA (3)
#define SSL_VERIFY_PEER_STRICT
(SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
-#define SSL_TO_APR_ERROR(X) (APR_OS_START_USERERR + 1000 + X)
-
-#define SSL_INFO_SESSION_ID (0x0001)
-#define SSL_INFO_CIPHER (0x0002)
-#define SSL_INFO_CIPHER_USEKEYSIZE (0x0003)
-#define SSL_INFO_CIPHER_ALGKEYSIZE (0x0004)
-#define SSL_INFO_CIPHER_VERSION (0x0005)
-#define SSL_INFO_CIPHER_DESCRIPTION (0x0006)
-#define SSL_INFO_PROTOCOL (0x0007)
-
-#define SSL_INFO_CLIENT_S_DN (0x0010)
-#define SSL_INFO_CLIENT_I_DN (0x0020)
-#define SSL_INFO_SERVER_S_DN (0x0040)
-#define SSL_INFO_SERVER_I_DN (0x0080)
-
-#define SSL_INFO_DN_COUNTRYNAME (0x0001)
-#define SSL_INFO_DN_STATEORPROVINCENAME (0x0002)
-#define SSL_INFO_DN_LOCALITYNAME (0x0003)
-#define SSL_INFO_DN_ORGANIZATIONNAME (0x0004)
-#define SSL_INFO_DN_ORGANIZATIONALUNITNAME (0x0005)
-#define SSL_INFO_DN_COMMONNAME (0x0006)
-#define SSL_INFO_DN_TITLE (0x0007)
-#define SSL_INFO_DN_INITIALS (0x0008)
-#define SSL_INFO_DN_GIVENNAME (0x0009)
-#define SSL_INFO_DN_SURNAME (0x000A)
-#define SSL_INFO_DN_DESCRIPTION (0x000B)
-#define SSL_INFO_DN_UNIQUEIDENTIFIER (0x000C)
-#define SSL_INFO_DN_EMAILADDRESS (0x000D)
-
-#define SSL_INFO_CLIENT_MASK (0x0100)
-
-#define SSL_INFO_CLIENT_M_VERSION (0x0101)
-#define SSL_INFO_CLIENT_M_SERIAL (0x0102)
-#define SSL_INFO_CLIENT_V_START (0x0103)
-#define SSL_INFO_CLIENT_V_END (0x0104)
-#define SSL_INFO_CLIENT_A_SIG (0x0105)
-#define SSL_INFO_CLIENT_A_KEY (0x0106)
-#define SSL_INFO_CLIENT_CERT (0x0107)
-#define SSL_INFO_CLIENT_V_REMAIN (0x0108)
-
-#define SSL_INFO_SERVER_MASK (0x0200)
-
-#define SSL_INFO_SERVER_M_VERSION (0x0201)
-#define SSL_INFO_SERVER_M_SERIAL (0x0202)
-#define SSL_INFO_SERVER_V_START (0x0203)
-#define SSL_INFO_SERVER_V_END (0x0204)
-#define SSL_INFO_SERVER_A_SIG (0x0205)
-#define SSL_INFO_SERVER_A_KEY (0x0206)
-#define SSL_INFO_SERVER_CERT (0x0207)
-#define SSL_INFO_CLIENT_CERT_CHAIN (0x0400)
-
#define SSL_VERIFY_ERROR_IS_OPTIONAL(errnum) \
((errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) \
|| (errnum == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN) \
@@ -157,14 +104,6 @@
#define SSL_CIPHERS_ALWAYS_DISABLED ("!aNULL:!eNULL:!EXP:")
-#if defined(SSL_OP_NO_TLSv1_1)
-#define HAVE_TLSV1_1
-#endif
-
-#if defined(SSL_OP_NO_TLSv1_2)
-#define HAVE_TLSV1_2
-#endif
-
#if defined(SSL_OP_NO_TLSv1_3)
#define HAVE_TLSV1_3
#endif
@@ -180,8 +119,6 @@
*/
#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name)
-#define HAVE_TLSEXT
-
/* ECC */
#if !defined(OPENSSL_NO_EC) && defined(TLSEXT_ECPOINTFORMAT_uncompressed)
#define HAVE_ECC
@@ -309,12 +246,11 @@ void *SSL_get_app_data4(const SSL *);
void SSL_set_app_data4(SSL *, void *);
int SSL_password_prompt(tcn_pass_cb_t *);
int SSL_password_callback(char *, int, int, void *);
-DH *SSL_get_dh_params(unsigned keylen);
EVP_PKEY *SSL_dh_GetParamFromFile(const char *);
#ifdef HAVE_ECC
int SSL_ec_GetParamFromFile(const char *);
#endif
-DH *SSL_callback_tmp_DH(SSL *, int, int);
+
int SSL_CTX_use_certificate_chain(SSL_CTX *, const char *, int);
int SSL_callback_SSL_verify(int, X509_STORE_CTX *);
int SSL_rand_seed(const char *file);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
