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
The following commit(s) were added to refs/heads/main by this push:
new 2f569cf2d Align with other branches. No functional change.
2f569cf2d is described below
commit 2f569cf2da8f37292fe4ef3e2ef4e9364b45b776
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Feb 5 12:07:08 2024 +0000
Align with other branches. No functional change.
---
native/src/jnilib.c | 1 -
native/src/sslcontext.c | 10 ++++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 7367cd3ca..342df3b9c 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -74,7 +74,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
/* Initialize global java.lang.String class */
TCN_LOAD_CLASS(env, jString_class, "java/lang/String", JNI_ERR);
-
TCN_GET_METHOD(env, jString_class, jString_init,
"<init>", "([B)V", JNI_ERR);
TCN_GET_METHOD(env, jString_class, jString_getBytes,
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index f5b2b9831..0855822e5 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -254,12 +254,13 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS,
jlong pool,
goto init_failed;
}
- if (mode == SSL_MODE_CLIENT)
+ if (mode == SSL_MODE_CLIENT) {
ctx = SSL_CTX_new(TLS_client_method());
- else if (mode == SSL_MODE_SERVER)
+ } else if (mode == SSL_MODE_SERVER) {
ctx = SSL_CTX_new(TLS_server_method());
- else
+ } else {
ctx = SSL_CTX_new(TLS_method());
+ }
if (!ctx) {
char err[256];
@@ -573,8 +574,6 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext,
getCiphers)(TCN_STDARGS, jlong ctx)
return NULL;
}
- /* For LibreSSL get_ciphers() iss only available
- * on an SSL, not for an SSL_CTX. */
sk = SSL_CTX_get_ciphers(c->ctx);
len = sk_SSL_CIPHER_num(sk);
@@ -1099,7 +1098,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext,
setCertificate)(TCN_STDARGS, jlong ctx,
(eckey = EC_KEY_new_by_curve_name(nid))) {
SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
}
-
/* OpenSSL assures us that _free() is NULL-safe */
EC_KEY_free(eckey);
EC_GROUP_free(ecparams);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
