Merge pull request #1252 from kojo1/IAR-EWARM

update IAR-EWARM projects

IDE/IAR-EWARM/Projects/benchmark/current_time.c

@@ -62,6 +62,12 @@ double current_time(int reset)
 
 #else
 
-double current_time(int reset) { return 0.0 ; }
+/* dummy */
+double current_time(int reset) {
+    static double t; 
+    t += 1.0; /* for avoid infinit loop of waiting time */
+    if(reset)t = 0.0;
+    return t ; 
+} 
 
 #endif

IDE/IAR-EWARM/Projects/benchmark/wolfCrypt-benchmark.ewp

@@ -169,9 +169,7 @@
         <option>
           <name>CCDefines</name>
           <state>ewarm</state>
-          <state>PART_TM4C129XNCZAD</state>
           <state>WOLFSSL_USER_SETTINGS</state>
-          <state>TARGET_IS_SNOWFLAKE_RA0</state>
         </option>
         <option>
           <name>CCPreprocFile</name>

IDE/IAR-EWARM/Projects/lib/wolfSSL-Lib.ewp

@@ -170,8 +170,6 @@
           <name>CCDefines</name>
           <state>WOLFSSL_USER_SETTINGS</state>
           <state>ewarm</state>
-          <state>PART_TM4C129XNCZAD</state>
-          <state>TARGET_IS_SNOWFLAKE_RA0</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -939,7 +937,7 @@
         </option>
         <option>
           <name>IarchiveOutput</name>
-          <state>C:\ROOT\CyaSSL-Support\TI\Staging-20150522\wolfssl\IDE\IAR-EWARM\Projects\lib\ewarm\Exe\wolfSSL-Lib.a</state>
+          <state>C:\wolfSSL\Support\EWARM\wolfssl\IDE\IAR-EWARM\Projects\lib\ewarm\Exe\wolfSSL-Lib.a</state>
         </option>
       </data>
     </settings>
@@ -1926,12 +1924,18 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\chacha20_poly1305.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\cmac.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\coding.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\compress.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\cpuid.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\curve25519.c</name>
     </file>
@@ -1956,6 +1960,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\error.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\evp.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\fe_low_mem.c</name>
     </file>
@@ -1977,6 +1984,9 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\hmac.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\idea.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\integer.c</name>
     </file>
@@ -1996,7 +2006,7 @@
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\memory.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\misc.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\pkcs12.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\pkcs7.c</name>
@@ -2025,9 +2035,18 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sha256.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sha3.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sha512.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\signature.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\sp.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\srp.c</name>
     </file>
@@ -2041,23 +2060,23 @@
       <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\wc_port.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\wolfmath.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\wolfevent.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\wolfevent.c</name>
+      <name>$PROJ_DIR$\..\..\..\..\wolfcrypt\src\wolfmath.c</name>
     </file>
   </group>
   <group>
     <name>wolfSSL</name>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\src\bio.c</name>
+    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\crl.c</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\internal.c</name>
     </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\..\src\wolfio.c</name>
-    </file>
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\keys.c</name>
     </file>
@@ -2073,6 +2092,12 @@
     <file>
       <name>$PROJ_DIR$\..\..\..\..\src\tls.c</name>
     </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\src\tls13.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\..\src\wolfio.c</name>
+    </file>
   </group>
 </project>
 

IDE/IAR-EWARM/Projects/test/wolfCrypt-test.ewp

@@ -169,9 +169,7 @@
         <option>
           <name>CCDefines</name>
           <state>ewarm</state>
-          <state>PART_TM4C129XNCZAD</state>
           <state>WOLFSSL_USER_SETTINGS</state>
-          <state>TARGET_IS_SNOWFLAKE_RA0</state>
         </option>
         <option>
           <name>CCPreprocFile</name>

IDE/IAR-EWARM/Projects/user_settings.h

@@ -1,15 +1,32 @@
 
 #define NO_MAIN_DRIVER
 #define BENCH_EMBEDDED
-#define SINGLE_THREADED
-#define NO_FILESYSTEM
 #define NO_WRITEV
 #define WOLFSSL_USER_IO
 #define NO_DEV_RANDOM
 #define USE_CERT_BUFFERS_2048
 #define WOLFSSL_USER_CURRTIME
 #define SIZEOF_LONG_LONG 8
+#define NO_WOLFSSL_DIR 
+#define WOLFSSL_NO_CURRDIR
 
-#define CUSTOM_RAND_GENERATE custom_rand_generate
+#define XVALIDATEDATE(d, f,t) (0)
-/*  warning "write a real random seed!!!!, just for testing now"   */
+#define WOLFSSL_USER_CURRTIME /* for benchmark */
-static int custom_rand_generate(void) { return 0 ; }
+
+#define WOLFSSL_GENSEED_FORTEST /* Wardning: define your own seed gen */
+
+#define TFM_TIMING_RESISTANT
+#define ECC_TIMING_RESISTANT
+#define WC_RSA_BLINDING
+
+#define SINGLE_THREADED  /* or define RTOS  option */
+/* #define WOLFSSL_CMSIS_RTOS */
+#define NO_FILESYSTEM
+
+/* #define NO_DH */
+#define HAVE_AESGCM
+#define WOLFSSL_SHA512
+#define HAVE_ECC
+#define HAVE_CURVE25519
+#define CURVE25519_SMALL
+#define HAVE_ED25519

wolfcrypt/benchmark/benchmark.c

@@ -2769,7 +2769,11 @@ static void bench_hmac(int doAsync, int type, int digestSz,
     Hmac   hmac[BENCH_MAX_PENDING];
     double start;
     int    ret, i, count = 0, times, pending = 0;
+#if defined(BENCH_EMBEDDED)
+    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, MAX_DIGEST_SIZE, HEAP_HINT);
+#else
     DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, digestSz, HEAP_HINT);
+#endif
     
     /* clear for done cleanup */
     XMEMSET(hmac, 0, sizeof(hmac));