Merge pull request #24 from bandi13/basicFixes

Basic fixes

Author: SparkiDev

.gitignore

@@ -65,3 +65,7 @@ IDE/Android/wolfssl-install/
 IDE/Android/wolfProvider/
 
 examples/openssl_example
+
+cscope.out
+
+tags

scripts/test-openssl.sh

@@ -141,11 +141,11 @@ evp_test_run() {
 #
 
 endecode_test_run() {
-    printf "\tTesting with evp_test:\n"
+    printf "\tTesting with endecode_test:\n"
 
     RES=`./endecode_test \
         -rsa certs/ee-key.pem -pss certs/ca-pss-key.pem -context \
-        -provider libwolfprov 2>&1 | grep 'ok [1-9]'`
+        -provider libwolfprov 2>&1 | tee -a $LOGDIR/endecode_test.log | grep 'ok [1-9]'`
     OLD_IFS=$IFS
     IFS=$'\n'
     for R in $RES
@@ -275,7 +275,7 @@ init_wolfssl
 if [ -z $LD_LIBRARY_PATH ]; then
     export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
 else
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
+    export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
 fi
 printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 

scripts/test-wp-cs.sh

@@ -235,7 +235,7 @@ init_wolfssl
 if [ -z $LD_LIBRARY_PATH ]; then
     export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
 else
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
+    export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
 fi
 printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 

scripts/utils-openssl.sh

@@ -32,7 +32,7 @@ NUMCPU=${NUMCPU:-8}
 
 clone_openssl() {
     if [ -d ${OPENSSL_SOURCE_DIR} ]; then
-        OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && git describe --tags)
+        OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags || git branch --show-current))
         if [ "${OPENSSL_TAG_CUR}" != "${OPENSSL_TAG}" ]; then # force a rebuild
             printf "Version inconsistency. Please fix ${OPENSSL_SOURCE_DIR} (expected: ${OPENSSL_TAG}, got: ${OPENSSL_TAG_CUR})\n"
             do_cleanup

scripts/utils-wolfssl.sh

@@ -31,7 +31,7 @@ WOLFSSL_INSTALL_DIR=$PWD/wolfssl-install
 # Depends on OPENSSL_INSTALL_DIR
 clone_wolfssl() {
     if [ -d ${WOLFSSL_SOURCE_DIR} ]; then
-        WOLFSSL_TAG_CUR=$(cd ${WOLFSSL_SOURCE_DIR} && git describe --tags)
+        WOLFSSL_TAG_CUR=$(cd ${WOLFSSL_SOURCE_DIR} && (git describe --tags || git branch --show-current))
         if [ "${WOLFSSL_TAG_CUR}" != "${WOLFSSL_TAG}" ]; then # force a rebuild
             printf "Version inconsistency. Please fix ${WOLFSSL_SOURCE_DIR} (expected: ${WOLFSSL_TAG}, got: ${WOLFSSL_TAG_CUR})\n"
             do_cleanup
@@ -59,12 +59,12 @@ install_wolfssl() {
     if [ ! -d ${WOLFSSL_INSTALL_DIR} ]; then
         printf "\tConfigure wolfSSL ${WOLFSSL_TAG} ... "
         if [ -z "$WOLFSSL_CONFIG_OPTS" ]; then
-            WOLFSSL_CONFIG_OPTS='--enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --enable-aesgcm-stream --enable-curve25519 --enable-curve448 --enable-ed25519 --enable-ed448 --enable-pwdbased'
-            WOLFSSL_CONFIG_CPPFLAGS=CPPFLAGS="-I${OPENSSL_INSTALL_DIR} -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DFP_MAX_BITS=16384 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
+            WOLFSSL_CONFIG_OPTS='--with-max-ecc-bits=1024 --enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --enable-aesgcm-stream --enable-curve25519 --enable-curve448 --enable-ed25519 --enable-ed448 --enable-pwdbased'
+            WOLFSSL_CONFIG_CFLAGS="-I${OPENSSL_INSTALL_DIR}/include -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DHAVE_FFDHE_6144 -DHAVE_FFDHE_8192 -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER"
         fi
 
         ./autogen.sh >>$LOG_FILE 2>&1
-        ./configure ${WOLFSSL_CONFIG_OPTS} "${WOLFSSL_CONFIG_CPPFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
+        ./configure ${WOLFSSL_CONFIG_OPTS} CFLAGS="${WOLFSSL_CONFIG_CFLAGS}" -prefix=${WOLFSSL_INSTALL_DIR} >>$LOG_FILE 2>&1
         if [ $? != 0 ]; then
             printf "ERROR.\n"
             rm -rf ${WOLFSSL_INSTALL_DIR}

test/unit.c

@@ -399,7 +399,7 @@ static int run_tests(int runAll)
         if (!test_case[i].err)
             fprintf(stderr, "PASSED\n");
         else
-            fprintf(stderr, "FAILED\n");
+            fprintf(stderr, "FAILED (err: %d)\n", test_case[i].err);
         }
 
     LockFree();
@@ -418,7 +418,7 @@ static int run_tests(int runAll)
     else {
         for (i = 0; i < TEST_CASE_CNT; i++) {
             if (test_case[i].err) {
-                printf("## FAIL: %d: %s\n", i + 1, test_case[i].name);
+                printf("## FAIL: %d: %s (err: %d)\n", i + 1, test_case[i].name, test_case[i].err);
             }
         }
         printf("###### TESTSUITE FAILED\n");
@@ -454,7 +454,7 @@ static int run_tests(int runAll)
         if (!test_case[i].err)
             printf("#### SUCCESS: %d - %s\n", i + 1, test_case[i].name);
         else
-            printf("#### FAILED: %d - %s\n", i + 1, test_case[i].name);
+            printf("#### FAILED: %d - %s (err: %d)\n", i + 1, test_case[i].name, test_case[i].err);
         printf("\n");
     }
 
@@ -471,7 +471,7 @@ static int run_tests(int runAll)
     else {
         for (i = 0; i < TEST_CASE_CNT; i++) {
             if (test_case[i].err) {
-                printf("## FAIL: %d: %s\n", i + 1, test_case[i].name);
+                printf("## FAIL: %d: %s (err: %d)\n", i + 1, test_case[i].name, test_case[i].err);
             }
         }
         printf("###### TESTSUITE FAILED\n");