You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/08/27 11:57:33 UTC
(tomcat-native) 05/06: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 8e56b03f0df5a13b2f018ed43d7953ef9f0317c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 27 10:17:24 2026 +0100
Remove unused code
---
native/include/ssl_private.h | 3 +--
native/src/ssl.c | 2 --
native/src/sslcontext.c | 4 ----
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index fa9ff2534..8c27f80ba 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -275,8 +275,7 @@ struct tcn_ssl_ctxt_t {
/* certificate revocation list */
X509_STORE *crl;
- /* pointer to the context verify store */
- X509_STORE *store;
+
X509 *certs[SSL_AIDX_MAX];
EVP_PKEY *keys[SSL_AIDX_MAX];
diff --git a/native/src/ssl.c b/native/src/ssl.c
index 99705d88c..f32abc387 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -1591,8 +1591,6 @@ TCN_IMPLEMENT_CALL(void, SSL, setVerify)(TCN_STDARGS, jlong ssl,
if ((c->verify_mode == SSL_CVERIFY_OPTIONAL) ||
(c->verify_mode == SSL_CVERIFY_OPTIONAL_NO_CA))
verify |= SSL_VERIFY_PEER;
- if (!c->store)
- c->store = SSL_CTX_get_cert_store(c->ctx);
SSL_set_verify(ssl_, verify, SSL_callback_SSL_verify);
}
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 326d1d788..fff3557ab 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -36,7 +36,6 @@ static apr_status_t ssl_context_cleanup(void *data)
if (c) {
int i;
c->crl = NULL;
- c->store = NULL;
if (c->ctx)
SSL_CTX_free(c->ctx);
c->ctx = NULL;
@@ -761,7 +760,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, setCACertificate)(TCN_STDARGS,
rv = JNI_FALSE;
goto cleanup;
}
- c->store = SSL_CTX_get_cert_store(c->ctx);
if (c->mode) {
STACK_OF(X509_NAME) *ca_certs;
ca_certs = SSL_CTX_get_client_CA_list(c->ctx);
@@ -924,8 +922,6 @@ TCN_IMPLEMENT_CALL(void, SSLContext, setVerify)(TCN_STDARGS, jlong ctx,
if ((c->verify_mode == SSL_CVERIFY_OPTIONAL) ||
(c->verify_mode == SSL_CVERIFY_OPTIONAL_NO_CA))
verify |= SSL_VERIFY_PEER;
- if (!c->store)
- c->store = SSL_CTX_get_cert_store(c->ctx);
SSL_CTX_set_verify(c->ctx, verify, SSL_callback_SSL_verify);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org