diff --git a/src/test_certs_r4_with_bc.sh b/src/test_certs_r4_with_bc.sh index 3fa08b9..486c079 100755 --- a/src/test_certs_r4_with_bc.sh +++ b/src/test_certs_r4_with_bc.sh @@ -23,6 +23,9 @@ test_ta () { tafileBasename=$(basename $tafile) + # strip off the friendly name + tafileBasename=$(echo $tafileBasename | egrep -o '[^-]+_ta.der$') + # strip off the file suffix to get the OID name if [[ $(expr match "$tafileBasename" ".*_ta\.pem$") != 0 ]]; then oid=${tafileBasename%_ta.pem} diff --git a/src/test_certs_r4_with_oqs.sh b/src/test_certs_r4_with_oqs.sh index 0a562bb..cb822a3 100755 --- a/src/test_certs_r4_with_oqs.sh +++ b/src/test_certs_r4_with_oqs.sh @@ -26,10 +26,7 @@ test_ta () { # strip off the file suffix to get the OID name if [[ $(expr match "$tafileBasename" ".*_ta\.der$") != 0 ]]; then - oid=${tafileBasename%_ta.der} - - printf "DEBUG: filename: $tafileBasename, OID: $oid\n" - + oid=${tafileBasename%_ta.der} else # It's some other filename printf "ERROR: file name is not in the expected format: %s\n" $tafileBasename printf "ERROR: file name is not in the expected format: %s\n" $tafileBasename >> $logfile