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

JCE: skip WolfSSLKeyStoreTest.testLoadSystemCAKeyStore() if JAR has not been created yet

pull/81/head
Chris Conlon 2024-11-08 11:40:54 -07:00
parent fcb42188fd
commit 455fbb0cf0
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/certs/systemcerts/system-cacerts-to-wks.sh
View File

@ -29,9 +29,19 @@ export DYLD_LIBRARY_PATH=../../../lib:$DYLD_LIBRARY_PATH
OUTDIR=`pwd` OUTDIR=`pwd`
# First argument can be passed in to represent path to
# wolfcrypt-jni.jar provider JAR. If not given, use default.
if [ -z "$1" ]; then
# default wolfcrypt-jni.jar path
PROVIDER_PATH="../../../lib/wolfcrypt-jni.jar"
else
# use custom provider path
PROVIDER_PATH=$1
fi
# ARGS: <input-keystore-name> <output-keystore-name> <in-password> <out-password> <java home> # ARGS: <input-keystore-name> <output-keystore-name> <in-password> <out-password> <java home>
jks_to_wks() { jks_to_wks() {
${5}/bin/keytool -importkeystore -srckeystore ${1} -destkeystore ${2}.wks -srcstoretype JKS -deststoretype WKS -srcstorepass "$3" -deststorepass "$3" -deststorepass "$4" -provider com.wolfssl.provider.jce.WolfCryptProvider --providerpath ../../../lib/wolfcrypt-jni.jar &> /dev/null ${5}/bin/keytool -importkeystore -srckeystore ${1} -destkeystore ${2}.wks -srcstoretype JKS -deststoretype WKS -srcstorepass "$3" -deststorepass "$3" -deststorepass "$4" -provider com.wolfssl.provider.jce.WolfCryptProvider --providerpath "$PROVIDER_PATH"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
printf "Failed to convert JKS to WKS!" printf "Failed to convert JKS to WKS!"
exit 1 exit 1
@ -58,6 +68,8 @@ else
javaHome="$JAVA_HOME" javaHome="$JAVA_HOME"
fi fi
echo "PROVIDER_PATH: $PROVIDER_PATH"
# Set up Java include and library paths for OS X and Linux # Set up Java include and library paths for OS X and Linux
# NOTE: you may need to modify these if your platform uses different locations # NOTE: you may need to modify these if your platform uses different locations
if [ "$OS" == "Darwin" ]; then if [ "$OS" == "Darwin" ]; then

14
src/test/java/com/wolfssl/provider/jce/test/WolfSSLKeyStoreTest.java
View File

@ -66,6 +66,11 @@ import java.security.spec.InvalidKeySpecException;
import javax.crypto.KeyGenerator; import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintStream;
import com.wolfssl.provider.jce.WolfCryptProvider; import com.wolfssl.provider.jce.WolfCryptProvider;
public class WolfSSLKeyStoreTest { public class WolfSSLKeyStoreTest {
@ -1423,7 +1428,9 @@ public class WolfSSLKeyStoreTest {
String scriptName = "system-cacerts-to-wks.sh"; String scriptName = "system-cacerts-to-wks.sh";
String cacertsWKS = "cacerts.wks"; String cacertsWKS = "cacerts.wks";
String jssecacertsWKS = "jssecacerts.wks"; String jssecacertsWKS = "jssecacerts.wks";
String cmd = "cd " + userDir + scriptDir + " && /bin/sh " + scriptName; String providerJARPath = "/lib/wolfcrypt-jni.jar";
String cmd = "cd " + userDir + scriptDir + " && /bin/sh " + scriptName +
" " + userDir + providerJARPath;
KeyStore store = null; KeyStore store = null;
String cacertsPass = "changeitchangeit"; String cacertsPass = "changeitchangeit";
File cacertFile = null; File cacertFile = null;
@ -1432,6 +1439,11 @@ public class WolfSSLKeyStoreTest {
* and cacert gen script won't be there. */ * and cacert gen script won't be there. */
Assume.assumeTrue(!isAndroid()); Assume.assumeTrue(!isAndroid());
/* Skip of wolfcrypt-jni.jar does not exist. This can happen if we
* are running via 'mvn test' and the jar has not been created yet */
File jarFile = new File(userDir + providerJARPath);
Assume.assumeTrue(jarFile.exists());
assertNotNull(userDir); assertNotNull(userDir);
/* Call system-cacerts-to-wks.sh script, converts system cacerts /* Call system-cacerts-to-wks.sh script, converts system cacerts