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
The following commit(s) were added to refs/heads/1.3.x by this push:
new 580365433 Remove unused parameters
580365433 is described below
commit 580365433590539894ea1bc6d4311e1cfe9c2824
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 27 14:50:47 2026 +0100
Remove unused parameters
---
native/src/sslcontext.c | 5 ++---
native/src/sslutils.c | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index fff3557ab..37bdd72cf 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -1503,8 +1503,7 @@ TCN_IMPLEMENT_CALL(jint, SSLContext,
setALPN)(TCN_STDARGS, jlong ctx,
/* Start of netty-tc-native add */
/* Convert protos to wire format */
-static int initProtocols(JNIEnv *e, const tcn_ssl_ctxt_t *c, unsigned char
**proto_data,
- unsigned int *proto_len, jobjectArray protos) {
+static int initProtocols(JNIEnv *e, unsigned char **proto_data, unsigned int
*proto_len, jobjectArray protos) {
int i;
unsigned char *p_data;
/*
@@ -1599,7 +1598,7 @@ TCN_IMPLEMENT_CALL(void, SSLContext,
setAlpnProtos)(TCN_STDARGS, jlong ctx, jobj
TCN_ASSERT(ctx != 0);
UNREFERENCED(o);
- if (initProtocols(e, c, &c->alpn_proto_data, &c->alpn_proto_len,
alpn_protos) == 0) {
+ if (initProtocols(e, &c->alpn_proto_data, &c->alpn_proto_len, alpn_protos)
== 0) {
c->alpn_selector_failure_behavior = selectorFailureBehavior;
// depending on if it's client mode or not we need to call different
functions.
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index 100bdfda3..5f1ceb35b 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -456,7 +456,7 @@ void SSL_callback_handshake(const SSL *ssl, int where, int
rc)
/* The code here is inspired by nghttp2
*
* See
https://github.com/tatsuhiro-t/nghttp2/blob/ae0100a9abfcf3149b8d9e62aae216e946b517fb/src/shrpx_ssl.cc#L244
*/
-int select_next_proto(SSL *ssl, const unsigned char **out, unsigned char
*outlen,
+static int select_next_proto(const unsigned char **out, unsigned char *outlen,
const unsigned char *in, unsigned int inlen, unsigned char
*supported_protos,
unsigned int supported_protos_len, int failure_behavior) {
@@ -515,7 +515,7 @@ int select_next_proto(SSL *ssl, const unsigned char **out,
unsigned char *outlen
int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out,
unsigned char *outlen,
const unsigned char *in, unsigned int inlen, void *arg) {
tcn_ssl_ctxt_t *ssl_ctxt = arg;
- return select_next_proto(ssl, out, outlen, in, inlen,
ssl_ctxt->alpn_proto_data, ssl_ctxt->alpn_proto_len,
ssl_ctxt->alpn_selector_failure_behavior);
+ return select_next_proto(out, outlen, in, inlen,
ssl_ctxt->alpn_proto_data, ssl_ctxt->alpn_proto_len,
ssl_ctxt->alpn_selector_failure_behavior);
}
#ifdef HAVE_OCSP
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
