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 bac074ee8 Remove unused code
bac074ee8 is described below
commit bac074ee8d58614ba3bc246406f34f16c64b8756
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 27 10:29:09 2026 +0100
Remove unused code
---
native/include/ssl_private.h | 7 -------
native/src/ssl.c | 1 -
native/src/sslcontext.c | 11 -----------
3 files changed, 19 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 0d3c2a5f2..26a97c843 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -107,11 +107,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_SHUTDOWN_TYPE_UNSET (0)
-#define SSL_SHUTDOWN_TYPE_STANDARD (1)
-#define SSL_SHUTDOWN_TYPE_UNCLEAN (2)
-#define SSL_SHUTDOWN_TYPE_ACCURATE (3)
-
#define SSL_TO_APR_ERROR(X) (APR_OS_START_USERERR + 1000 + X)
#define SSL_INFO_SESSION_ID (0x0001)
@@ -263,7 +258,6 @@ struct tcn_ssl_ctxt_t {
X509 *certs[SSL_AIDX_MAX];
EVP_PKEY *keys[SSL_AIDX_MAX];
- int shutdown_type;
char *rand_file;
/* for client or downstream server authentication */
@@ -315,7 +309,6 @@ typedef struct {
tcn_ssl_ctxt_t *ctx;
SSL *ssl;
X509 *peer;
- int shutdown_type;
/* Track the handshake/renegotiation state for the connection so
* that all client-initiated renegotiations can be rejected, as a
* partial fix for CVE-2009-3555.
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 9c5b08c50..4a9b85d21 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -570,7 +570,6 @@ TCN_IMPLEMENT_CALL(jlong /* SSL * */, SSL,
newSSL)(TCN_STDARGS,
con->pool = p;
con->ctx = c;
con->ssl = ssl;
- con->shutdown_type = c->shutdown_type;
/* Store the handshakeCount in the SSL instance. */
*handshakeCount = 0;
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 13960ca1c..b50690587 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -199,7 +199,6 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS,
jlong pool,
*/
c->verify_depth = 1;
c->verify_mode = SSL_CVERIFY_UNSET;
- c->shutdown_type = SSL_SHUTDOWN_TYPE_UNSET;
/* Set default password callback */
SSL_CTX_set_default_passwd_cb(c->ctx, (pem_password_cb
*)SSL_password_callback);
@@ -596,16 +595,6 @@ cleanup:
return rv;
}
-TCN_IMPLEMENT_CALL(void, SSLContext, setShutdownType)(TCN_STDARGS, jlong ctx,
- jint type)
-{
- tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
-
- UNREFERENCED_STDARGS;
- TCN_ASSERT(ctx != 0);
- c->shutdown_type = type;
-}
-
TCN_IMPLEMENT_CALL(void, SSLContext, setVerify)(TCN_STDARGS, jlong ctx,
jint level, jint depth)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
