Merge pull request #133 from haydenroche5/cross-comp-issues

Fix various issues customer found when cross-compiling for ARM.

Author: SparkiDev

bench.c

@@ -85,7 +85,7 @@ static int digest_bench(ENGINE *e, const char *alg, const EVP_MD *md,
     while (BENCH_COND(1));
 
     secs = BENCH_SECS();
-    printf("%-14s %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, len,
+    printf("%-14s %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, (long)len,
            (len * cnt) / secs / 1000.0, secs * 1000000.0 / (len * cnt));
 
     return err;
@@ -221,7 +221,7 @@ static int block_enc_bench(const char *alg, EVP_CIPHER_CTX *ctx, size_t len)
     while (BENCH_COND(1));
 
     secs = BENCH_SECS();
-    printf("%-8s enc %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, len,
+    printf("%-8s enc %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, (long)len,
            (len * cnt) / secs / 1000.0, secs * 1000000.0 / (len * cnt));
 
     return err;
@@ -253,7 +253,7 @@ static int block_dec_bench(const char *alg, EVP_CIPHER_CTX *ctx, size_t len)
     while (BENCH_COND(1));
 
     secs = BENCH_SECS();
-    printf("%-8s dec %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, len,
+    printf("%-8s dec %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, (long)len,
            (len * cnt) / secs / 1000.0, secs * 1000000.0 / (len * cnt));
 
     return err;
@@ -365,7 +365,7 @@ static int aesgcm_enc_bench(const char *alg, EVP_CIPHER_CTX *ctx, size_t len)
     while (BENCH_COND(1));
 
     secs = BENCH_SECS();
-    printf("%-8s enc %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, len,
+    printf("%-8s enc %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, (long)len,
            (len * cnt) / secs / 1000.0, secs * 1000000.0 / (len * cnt));
 
     return err;
@@ -405,7 +405,7 @@ static int aesgcm_dec_bench(const char *alg, EVP_CIPHER_CTX *ctx, size_t len)
     while (BENCH_COND(1));
 
     secs = BENCH_SECS();
-    printf("%-8s dec %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, len,
+    printf("%-8s dec %5ld B/op  %10.2f kB/sec %14.6f us/B\n", alg, (long)len,
            (len * cnt) / secs / 1000.0, secs * 1000000.0 / (len * cnt));
 
     return err;

configure.ac

@@ -54,26 +54,8 @@ if test "x$have_openssl" = "xyes"; then
     LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
 fi
 
-AC_RUN_IFELSE([AC_LANG_PROGRAM([
-    #include <openssl/opensslv.h>
-    ],[
-    #if OPENSSL_VERSION_NUMBER < 0x10100000L
-    exit(1);
-    #endif
-])], [OPENSSL_110_PLUS=yes], [OPENSSL_110_PLUS=no])
-
-AC_RUN_IFELSE([AC_LANG_PROGRAM([
-    #include <openssl/opensslv.h>
-    ],[
-    #if OPENSSL_VERSION_NUMBER < 0x10101000L
-    exit(1);
-    #endif
-])], [OPENSSL_111_PLUS=yes], [OPENSSL_111_PLUS=no])
-
 # DEBUG
 DEBUG_CFLAGS="-g -O0 -DWOLFENGINE_DEBUG"
-
-# DEBUG
 AX_DEBUG
 AS_IF([test "$ax_enable_debug" = "yes"],
       [AM_CFLAGS="$DEBUG_CFLAGS $AM_CFLAGS"],
@@ -655,7 +637,6 @@ then
     AM_CFLAGS="-DWOLFENGINE_USER_SETTINGS"
 fi
 
-
 AX_HARDEN_CC_COMPILER_FLAGS
 
 OPTION_FLAGS="$CFLAGS $CPPFLAGS $AM_CFLAGS"

m4/m4_ax_check_openssl.m4

@@ -80,6 +80,23 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib"
                 OPENSSL_LIBS="-lssl -lcrypto"
+
+                OPENSSL_VERSION=$(grep -oP "(?<=define OPENSSL_VERSION_NUMBER)\s+0x[[0-9a-fA-F]]+" $ssldir/include/openssl/opensslv.h)
+                OPENSSL_VERSION_DEC=$(printf "%d" $OPENSSL_VERSION)
+                OPENSSL_110_DEC=$(printf "%d" 0x10100000)
+                OPENSSL_111_DEC=$(printf "%d" 0x10101000)
+                if test $OPENSSL_VERSION_DEC -lt $OPENSSL_110_DEC; then
+                    OPENSSL_110_PLUS=no
+                else
+                    OPENSSL_110_PLUS=yes
+                fi
+                
+                if test $OPENSSL_VERSION_DEC -lt $OPENSSL_111_DEC; then
+                    OPENSSL_111_PLUS=no
+                else
+                    OPENSSL_111_PLUS=yes
+                fi
+
                 found=true
                 AC_MSG_RESULT([yes])
                 break

src/we_ecc.c

@@ -1795,7 +1795,7 @@ static int we_ec_key_compute_key(unsigned char **psec, size_t *pseclen,
     const EC_GROUP *group;
     int curveId;
     word32 len;
-    int peerKeyLen;
+    int peerKeyLen = 0;
     unsigned char* peerKey = NULL;
     unsigned char* secret = NULL;