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

F-4437: skip output allocation for zero length Chacha process input

pull/261/head
Chris Conlon 2026-08-18 15:35:58 -06:00
parent 216df069e0
commit b337c025f6
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jni/jni_chacha.c
View File

@ -161,16 +161,14 @@ Java_com_wolfssl_wolfcrypt_Chacha_wc_1Chacha_1process(
ret = BAD_FUNC_ARG;
}
if (ret == 0) {
if (ret == 0 && inputSz > 0) {
output = (byte*)XMALLOC(inputSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (output == NULL) {
releaseByteArray(env, input_obj, input, JNI_ABORT);
throwOutOfMemoryException(env, "Failed to allocate key buffer");
throwOutOfMemoryException(env, "Failed to allocate output buffer");
return result;
}
}
if (ret == 0) {
XMEMSET(output, 0, inputSz);
ret = wc_Chacha_Process(chacha, output, input, inputSz);
@ -179,13 +177,14 @@ Java_com_wolfssl_wolfcrypt_Chacha_wc_1Chacha_1process(
if (ret == 0) {
result = (*env)->NewByteArray(env, inputSz);
if (result) {
(*env)->SetByteArrayRegion(env, result, 0, inputSz,
(const jbyte*) output);
} else {
if (result == NULL) {
throwWolfCryptException(env,
"Failed to allocate memory for Chacha_process");
}
else if (inputSz > 0) {
(*env)->SetByteArrayRegion(env, result, 0, inputSz,
(const jbyte*) output);
}
} else {
throwWolfCryptExceptionFromError(env, ret);
}

22
src/test/java/com/wolfssl/wolfcrypt/test/ChachaTest.java
View File

@ -150,6 +150,28 @@ public class ChachaTest {
}
}
@Test
public void processWithEmptyInputShouldReturnEmptyArray() {
Chacha chacha = new Chacha();
try {
chacha.setKey(KEY);
chacha.setIV(IV);
/* Empty input is a no-op that must return an empty array,
* not throw */
byte[] empty = chacha.process(new byte[0]);
assertNotNull(empty);
assertEquals(0, empty.length);
/* Keystream position must be unchanged by the empty call */
byte[] cipher = chacha.process(INPUT);
assertArrayEquals(EXPECTED, cipher);
} finally {
chacha.releaseNativeStruct();
}
}
@Test
public void checkChachaVectors() {