Skip to content

Fixes for ECC import key zeroization, ant test native library paths #302

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 2 commits into
base: master
Choose a base branch
from
Open

Fixes for ECC import key zeroization, ant test native library paths #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5598b7
F-15084: zeroize the JNI private key copy on the GetStringUTFChars() …
cconlon Oct 16, 2026
b109143
F-15085: drop literal $JAVA_HOME and unset Windows DLL dirs from the …
cconlon Oct 16, 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
11 changes: 9 additions & 2 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,13 +640,20 @@

<echo unless:set="jar.includes.jce">NOTE: JCE classes not detected, only running JUnit tests for JNI</echo>

<!-- Windows DLL directories are only set by the setup-win* targets -->
<condition property="test.library.path"
value="${lib.dir}${path.separator}${lib.win.dir}${path.separator}${lib.wolfssl.win.dir}"
else="${lib.dir}">
<isset property="lib.win.dir"/>
</condition>

<!-- run JUnit tests -->
<junit printsummary="yes"
showoutput="yes"
haltonfailure="yes"
fork="true">

<jvmarg value="-Djava.library.path=$JAVA_HOME/bin${path.separator}${lib.dir}${path.separator}${lib.win.dir}${path.separator}${lib.wolfssl.win.dir}"/>
<jvmarg value="-Djava.library.path=${test.library.path}"/>

<classpath>
<pathelement location="${lib.dir}/wolfcrypt-jni.jar" />
Expand All @@ -661,7 +668,7 @@
<formatter type="plain" />
<formatter type="xml" />

<sysproperty key="sun.boot.library.path" value="$JAVA_HOME/bin:${lib.dir}" />
<sysproperty key="sun.boot.library.path" value="${lib.dir}" />
<sysproperty key="wolfjce.debug" value="${jce.debug}" />
<env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:{lib.dir}:/usr/local/lib" />
<env key="CLASSPATH" path="${env.LD_LIBRARY_PATH}:${env.JUNIT_HOME}/${junit4}" />
Expand Down
1 change: 1 addition & 0 deletions jni/jni_ecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ JNIEXPORT void JNICALL Java_com_wolfssl_wolfcrypt_Ecc_wc_1ecc_1import_1private
name = (*env)->GetStringUTFChars(env, curveName, 0);
if (name == NULL) {
/* OutOfMemoryError pending, release arrays and return */
zeroizeByteArrayCopy(priv, privSz, privIsCopy);
releaseByteArray(env, priv_object, priv, JNI_ABORT);
releaseByteArray(env, pub_object, pub, JNI_ABORT);
return;
Expand Down
Loading