WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

F-5212 / F-5269: honor caller-supplied size in WolfSSLContext buffer load JNI functions

pull/405/head
Chris Conlon 2026-08-20 12:42:42 -06:00
parent 2a3191e3ae
commit d2e03ee83a
2 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
native/com_wolfssl_WolfSSLContext.c
View File

@ -1128,20 +1128,21 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_loadVerifyBuffer
{
int ret = WOLFSSL_FAILURE;
byte* buff = NULL;
word32 buffSz = 0;
WOLFSSL_CTX* ctx = (WOLFSSL_CTX*)(uintptr_t)ctxPtr;
(void)jcl;
(void)sz;
if (jenv == NULL || ctx == NULL || in == NULL) {
return (jint)BAD_FUNC_ARG;
}
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);
if (sz <= 0 || sz > (jlong)(*jenv)->GetArrayLength(jenv, in)) {
return (jint)BAD_FUNC_ARG;
}
if (buff != NULL && buffSz > 0) {
ret = wolfSSL_CTX_load_verify_buffer(ctx, buff, buffSz, format);
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
if (buff != NULL) {
ret = wolfSSL_CTX_load_verify_buffer(ctx, buff, (long)sz, format);
}
if (buff != NULL) {
@ -1157,20 +1158,21 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateBuffer
{
int ret = WOLFSSL_FAILURE;
byte* buff = NULL;
word32 buffSz = 0;
WOLFSSL_CTX* ctx = (WOLFSSL_CTX*)(uintptr_t)ctxPtr;
(void)jcl;
(void)sz;
if (jenv == NULL || ctx == NULL || in == NULL) {
return (jint)BAD_FUNC_ARG;
}
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);
if (sz <= 0 || sz > (jlong)(*jenv)->GetArrayLength(jenv, in)) {
return (jint)BAD_FUNC_ARG;
}
if (buff != NULL && buffSz > 0) {
ret = wolfSSL_CTX_use_certificate_buffer(ctx, buff, buffSz, format);
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
if (buff != NULL) {
ret = wolfSSL_CTX_use_certificate_buffer(ctx, buff, (long)sz, format);
}
if (buff != NULL) {
@ -1186,30 +1188,33 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_usePrivateKeyBuffer
{
int ret = WOLFSSL_FAILURE;
byte* buff = NULL;
word32 buffSz = 0;
jsize inLen = 0;
jboolean isCopy = JNI_FALSE;
WOLFSSL_CTX* ctx = (WOLFSSL_CTX*)(uintptr_t)ctxPtr;
(void)jcl;
(void)sz;
if (jenv == NULL || ctx == NULL || in == NULL) {
return (jint)BAD_FUNC_ARG;
}
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, &isCopy);
buffSz = (*jenv)->GetArrayLength(jenv, in);
inLen = (*jenv)->GetArrayLength(jenv, in);
if (sz <= 0 || sz > (jlong)inLen) {
return (jint)BAD_FUNC_ARG;
}
if (buff != NULL && buffSz > 0) {
ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx, buff, buffSz, format);
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, &isCopy);
if (buff != NULL) {
ret = wolfSSL_CTX_use_PrivateKey_buffer(ctx, buff, (long)sz, format);
}
/* Only zero if JVM made a copy */
if (buff != NULL && isCopy == JNI_TRUE) {
#if (LIBWOLFSSL_VERSION_HEX >= 0x05008004) && \
!defined(WOLFSSL_NO_FORCE_ZERO)
wc_ForceZero(buff, buffSz);
wc_ForceZero(buff, (word32)inLen);
#else
XMEMSET(buff, 0, buffSz);
XMEMSET(buff, 0, (word32)inLen);
#endif
}
if (buff != NULL) {
@ -1224,20 +1229,21 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainBuffer
{
int ret = WOLFSSL_FAILURE;
byte* buff = NULL;
word32 buffSz = 0;
WOLFSSL_CTX* ctx = (WOLFSSL_CTX*)(uintptr_t)ctxPtr;
(void)jcl;
(void)sz;
if (jenv == NULL || ctx == NULL || in == NULL) {
return (jint)BAD_FUNC_ARG;
}
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);
if (sz <= 0 || sz > (jlong)(*jenv)->GetArrayLength(jenv, in)) {
return (jint)BAD_FUNC_ARG;
}
if (buff != NULL && buffSz > 0) {
ret = wolfSSL_CTX_use_certificate_chain_buffer(ctx, buff, buffSz);
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
if (buff != NULL) {
ret = wolfSSL_CTX_use_certificate_chain_buffer(ctx, buff, (long)sz);
}
if (buff != NULL) {
@ -1252,21 +1258,22 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLContext_useCertificateChainBuffer
{
int ret = WOLFSSL_FAILURE;
byte* buff = NULL;
word32 buffSz = 0;
WOLFSSL_CTX* ctx = (WOLFSSL_CTX*)(uintptr_t)ctxPtr;
(void)jcl;
(void)sz;
if (jenv == NULL || ctx == NULL || in == NULL) {
return (jint)BAD_FUNC_ARG;
}
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
buffSz = (*jenv)->GetArrayLength(jenv, in);
if (sz <= 0 || sz > (jlong)(*jenv)->GetArrayLength(jenv, in)) {
return (jint)BAD_FUNC_ARG;
}
if (buff != NULL && buffSz > 0) {
buff = (byte*)(*jenv)->GetByteArrayElements(jenv, in, NULL);
if (buff != NULL) {
ret = wolfSSL_CTX_use_certificate_chain_buffer_format(
ctx, buff, buffSz, format);
ctx, buff, (long)sz, format);
}
if (buff != NULL) {

39
src/test/com/wolfssl/test/WolfSSLContextTest.java
View File

@ -30,7 +30,9 @@ import org.junit.Test;
import org.junit.rules.TestRule;
import static org.junit.Assert.*;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.ServerSocket;
@ -251,6 +253,43 @@ public class WolfSSLContextTest {
}
}
@Test
public void test_WolfSSLContext_loadBufferHonorsSz()
throws WolfSSLException, WolfSSLJNIException, IOException {
int ret;
byte[] caPem = Files.readAllBytes(new File(caCert).toPath());
/* Exact size loads the CA as a trust anchor. Tolerate
* NOT_COMPILED_IN on reduced native builds. */
ret = ctx.loadVerifyBuffer(caPem, caPem.length,
WolfSSL.SSL_FILETYPE_PEM);
if (ret != WolfSSL.SSL_SUCCESS && ret != WolfSSL.NOT_COMPILED_IN) {
fail("loadVerifyBuffer failed, ret = " + ret);
}
/* Non-positive and oversized lengths are rejected */
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.loadVerifyBuffer(caPem, -1, WolfSSL.SSL_FILETYPE_PEM));
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.loadVerifyBuffer(caPem, 0, WolfSSL.SSL_FILETYPE_PEM));
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.loadVerifyBuffer(caPem, caPem.length + 1,
WolfSSL.SSL_FILETYPE_PEM));
/* Same size validation on the sibling buffer loaders */
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.useCertificateBuffer(caPem, 0, WolfSSL.SSL_FILETYPE_PEM));
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.usePrivateKeyBuffer(caPem, caPem.length + 1,
WolfSSL.SSL_FILETYPE_PEM));
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.useCertificateChainBuffer(caPem, -1));
assertEquals(WolfSSL.BAD_FUNC_ARG,
ctx.useCertificateChainBufferFormat(caPem, 0,
WolfSSL.SSL_FILETYPE_PEM));
}
@Test
public void test_WolfSSLContext_memsaveCertCache()
throws WolfSSLException, WolfSSLJNIException {