mouse07410
commented
1 year ago Here's my patch for the scripts, which includes addressing some of the SHellCheck warnings:
diff --git a/scripts/oqsprovider-ca.sh b/scripts/oqsprovider-ca.sh
index 1de9b10..68e6400 100755
--- a/scripts/oqsprovider-ca.sh
+++ b/scripts/oqsprovider-ca.sh
@@ -17,11 +17,6 @@ if [ -z "$OPENSSL_MODULES" ]; then
exit 1
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- echo "LD_LIBRARY_PATH env var not set. Exiting."
- exit 1
-fi
-
#rm -rf tmp
mkdir -p tmp && cd tmp
rm -rf demoCA && mkdir -p demoCA/newcerts
diff --git a/scripts/oqsprovider-certgen.sh b/scripts/oqsprovider-certgen.sh
index c4d0907..d6c8b06 100755
--- a/scripts/oqsprovider-certgen.sh
+++ b/scripts/oqsprovider-certgen.sh
@@ -17,12 +17,7 @@ if [ -z "$OPENSSL_MODULES" ]; then
exit 1
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- echo "LD_LIBRARY_PATH env var not set. Exiting."
- exit 1
-fi
-
-#rm -rf tmp
+rm -rf tmp/*
mkdir -p tmp
$OPENSSL_APP req -x509 -new -newkey $1 -keyout tmp/$1_CA.key -out tmp/$1_CA.crt -nodes -subj "/CN=oqstest CA" -days 365 -provider oqsprovider -provider default && \
$OPENSSL_APP genpkey -algorithm $1 -out tmp/$1_srv.key -provider oqsprovider -provider default && \
diff --git a/scripts/oqsprovider-certverify.sh b/scripts/oqsprovider-certverify.sh
index 0d571ce..665181f 100755
--- a/scripts/oqsprovider-certverify.sh
+++ b/scripts/oqsprovider-certverify.sh
@@ -17,11 +17,6 @@ if [ -z "$OPENSSL_MODULES" ]; then
exit 1
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- echo "LD_LIBRARY_PATH env var not set. Exiting."
- exit 1
-fi
-
# check that CSR can be output OK
$OPENSSL_APP req -text -in tmp/$1_srv.csr -noout -provider oqsprovider -provider default 2>&1 | grep Error
diff --git a/scripts/oqsprovider-cmssign.sh b/scripts/oqsprovider-cmssign.sh
index 2408dd3..f979903 100755
--- a/scripts/oqsprovider-cmssign.sh
+++ b/scripts/oqsprovider-cmssign.sh
@@ -28,11 +28,6 @@ if [ -z "$OPENSSL_MODULES" ]; then
exit 1
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- echo "LD_LIBRARY_PATH env var not set. Exiting."
- exit 1
-fi
-
# Assumes certgen has been run before: Quick check
if [ -f tmp/$1_CA.crt ]; then
diff --git a/scripts/oqsprovider-cmsverify.sh b/scripts/oqsprovider-cmsverify.sh
index 85d2935..c13531b 100755
--- a/scripts/oqsprovider-cmsverify.sh
+++ b/scripts/oqsprovider-cmsverify.sh
@@ -21,11 +21,6 @@ if [ -z "$OPENSSL_MODULES" ]; then
exit 1
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- echo "LD_LIBRARY_PATH env var not set. Exiting."
- exit 1
-fi
-
openssl_version=$($OPENSSL_APP version)
if [[ "$openssl_version" == "OpenSSL 3.0."* ]]; then
diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index f360d0e..570bb58 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -5,17 +5,17 @@ rv=0
provider2openssl() {
echo
echo "Testing oqsprovider->oqs-openssl interop for $1:"
- $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-certgen.sh $1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-cmssign.sh $1 sha3-384 && $OQS_PROVIDER_TESTSCRIPTS/oqs-openssl-certverify.sh $1 && $OQS_PROVIDER_TESTSCRIPTS/oqs-openssl-cmsverify.sh $1
+ "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-certgen.sh $1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-cmssign.sh $1 sha3-384 && "$OQS_PROVIDER_TESTSCRIPTS"/oqs-openssl-certverify.sh $1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqs-openssl-cmsverify.sh $1
}
openssl2provider() {
echo
echo "Testing oqs-openssl->oqsprovider interop for $1:"
- $OQS_PROVIDER_TESTSCRIPTS/oqs-openssl-certgen.sh $1 && $OQS_PROVIDER_TESTSCRIPTS/oqs-openssl-cmssign.sh $1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-certverify.sh $1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-cmsverify.sh $1
+ "$OQS_PROVIDER_TESTSCRIPTS"/oqs-openssl-certgen.sh $1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqs-openssl-cmssign.sh $1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-certverify.sh $1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-cmsverify.sh $1
}
localalgtest() {
- $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-certgen.sh $1 >> interop.log 2>&1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-certverify.sh $1 >> interop.log 2>&1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-cmssign.sh $1 >> interop.log 2>&1 && $OQS_PROVIDER_TESTSCRIPTS/oqsprovider-ca.sh $1 >> interop.log 2>&1
+ "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-certgen.sh $1 >> interop.log 2>&1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-certverify.sh $1 >> interop.log 2>&1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-cmssign.sh $1 >> interop.log 2>&1 && "$OQS_PROVIDER_TESTSCRIPTS"/oqsprovider-ca.sh $1 >> interop.log 2>&1
if [ $? -ne 0 ]; then
echo "localalgtest $1 failed. Exiting.".
cat interop.log
@@ -27,7 +27,7 @@ interop() {
echo ".\c"
# check if we want to run this algorithm:
if [ ! -z "$OQS_SKIP_TESTS" ]; then
- GREPTEST=$(echo $OQS_SKIP_TESTS | sed "s/\,/\\\|/g")
+ GREPTEST=$(echo "$OQS_SKIP_TESTS" | sed "s/\,/\\\|/g")
if echo $1 | grep -q "$GREPTEST"; then
echo "Not testing $1" >> interop.log
return
@@ -35,7 +35,7 @@ interop() {
fi
# Check whether algorithm is supported at all:
- $OPENSSL_APP list -signature-algorithms -provider oqsprovider | grep $1 > /dev/null 2>&1
+ "$OPENSSL_APP" list -signature-algorithms -provider oqsprovider | grep $1 > /dev/null 2>&1
if [ $? -ne 1 ]; then
if [ -z "$LOCALTESTONLY" ]; then
provider2openssl $1 >> interop.log 2>&1 && openssl2provider $1 >> interop.log 2>&1
@@ -57,24 +57,24 @@ fi
if [ ! -z "$OPENSSL_INSTALL" ]; then
# trying to set config variables suitably for pre-existing OpenSSL installation
- if [ -f $OPENSSL_INSTALL/bin/openssl ]; then
- export OPENSSL_APP=$OPENSSL_INSTALL/bin/openssl
+ if [ -f "$OPENSSL_INSTALL"/bin/openssl ] && [ -z "$OPENSSL_APP" ]; then
+ export OPENSSL_APP="$OPENSSL_INSTALL"/bin/openssl
fi
- if [ -d $OPENSSL_INSTALL/lib64 ]; then
- export LD_LIBRARY_PATH=$OPENSSL_INSTALL/lib64
+ if [ -d "$OPENSSL_INSTALL"/lib64 ]; then
+ export LD_LIBRARY_PATH="$OPENSSL_INSTALL"/lib64
fi
if [ -f $OPENSSL_INSTALL/ssl/openssl.cnf ]; then
- export OPENSSL_CONF=$OPENSSL_INSTALL/ssl/openssl.cnf
+ export OPENSSL_CONF="$OPENSSL_INSTALL"/ssl/openssl.cnf
fi
else
if [ -z "$OPENSSL_CONF" ]; then
- export OPENSSL_CONF=$(pwd)/scripts/openssl-ca.cnf
+ export OPENSSL_CONF="$(pwd)/scripts/openssl-ca.cnf"
fi
fi
if [ -z "$OPENSSL_APP" ]; then
if [ -f $(pwd)/openssl/apps/openssl ]; then
- export OPENSSL_APP=$(pwd)/openssl/apps/openssl
+ export OPENSSL_APP="$(pwd)/openssl/apps/openssl"
else # if no local openssl src directory is found, rely on PATH...
export OPENSSL_APP=openssl
fi
@@ -84,8 +84,12 @@ if [ -z "$OPENSSL_MODULES" ]; then
export OPENSSL_MODULES=$(pwd)/_build/lib
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
- export LD_LIBRARY_PATH=$(pwd)/.local/lib64
+if [ "$OSTYPE" == "darwin"* ]; then
+ export LD_LIBRARY_PATH="/opt/local/lib:/usr/local/lib:"
+else
+ if [ -z "$LD_LIBRARY_PATH" ]; then
+ export LD_LIBRARY_PATH=$(pwd)/.local/lib64
+ fi
fi
if [ ! -z "$OQS_SKIP_TESTS" ]; then
@@ -159,7 +163,7 @@ echo
# Run built-in tests:
# Without removing OPENSSL_CONF ctest hangs... ???
unset OPENSSL_CONF
-cd _build && ctest $@ && cd ..
+cd _build && ctest "$@" && cd ..
if [ $? -ne 0 ]; then
rv=1
baentsch
mingw-io
mattcaswell
Updated
To make some details clear, as previous overly-generic description invited useless overly-generic observations, like "could not replicate on Windows".
Describe the bug
ctestcrashes withSIGTRAP.To Reproduce Steps to reproduce the behavior:
/opt/local/libexec/openssl3. For this test I used OpenSSL-3.1.0, and used Macports to get the binary installed.liboqssystem-wide. I usedliboqsmaster, and installed it inopt/local:/opt/local/libfor the shared library,/opt/local/includefor the header files.openssl.cnfas appropriate).export OPENSSL_APP=/opt/local/libexec/openssl3/bin/openssl,export OPENSSL_MODULES=/opt/local/libexec/openssl3/lib/ossl-modulespkcs11-providerand GOST engine system-wide, and adjustopenssl.cnfto point at them.oqs-providerand make it available system-wide by adding it toopenssl.cnf._buildand doctest --output-on-failureExpected behavior Tests passing.
Screenshots
Crash report
Environment (please complete the following information):
Additional context This is on MacBook Pro - Apple Silicon M2 chip. Similar problem on Intel-based iMac (used same process as above).
Note: commenting out, e.g., GOST provider in
openssl.cnfdid not help.