Merge pull request #3862 from kaleb-himes/WIN32_WCE_PORTING

_WIN32_WCE port of wolfCrypt - OE12

IDE/WINCE/include.am

@@ -0,0 +1,5 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+EXTRA_DIST+= IDE/WINCE/user_settings.h

IDE/WINCE/user_settings.h

@@ -0,0 +1,333 @@
+#ifndef _WIN_USER_SETTINGS_H_
+#define _WIN_USER_SETTINGS_H_
+
+/* For FIPS Ready, uncomment the following: */
+/* #define WOLFSSL_FIPS_READY */
+#ifdef WOLFSSL_FIPS_READY
+    #undef HAVE_FIPS_VERSION
+    #define HAVE_FIPS_VERSION 3
+#endif
+
+
+/* Verify this is Windows */
+#ifndef _WIN32
+#error This user_settings.h header is only designed for Windows
+#endif
+
+/* Configurations */
+#define WOLFCRYPT_ONLY
+
+#undef USE_FAST_MATH
+#if 1
+    #define USE_FAST_MATH
+
+    #undef  TFM_TIMING_RESISTANT
+    #define TFM_TIMING_RESISTANT
+
+    /* Optimizations */
+    //#define TFM_ARM
+#endif
+
+/* Wolf Single Precision Math */
+#undef WOLFSSL_SP
+#if 0
+    #define WOLFSSL_SP
+    //#define WOLFSSL_SP_SMALL      /* use smaller version of code */
+    #define WOLFSSL_HAVE_SP_RSA
+    #define WOLFSSL_HAVE_SP_DH
+    #define WOLFSSL_HAVE_SP_ECC
+    //#define WOLFSSL_SP_CACHE_RESISTANT
+    //#define WOLFSSL_SP_MATH     /* only SP math - eliminates fast math code */
+
+    /* SP Assembly Speedups */
+    //#define WOLFSSL_SP_ASM      /* required if using the ASM versions */
+    //#define WOLFSSL_SP_ARM32_ASM
+    //#define WOLFSSL_SP_ARM64_ASM
+    //#define WOLFSSL_SP_ARM_THUMB_ASM
+    //#define WOLFSSL_SP_ARM_CORTEX_M_ASM
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* FIPS - Requires eval or license from wolfSSL */
+/* ------------------------------------------------------------------------- */
+#undef  HAVE_FIPS
+#if 1
+    #define HAVE_FIPS
+
+    #undef  HAVE_FIPS_VERSION
+    #define HAVE_FIPS_VERSION 2
+
+    #ifdef SINGLE_THREADED
+        #undef  NO_THREAD_LS
+        #define NO_THREAD_LS
+    #else
+        #ifndef USE_WINDOWS_API
+            #define USE_WINDOWS_API
+        #endif
+    #endif
+
+    #undef NO_ATTRIBUTE_CONSTRUCTOR
+    //#define NO_ATTRIBUTE_CONSTRUCTOR
+
+#endif
+
+
+/* FIPS */
+//#define OPENSSL_EXTRA
+//#define HAVE_THREAD_LS
+#define WOLFSSL_KEY_GEN
+#define HAVE_AESGCM
+#define HAVE_HASHDRBG
+#define WOLFSSL_SHA384
+#define WOLFSSL_SHA512
+#define NO_PSK
+#define NO_HC128
+#define NO_RC4
+#define NO_RABBIT
+//#define NO_DSA
+#define NO_MD4
+
+#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
+    /* ------------------------------------------------------------------------- */
+    /* Crypto */
+    /* ------------------------------------------------------------------------- */
+    #define USE_CERT_BUFFERS_2048
+    #define USE_CERT_BUFFERS_256
+    /* RSA */
+    #undef NO_RSA
+    #if 1
+        #ifdef USE_FAST_MATH
+            /* Maximum math bits (Max RSA key bits * 2) */
+            #undef  FP_MAX_BITS
+            #define FP_MAX_BITS     8192
+        #endif
+
+        /* half as much memory but twice as slow */
+        #undef  RSA_LOW_MEM
+        //#define RSA_LOW_MEM
+
+        /* Enables blinding mode, to prevent timing attacks */
+        #if 0
+            #undef  WC_RSA_BLINDING
+            #define WC_RSA_BLINDING
+        #else
+            #undef  WC_NO_HARDEN
+            #define WC_NO_HARDEN
+        #endif
+
+        /* RSA PSS Support */
+        #if 1
+            #define WC_RSA_PSS
+        #endif
+
+        #if 1
+            #define WC_RSA_NO_PADDING
+        #endif
+    #else
+        #define NO_RSA
+    #endif
+    /* ECC */
+    #undef HAVE_ECC
+    #if 1
+        #define HAVE_ECC
+
+        /* Manually define enabled curves */
+        #undef  ECC_USER_CURVES
+        //#define ECC_USER_CURVES
+
+        #ifdef ECC_USER_CURVES
+            /* Manual Curve Selection */
+            //#define HAVE_ECC192
+            //#define HAVE_ECC224
+            #undef NO_ECC256
+            //#define HAVE_ECC384
+            //#define HAVE_ECC521
+        #endif
+
+        /* Fixed point cache (speeds repeated operations against same private key) */
+        #undef  FP_ECC
+        //#define FP_ECC
+        #ifdef FP_ECC
+            /* Bits / Entries */
+            #undef  FP_ENTRIES
+            #define FP_ENTRIES  2
+            #undef  FP_LUT
+            #define FP_LUT      4
+        #endif
+
+        /* Optional ECC calculation method */
+        /* Note: doubles heap usage, but slightly faster */
+        #undef  ECC_SHAMIR
+        #define ECC_SHAMIR
+
+        /* Reduces heap usage, but slower */
+        #undef  ECC_TIMING_RESISTANT
+        #define ECC_TIMING_RESISTANT
+
+        #ifdef HAVE_FIPS
+            #undef  HAVE_ECC_CDH
+            #define HAVE_ECC_CDH /* Enable cofactor support */
+
+            #undef NO_STRICT_ECDSA_LEN
+            #define NO_STRICT_ECDSA_LEN /* Do not force fixed len w/ FIPS */
+
+            #undef  WOLFSSL_VALIDATE_ECC_IMPORT
+            #define WOLFSSL_VALIDATE_ECC_IMPORT /* Validate import */
+        #endif
+
+        /* Compressed Key Support */
+        #undef  HAVE_COMP_KEY
+        //#define HAVE_COMP_KEY
+
+        /* Use alternate ECC size for ECC math */
+        #ifdef USE_FAST_MATH
+            /* MAX ECC BITS = ROUND8(MAX ECC) * 2 */
+            #ifdef NO_RSA
+                /* Custom fastmath size if not using RSA */
+                #undef  FP_MAX_BITS
+                #define FP_MAX_BITS     (256 * 2)
+            #else
+                #undef  ALT_ECC_SIZE
+                #define ALT_ECC_SIZE
+                /* wolfSSL will compute the FP_MAX_BITS_ECC, but it can be overriden */
+                //#undef  FP_MAX_BITS_ECC
+                //#define FP_MAX_BITS_ECC (256 * 2)
+            #endif
+
+            /* Speedups specific to curve */
+            #ifndef NO_ECC256
+                #undef  TFM_ECC256
+                #define TFM_ECC256
+            #endif
+        #endif
+    #endif
+
+    /* AES */
+    #undef NO_AES
+    #if 1
+        #undef  HAVE_AES_CBC
+        #define HAVE_AES_CBC
+
+        #undef  HAVE_AESGCM
+        #define HAVE_AESGCM
+
+        /* GCM Method: GCM_SMALL, GCM_WORD32 or GCM_TABLE */
+        //#define GCM_SMALL
+        //#define GCM_WORD32
+        #define GCM_TABLE
+
+        #undef  WOLFSSL_AES_DIRECT
+        #define WOLFSSL_AES_DIRECT
+
+        #undef  HAVE_AES_ECB
+        #define HAVE_AES_ECB
+
+        #undef  WOLFSSL_AES_COUNTER
+        #define WOLFSSL_AES_COUNTER
+
+        #undef  HAVE_AESCCM
+        #define HAVE_AESCCM
+
+    #else
+        #define NO_AES
+    #endif
+
+
+    /* DES3 */
+    #undef NO_DES3
+    #if 1
+    #else
+        #define NO_DES3
+    #endif
+
+    /* ------------------------------------------------------------------------- */
+    /* Hashing */
+    /* ------------------------------------------------------------------------- */
+    /* Sha */
+    #undef NO_SHA
+    #if 1
+        /* 1k smaller, but 25% slower */
+        //#define USE_SLOW_SHA
+    #else
+        #define NO_SHA
+    #endif
+
+    /* Sha256 */
+    #undef NO_SHA256
+    #if 1
+        /* not unrolled - ~2k smaller and ~25% slower */
+        //#define USE_SLOW_SHA256
+
+        /* Sha224 */
+        #if 1
+            #define WOLFSSL_SHA224
+        #endif
+    #else
+        #define NO_SHA256
+    #endif
+
+    /* Sha512 */
+    #undef WOLFSSL_SHA512
+    #if 1
+        #define WOLFSSL_SHA512
+
+        /* Sha384 */
+        #undef  WOLFSSL_SHA384
+        #if 1
+            #define WOLFSSL_SHA384
+        #endif
+
+        /* over twice as small, but 50% slower */
+        //#define USE_SLOW_SHA512
+    #endif
+
+    /* Sha3 */
+    #undef WOLFSSL_SHA3
+    #if 1
+        #define WOLFSSL_SHA3
+    #endif
+
+    /* MD5 */
+    #undef  NO_MD5
+    #if 1
+
+    #else
+        #define NO_MD5
+    #endif
+
+    /* HKDF */
+    #undef HAVE_HKDF
+    #if 1
+        #define HAVE_HKDF
+    #endif
+
+    /* CMAC */
+    #undef WOLFSSL_CMAC
+    #if 1
+        #define WOLFSSL_CMAC
+    #endif
+
+    /* DH */
+    #undef  NO_DH
+    #if 1
+        /* Use table for DH instead of -lm (math) lib dependency */
+        #if 0
+            #define WOLFSSL_DH_CONST
+            #define HAVE_FFDHE_2048
+            #define HAVE_FFDHE_4096
+            //#define HAVE_FFDHE_6144
+            //#define HAVE_FFDHE_8192
+        #endif
+
+        #ifdef HAVE_FIPS
+            #define WOLFSSL_VALIDATE_FFC_IMPORT
+            #define HAVE_FFDHE_Q
+        #endif
+    #else
+        #define NO_DH
+    #endif
+#endif /* FIPS v2 */
+
+//#define DEBUG_WOLFSSL
+#define NO_MAIN_DRIVER
+#endif /* _WIN_USER_SETTINGS_H_ */

