Refactoring test_certs_r4.sh

.github/workflows/artifact_validation.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Test artifacts with OQS
-        run: ./src/test_certs_r4_with_oqs.sh
+        run: ./src/test_certs_r4 oqs
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -31,7 +31,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Test artifacts with BC
-        run: ./src/test_certs_r4_with_bc.sh
+        run: ./src/test_certs_r4 bc
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:

src/bc.cmd

@@ -0,0 +1 @@
+verify_r3.sh $(pwd)/$tafile 2>&1

src/oqs.cmd

@@ -0,0 +1 @@
+openssl verify -check_ss_sig -verbose -CAfile $tafile $tafile 2>&1

src/test_certs_r4_with_oqs.sh → src/test_certs_r4.sh

@@ -1,11 +1,23 @@
 #!/bin/sh
 
+if [ $# -lt 1 ]; then
+    echo "Error: must provide the name of the verifier to use, which must match a .cmd file in the /src dir."
+    exit -1
+fi
+
+verifier=%1
+verifierCmd=$(<$verifier.cmd)
+
+echo "DEBUG: verifiedCmd: $verifierCmd"
+
+
+
 certsdir_r4="artifacts_certs_r4"
 certszip_r4="artifacts_certs_r4.zip"
 cmszipr1="artifacts_cms_v1.zip"
 inputdir="./providers"
 outputdir="./output/certs"
-logfile=$outputdir/oqs_certs.log
+logfile=$outputdir/$verifier_certs.log
 
 # Start the results CSV file
 mkdir -p $outputdir
@@ -46,7 +58,7 @@ test_ta () {
     printf "\nTesting %s\n" $tafile >> $logfile
 
     # The actual openssl command that is the heart of this script
-    ossl_output=$(openssl verify -check_ss_sig -verbose -CAfile $tafile $tafile 2>&1)
+    ossl_output=$(eval $verifierCmd)
     ossl_status=$?
 
     # log it to file and to stdout