Skip to content

Fixes for PSK hint, timeout range, peer-name and cookie-callback JNI cleanup #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cconlon wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes for PSK hint, timeout range, peer-name and cookie-callback JNI cleanup #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae98b25
F-12672: allow a null PSK identity hint in the client callback
cconlon Aug 31, 2026
19886d7
F-12703: resolve the example main class ahead of the wolfcrypt-jni jar
cconlon Aug 31, 2026
9cd5c47
F-12673: reject out-of-range timeout values in setTimeout
cconlon Aug 31, 2026
b31dc8d
F-12674: guard against a null name conversion in the peer issuer/subj…
cconlon Aug 31, 2026
2af1c72
F-12675: release JNI local references in NativeGenCookieCb
cconlon Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fips-ready-dual-provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
working-directory: wolfssljni
run: |
java -classpath \
lib/wolfssl.jar:lib/wolfssl-jsse.jar:$GITHUB_WORKSPACE/wolfcryptjni/lib/wolfcrypt-jni.jar:examples/provider \
examples/provider:lib/wolfssl.jar:lib/wolfssl-jsse.jar:$GITHUB_WORKSPACE/wolfcryptjni/lib/wolfcrypt-jni.jar \
DualProviderFIPSTest
Comment thread
cconlon marked this conversation as resolved.

- name: Show logs on failure
Expand Down
2 changes: 1 addition & 1 deletion examples/provider/DualProviderFIPSTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
WOLFCRYPTJNI_DIR="${WOLFCRYPTJNI_DIR:-../../wolfcryptjni}"

java -classpath \
lib/wolfssl.jar:lib/wolfssl-jsse.jar:"${WOLFCRYPTJNI_DIR}"/lib/wolfcrypt-jni.jar:examples/provider \
examples/provider:lib/wolfssl.jar:lib/wolfssl-jsse.jar:"${WOLFCRYPTJNI_DIR}"/lib/wolfcrypt-jni.jar \
DualProviderFIPSTest
Comment thread
cconlon marked this conversation as resolved.
146 changes: 102 additions & 44 deletions native/com_wolfssl_WolfSSLContext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,24 +1874,53 @@ JNIEXPORT void JNICALL Java_com_wolfssl_WolfSSLContext_setGenCookie
#endif
}

/* Delete JNI local references created inside NativeGenCookieCb() */
static void freeGenCookieCbLocalRefs(JNIEnv* jenv, jclass excClass,
jclass sessClass, jobject ctxRef, jclass innerCtxClass, jbyteArray inData)
{
if (jenv == NULL) {
return;
}

if (inData != NULL) {
(*jenv)->DeleteLocalRef(jenv, inData);
}

if (innerCtxClass != NULL) {
(*jenv)->DeleteLocalRef(jenv, innerCtxClass);
}

if (ctxRef != NULL) {
(*jenv)->DeleteLocalRef(jenv, ctxRef);
}

if (sessClass != NULL) {
(*jenv)->DeleteLocalRef(jenv, sessClass);
}

if (excClass != NULL) {
(*jenv)->DeleteLocalRef(jenv, excClass);
}
}

int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
{
jint retval = 0;
jint vmret = 0;

JNIEnv* jenv; /* JNI environment */
jclass excClass; /* WolfSSLJNIException class */
jclass excClass = NULL; /* WolfSSLJNIException class */
int needsDetach = 0; /* Should we explicitly detach? */

jobject* g_cachedSSLObj; /* WolfSSLSession cached object */
jclass sessClass; /* WolfSSLSession class */
jclass sessClass = NULL; /* WolfSSLSession class */
jfieldID ctxFid; /* WolfSSLSession->ctx FieldID */
jmethodID getCtxMethodId; /* WolfSSLSession->getAssCtxPtr() ID */

jobject ctxRef; /* WolfSSLContext object */
jclass innerCtxClass; /* WolfSSLContext class */
jobject ctxRef = NULL; /* WolfSSLContext object */
jclass innerCtxClass = NULL; /* WolfSSLContext class */
jmethodID cookieCbMethodId; /* internalGenCookieCallback ID */
jbyteArray inData; /* jbyteArray to hold cookie data */
jbyteArray inData = NULL; /* jbyteArray to hold cookie data */

(void)ctx;

Expand Down Expand Up @@ -1921,8 +1950,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1932,8 +1964,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
(*jenv)->ThrowNew(jenv, excClass,
"Can't get native WolfSSLSession object reference in "
"NativeGenCookieCb");
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1943,8 +1978,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
(*jenv)->ThrowNew(jenv, excClass,
"Can't get native WolfSSLSession class reference in "
"NativeGenCookieCb");
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1959,8 +1997,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
(*jenv)->ThrowNew(jenv, excClass,
"Can't get native WolfSSLContext field ID in "
"NativeGenCookieCb");
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1976,8 +2017,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
(*jenv)->ThrowNew(jenv, excClass,
"Can't get getAssociatedContextPtr() method ID in "
"NativeGenCookieCb");
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1988,8 +2032,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
if (!ctxRef) {
(*jenv)->ThrowNew(jenv, excClass,
"Can't get WolfSSLContext object in NativeGenCookieCb");
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -1999,9 +2046,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
(*jenv)->ThrowNew(jenv, excClass,
"Can't get native WolfSSLContext class reference in "
"NativeGenCookieCb");
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -2010,16 +2059,18 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
"internalGenCookieCallback",
"(Lcom/wolfssl/WolfSSLSession;[BI)I");

if (!cookieCbMethodId) {
if (!cookieCbMethodId) {
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
}
(*jenv)->ThrowNew(jenv, excClass,
"Error getting internalGenCookieCallback method from JNI");
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -2029,10 +2080,12 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
inData = (*jenv)->NewByteArray(jenv, sz);
if (!inData) {
(*jenv)->ThrowNew(jenv, excClass,
"Error getting internalGenCookieCallback method from JNI");
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach)
"Error creating jbyteArray in NativeGenCookieCb");
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -2044,10 +2097,11 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
(*jenv)->DeleteLocalRef(jenv, ctxRef);
(*jenv)->DeleteLocalRef(jenv, inData);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}

