scripts/pem.test: refactor to eliminate dependence on bash [[ -v foo ]] construct.

Author: douzzer

scripts/pem.test

@@ -73,7 +73,7 @@ if grep -q -E '^#define OPENSSL_EXTRA$' wolfssl/options.h; then
     OPENSSL_EXTRA=1
 fi
 
-if [[ ! -v WOLFSSL_KEY_GEN && ! -v WOLFSSL_CERT_GEN && ! -v OPENSSL_EXTRA ]]; then
+if [ "$WOLFSSL_KEY_GEN" != 1 ] && [ "$WOLFSSL_CERT_GEN" != 1 ] && [ "$OPENSSL_EXTRA" != 1 ]; then
     WOLFSSL_NO_DER_TO_PEM=1
 fi
 
@@ -85,12 +85,12 @@ if grep -q -E '^#define NO_CODING$' wolfssl/options.h; then
     NO_CODING=1
 fi
 
-if [[ -v WOLFSSL_NO_PEM ]]; then
+if [ "$WOLFSSL_NO_PEM" = 1 ]; then
     echo "WOLFSSL_NO_PEM is configured -- skipping pem.test."
     exit 77
 fi
 
-if [[ -v NO_CODING ]]; then
+if [ "$NO_CODING" = 1 ]; then
     echo "NO_CODING is configured -- skipping pem.test."
     exit 77
 fi
@@ -255,7 +255,7 @@ compare_der() {
 #
 # @param [in] $*  Command line parameters to pem example.
 convert_to_pem() {
-    if [[ -v WOLFSSL_NO_DER_TO_PEM ]]; then
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
         echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
         TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
         return 0
@@ -289,7 +289,7 @@ compare_pem() {
 # @param [in] $3  PEM type expected in PEM file and to place in created PEM
 #                 file.
 pem_der_exp() {
-    if [[ -v WOLFSSL_NO_DER_TO_PEM ]]; then
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
         echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
         TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
         return 0
@@ -324,7 +324,7 @@ pem_der_exp() {
 #
 # @param [in] $@  Command line parameters to pem example when encrypting.
 der_pem_enc() {
-    if [[ -v WOLFSSL_NO_DER_TO_PEM ]]; then
+    if [ "$WOLFSSL_NO_DER_TO_PEM" = 1 ]; then
         echo '  Skipping -- WOLFSSL_NO_DER_TO_PEM'
         TEST_SKIP_CNT=$((TEST_SKIP_CNT+1))
         return 0
@@ -458,14 +458,14 @@ pem_der_exp ./certs/csr.dsa.pem \
 # pem_der_exp ./certs/crl/caEccCrl.pem \
 #             ./certs/crl/caEccCrl.der 'X509 CRL'
 
-if [[ ! -v HAVE_FIPS ]]; then
-    if [[ -v HAVE_DES3 && -v HAVE_RSA ]]; then
+if [ "$HAVE_FIPS" != 1 ]; then
+    if [ "$HAVE_DES3" = 1 ] && [ "$HAVE_RSA" = 1 ]; then
         USAGE_STRING=$ENC_STRING
         test_setup "Encrypted Key with header"
         convert_to_der -in ./certs/server-keyEnc.pem -p yassl123 --padding
     fi
 
-    if [[ -v HAVE_DES3 && -v HAVE_MD5 && -v HAVE_RSA ]]; then
+    if [ "$HAVE_DES3" = 1 ] && [ "$HAVE_MD5" = 1 ] && [ "$HAVE_RSA" = 1 ]; then
         USAGE_STRING=$ENC_STRING
         test_setup "Encrypted Key - PKCS#8"
         convert_to_der -in ./certs/server-keyPkcs8Enc.pem -p yassl123
@@ -475,13 +475,13 @@ if [[ ! -v HAVE_FIPS ]]; then
         convert_to_der -in ./certs/server-keyPkcs8Enc12.pem -p yassl123
     fi
 
-    if [[ -v HAVE_MD5 && -v HAVE_DES3 ]]; then
+    if [ "$HAVE_MD5" = 1 ] && [ "$HAVE_DES3" = 1 ]; then
         USAGE_STRING="PBES1_MD5_DES"
         test_setup "Encrypted Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
         convert_to_der -in ./certs/ecc-keyPkcs8Enc.pem -p yassl123
     fi
 
-    if [[ -v HAVE_SHA && -v HAVE_DES3 ]]; then
+    if [ "$HAVE_SHA" = 1 ] && [ "$HAVE_DES3" = 1 ]; then
         USAGE_STRING=" DES3"
         test_setup "Encrypted Key - PKCS#8 (PKCS#5v2 PBE-SHA1-DES3)"
         convert_to_der -in ./certs/server-keyPkcs8Enc2.pem -p yassl123
@@ -525,15 +525,15 @@ fi
 # test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES2 DES3)"
 # der_pem_enc --pbe-alg DES3
 
-if [[ ! -v HAVE_FIPS ]]; then
-    if [[ -v HAVE_MD5 && -v HAVE_DES3 ]]; then
+if [ "$HAVE_FIPS" = 1 ]; then
+    if [ "$HAVE_MD5" = 1 ] && [ "$HAVE_DES3" = 1 ]; then
         USAGE_STRING="PBES1_MD5_DES"
         PEM_TYPE="ENCRYPTED PRIVATE KEY"
         test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-MD5-DES)"
         der_pem_enc --pbe PBES1_MD5_DES
     fi
 
-    if [[ -v HAVE_SHA && -v HAVE_DES3 ]]; then
+    if [ "$HAVE_SHA" = 1 ] && [ "$HAVE_DES3" = 1 ]; then
         USAGE_STRING="PBES1_SHA1_DES"
         PEM_TYPE="ENCRYPTED PRIVATE KEY"
         test_setup "Encrypt Key - PKCS#8 (PKCS#5 PBES1-SHA1-DES)"
@@ -545,14 +545,14 @@ if [[ ! -v HAVE_FIPS ]]; then
         der_pem_enc --pbe-ver PKCS12 --pbe SHA1_DES3
     fi
 
-    if [[ -v HAVE_SHA && -v HAVE_RC4 ]]; then
+    if [ "$HAVE_SHA" = 1 ] && [ "$HAVE_RC4" = 1 ]; then
         USAGE_STRING="  SHA1_RC4_128"
         PEM_TYPE="ENCRYPTED PRIVATE KEY"
         test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-RC4-128)"
         der_pem_enc --pbe-ver PKCS12 --pbe SHA1_RC4_128
     fi
 
-    if [[ -v HAVE_SHA && -v HAVE_RC2 ]]; then
+    if [ "$HAVE_SHA" = 1 ] && [ "$HAVE_RC2" = 1 ]; then
         USAGE_STRING="SHA1_40RC2_CBC"
         PEM_TYPE="ENCRYPTED PRIVATE KEY"
         test_setup "Encrypt Key - PKCS#8 (PKCS#12 PBE-SHA1-40RC2-CBC)"