IDE/include.am

@@ -37,6 +37,7 @@ include IDE/RISCV/include.am
 include IDE/XilinxSDK/include.am
 include IDE/VisualDSP/include.am
 include IDE/QNX/include.am
+include IDE/WINCE/include.am
 
 EXTRA_DIST+= IDE/IAR-EWARM IDE/MDK-ARM IDE/MDK5-ARM IDE/MYSQL IDE/LPCXPRESSO IDE/HEXIWEAR IDE/Espressif IDE/zephyr
 EXTRA_DIST+= IDE/OPENSTM32/README.md

wolfcrypt/benchmark/benchmark.c

@@ -4677,18 +4677,17 @@ static void bench_rsa_helper(int doAsync, RsaKey rsaKey[BENCH_MAX_PENDING],
 #ifndef WOLFSSL_RSA_VERIFY_ONLY
     DECLARE_VAR(message, byte, TEST_STRING_SZ, HEAP_HINT);
 #endif
-    #if !defined(WOLFSSL_MDK5_COMPLv5)
+    #if !defined(WOLFSSL_MDK5_COMPLv5) && !defined(_WIN32_WCE)
     /* MDK5 compiler regard this as a executable statement, and does not allow declarations after the line. */
     DECLARE_ARRAY_DYNAMIC_DEC(enc, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
     #else
         byte* enc[BENCH_MAX_PENDING];
     #endif
     #if !defined(WOLFSSL_RSA_VERIFY_INLINE) && !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-        #if !defined(WOLFSSL_MDK5_COMPLv5)
+        #if !defined(WOLFSSL_MDK5_COMPLv5) && !defined(_WIN32_WCE)
           /* MDK5 compiler regard this as a executable statement, and does not allow declarations after the line. */
             DECLARE_ARRAY_DYNAMIC_DEC(out, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
             #else
-                int idxout;
               byte* out[BENCH_MAX_PENDING];
         #endif
     #else
@@ -6916,7 +6915,7 @@ static int string_matches(const char* arg, const char* str)
 }
 #endif /* MAIN_NO_ARGS */
 
-#ifdef WOLFSSL_ESPIDF
+#if defined(WOLFSSL_ESPIDF) || defined(_WIN32_WCE)
 int wolf_benchmark_task( )
 #elif defined(MAIN_NO_ARGS)
 int main()

wolfcrypt/test/test.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-
 #ifdef HAVE_CONFIG_H
     #include <config.h>
 #endif
@@ -11860,6 +11859,9 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
 #elif defined(WOLFSSL_uTKERNEL2)
     #define CERT_PREFIX "/uda/"
     #define CERT_PATH_SEP "/"
+#elif defined(_WIN32_WCE)
+    #define CERT_PREFIX "\\windows\\"
+    #define CERT_PATH_SEP "\\"
 #endif
 
 #ifndef CERT_PREFIX
@@ -13701,8 +13703,7 @@ WOLFSSL_TEST_SUBROUTINE int rsa_no_pad_test(void)
 #elif !defined(NO_FILESYSTEM)
     file = XFOPEN(clientKey, "rb");
     if (!file) {
-        err_sys("can't open ./certs/client-key.der, "
+        err_sys("can't open clientKey, Please run from wolfSSL home dir", -40);
-                "Please run from wolfSSL home dir", -40);
         ERROR_OUT(-7801, exit_rsa_nopadding);
     }
 

wolfssl/wolfcrypt/sp.h

@@ -27,9 +27,15 @@
 
 #if defined(WOLFSSL_HAVE_SP_RSA) || defined(WOLFSSL_HAVE_SP_DH) || \
                                     defined(WOLFSSL_HAVE_SP_ECC)
-
+#ifdef _WIN32_WCE
-#ifndef WOLFSSL_LINUXKM
+    typedef __int8           int8_t;
-#include <stdint.h>
+    typedef __int32          int32_t;
+    typedef __int64          int64_t;
+    typedef unsigned __int8  uint8_t;
+    typedef unsigned __int32 uint32_t;
+    typedef unsigned __int64 uint64_t;
+#elif !defined(WOLFSSL_LINUXKM)
+    #include <stdint.h>
 #endif
 
 #include <wolfssl/wolfcrypt/integer.h>

wolfssl/wolfcrypt/types.h

@@ -556,17 +556,17 @@ decouple library dependencies with standard string, memory and so on.
                     {
                         va_list ap;
                         int ret;
-                        
+
                         if ((int)n <= 0) return -1;
-                        
+
                         va_start(ap, format);
-                        
+
-                        ret = vsnprintf(s, n, format, ap);
+                        ret = XVSNPRINTF(s, n, format, ap);
                         if (ret < 0)
                             ret = -1;
-                            
+
                         va_end(ap);
-                        
+
                         return ret;
                     }
                 #define XSNPRINTF _xsnprintf_
@@ -597,7 +597,7 @@ decouple library dependencies with standard string, memory and so on.
 
                         if ((int)bufsize <= 0) return -1;
                         va_start(ap, format);
-                        ret = vsnprintf(buffer, bufsize, format, ap);
+                        ret = XVSNPRINTF(buffer, bufsize, format, ap);
                         if (ret >= (int)bufsize)
                             ret = -1;
                         va_end(ap);

wolfssl/wolfcrypt/visibility.h

@@ -43,7 +43,8 @@
 */
 
 #if defined(BUILDING_WOLFSSL)
-    #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+    #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || \
+        defined(_WIN32_WCE)
         #if defined(WOLFSSL_DLL)
             #define WOLFSSL_API __declspec(dllexport)
         #else
@@ -61,7 +62,8 @@
         #define WOLFSSL_LOCAL
     #endif /* HAVE_VISIBILITY */
 #else /* BUILDING_WOLFSSL */
-    #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+    #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) || \
+        defined(_WIN32_WCE)
         #if defined(WOLFSSL_DLL)
             #define WOLFSSL_API __declspec(dllimport)
         #else

wolfssl/wolfcrypt/wc_port.h

@@ -616,6 +616,22 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
     #define XSEEK_END                0
     #define XBADFILE                 NULL
     #define XFGETS(b,s,f)            f_gets((b), (s), (f))
+#elif defined (_WIN32_WCE)
+    /* stdio, WINCE case */
+    #include <stdio.h>
+    #define XFILE      FILE*
+    #define XFOPEN     fopen
+    #define XFDOPEN    fdopen
+    #define XFSEEK     fseek
+    #define XFTELL     ftell
+    #define XREWIND(F) XFSEEK(F, 0, SEEK_SET)
+    #define XFREAD     fread
+    #define XFWRITE    fwrite
+    #define XFCLOSE    fclose
+    #define XSEEK_END  SEEK_END
+    #define XBADFILE   NULL
+    #define XFGETS     fgets
+    #define XVSNPRINTF _vsnprintf
 
 #elif defined(FUSION_RTOS)
     #include <fclstdio.h>
@@ -885,9 +901,32 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
 
 #elif defined(_WIN32_WCE)
     #include <windows.h>
+    #include <stdlib.h> /* For file system */
+
+    time_t windows_time(time_t* timer);
+
+    #define FindNextFileA(h, d) FindNextFile(h, (LPWIN32_FIND_DATAW) d)
+    #define FindFirstFileA(fn, d) FindFirstFile((LPCWSTR) fn, \
+                                                (LPWIN32_FIND_DATAW) d)
     #define XTIME(t1)       windows_time((t1))
     #define WOLFSSL_GMTIME
 
+    /* if struct tm is not defined in WINCE SDK */
+    #ifndef _TM_DEFINED
+        struct tm {
+            int tm_sec;     /* seconds */
+            int tm_min;     /* minutes */
+            int tm_hour;    /* hours */
+            int tm_mday;    /* day of month (month specific) */
+            int tm_mon;     /* month */
+            int tm_year;    /* year */
+            int tm_wday;    /* day of week (out of 1-7)*/
+            int tm_yday;    /* day of year (out of 365) */
+            int tm_isdst;   /* is it daylight savings */
+            };
+            #define _TM_DEFINED
+    #endif
+
 #elif defined(WOLFSSL_APACHE_MYNEWT)
     #include "os/os_time.h"
     #define XTIME(t1)       mynewt_time((t1))