Expand All @@ -2058,22 +2112,22 @@ int NativeGenCookieCb(WOLFSSL *ssl, unsigned char *buf, int sz, void *ctx)
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
(*jenv)->DeleteLocalRef(jenv, ctxRef);
(*jenv)->DeleteLocalRef(jenv, inData);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return GEN_COOKIE_E;
}
}

/* delete local refs */
(*jenv)->DeleteLocalRef(jenv, inData);
}

/* delete local refs, detach JNIEnv from thread */
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach)
freeGenCookieCbLocalRefs(jenv, excClass, sessClass, ctxRef,
innerCtxClass, inData);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}

return retval;
}
Expand Down Expand Up @@ -6430,7 +6484,7 @@ unsigned int NativePskClientCb(WOLFSSL* ssl, const char* hint, char* identity,
/* Note: since this is called from C, not the JVM, we need to explicitly
* free all object refs with DeleteLocalRef() */

if (!g_vm || !ssl || !hint || !identity || !key) {
if (!g_vm || !ssl || !identity || !key) {
/* we can't throw an exception yet, so just return 0 (failure) */
return 0;
}
Expand Down Expand Up @@ -6598,20 +6652,24 @@ unsigned int NativePskClientCb(WOLFSSL* ssl, const char* hint, char* identity,
return 0;
}

/* create String to wrap 'hint' */
hintString = (*jenv)->NewStringUTF(jenv, hint);
if (!hintString) {
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
}
(*jenv)->ThrowNew(jenv, excClass,
"Error creating String for PSK client hint");
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
/* Wrap hint as a String, passing null to Java when hint is NULL. */
if (hint != NULL) {
hintString = (*jenv)->NewStringUTF(jenv, hint);
if (!hintString) {
if ((*jenv)->ExceptionOccurred(jenv)) {
(*jenv)->ExceptionDescribe(jenv);
(*jenv)->ExceptionClear(jenv);
}
(*jenv)->ThrowNew(jenv, excClass,
"Error creating String for PSK client hint");
(*jenv)->DeleteLocalRef(jenv, ctxRef);
if (needsDetach) {
(*g_vm)->DetachCurrentThread(g_vm);
}
return 0;
}
return 0;
} else {
hintString = NULL;
}

/* find StringBuffer class to wrap 'identity' */
Expand Down
15 changes: 13 additions & 2 deletions native/com_wolfssl_WolfSSLSession.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,6 +2435,11 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_setTimeout
(void)jenv;
(void)jcl;

/* Reject timeouts outside unsigned int range accepted by native */
if (ssl == NULL || t < 0 || t > (jlong)UINT32_MAX) {
return (jint)BAD_FUNC_ARG;
}

return wolfSSL_set_timeout(ssl, (unsigned int)t);
}

Expand Down Expand Up @@ -3537,7 +3542,10 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Issuer
}

issuer = wolfSSL_X509_NAME_oneline(
wolfSSL_X509_get_issuer_name(x509), 0, 0);
wolfSSL_X509_get_issuer_name(x509), 0, 0);
if (issuer == NULL) {
return NULL;
}

retString = (*jenv)->NewStringUTF(jenv, issuer);
XFREE(issuer, 0, DYNAMIC_TYPE_OPENSSL);
Expand Down Expand Up @@ -3569,7 +3577,10 @@ JNIEXPORT jstring JNICALL Java_com_wolfssl_WolfSSLSession_getPeerX509Subject
}

subject = wolfSSL_X509_NAME_oneline(
wolfSSL_X509_get_subject_name(x509), 0, 0);
wolfSSL_X509_get_subject_name(x509), 0, 0);
if (subject == NULL) {
return NULL;
}

retString = (*jenv)->NewStringUTF(jenv, subject);
XFREE(subject, 0, DYNAMIC_TYPE_OPENSSL);
Expand Down
6 changes: 4 additions & 2 deletions src/java/com/wolfssl/WolfSSLSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2471,9 +2471,11 @@ public long getSessTimeout() throws IllegalStateException {
/**
* Sets the timeout in seconds in the given SSL object.
*
* @param t time in seconds to set
* @param t time in seconds to set, in the range [0, 4294967295]. A
* value of 0 selects the default session timeout.
* @throws IllegalStateException WolfSSLSession has been freed
* @return WOLFSSL_SUCCESS on success, negative values on failure.
* @return WOLFSSL_SUCCESS on success, or BAD_FUNC_ARG if t is outside
* the accepted range.
* @see #setSession(long)
* @see #getSession(long)
*/
Expand Down
Loading
Loading