Merge pull request #927 from dgarske/fix_nxp_ltc

Build fixes for NXP KSDK with MMCAU / LTC after Hexiwear changes

IDE/ROWLEY-CROSSWORKS-ARM/retarget.c

@@ -29,6 +29,12 @@ void __assert(const char *__expression, const char *__filename, int __line)
     printf("Assert: %s, File %s (%d)\n", __expression, __filename, __line);
 }
 
+unsigned long ksdk_time(unsigned long* timer)
+{
+    (void)timer;
+    return hw_get_time_sec();
+}
+
 unsigned int LowResTimer(void)
 {
     return hw_get_time_sec();

IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h

@@ -7,6 +7,8 @@
 extern "C" {
 #endif
 
+#include <stddef.h> /* for size_t */
+
 /* ------------------------------------------------------------------------- */
 /* Platform */
 /* ------------------------------------------------------------------------- */
@@ -270,6 +272,8 @@ extern "C" {
 /* Allows custom "custom_time()" function to be used for benchmark */
 #define WOLFSSL_USER_CURRTIME
 #define USER_TICKS
+extern unsigned long ksdk_time(unsigned long* timer);
+#define XTIME ksdk_time
 
 
 /* ------------------------------------------------------------------------- */

wolfcrypt/benchmark/benchmark.c

@@ -52,9 +52,10 @@
     #else
         #include <nio.h>
     #endif
-#elif defined(FREESCALE_KSDK_BM)
+#elif defined(FREESCALE_KSDK_1_3)
     #include "fsl_debug_console.h"
     #include "fsl_os_abstraction.h"
+
     #undef printf
     #define printf PRINTF
 #else

wolfcrypt/src/aes.c

@@ -2516,6 +2516,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
         uint32_t keySize;
         status_t status;
         byte *iv, *enc_key;
+        word32 blocks = (sz / AES_BLOCK_SIZE);
 
         iv      = (byte*)aes->reg;
         enc_key = (byte*)aes->key;
@@ -2525,7 +2526,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
             return status;
         }
 
-        status = LTC_AES_EncryptCbc(LTC_BASE, in, out, sz,
+        status = LTC_AES_EncryptCbc(LTC_BASE, in, out, blocks * AES_BLOCK_SIZE,
             iv, enc_key, keySize);
         return (status == kStatus_Success) ? 0 : -1;
     }
@@ -2536,6 +2537,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
         uint32_t keySize;
         status_t status;
         byte* iv, *dec_key;
+        word32 blocks = (sz / AES_BLOCK_SIZE);
 
         iv      = (byte*)aes->reg;
         dec_key = (byte*)aes->key;
@@ -2545,7 +2547,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
             return status;
         }
 
-        status = LTC_AES_DecryptCbc(LTC_BASE, in, out, sz,
+        status = LTC_AES_DecryptCbc(LTC_BASE, in, out, blocks * AES_BLOCK_SIZE,
             iv, dec_key, keySize, kLTC_EncryptKey);
         return (status == kStatus_Success) ? 0 : -1;
     }
@@ -2556,15 +2558,13 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
     {
         int i;
         int offset = 0;
-        int len = sz;
-
+        word32 blocks = (sz / AES_BLOCK_SIZE);
         byte *iv;
         byte temp_block[AES_BLOCK_SIZE];
 
         iv      = (byte*)aes->reg;
 
-        while (len > 0)
-        {
+        while (blocks--) {
             XMEMCPY(temp_block, in + offset, AES_BLOCK_SIZE);
 
             /* XOR block with IV for CBC */
@@ -2573,7 +2573,6 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
 
             wc_AesEncrypt(aes, temp_block, out + offset);
 
-            len    -= AES_BLOCK_SIZE;
             offset += AES_BLOCK_SIZE;
 
             /* store IV for next block */
@@ -2587,16 +2586,13 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
     {
         int i;
         int offset = 0;
-        int len = sz;
-
+        word32 blocks = (sz / AES_BLOCK_SIZE);
         byte* iv;
         byte temp_block[AES_BLOCK_SIZE];
 
         iv      = (byte*)aes->reg;
 
-
-        while (len > 0)
-        {
+        while (blocks--) {
             XMEMCPY(temp_block, in + offset, AES_BLOCK_SIZE);
 
             wc_AesDecrypt(aes, in + offset, out + offset);
@@ -2608,7 +2604,6 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
             /* store IV for next block */
             XMEMCPY(iv, temp_block, AES_BLOCK_SIZE);
 
-            len    -= AES_BLOCK_SIZE;
             offset += AES_BLOCK_SIZE;
         }
 
@@ -2623,7 +2618,6 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
     {
         securityAssociation *sa_p;
         bufferDescriptor *bd_p;
-
         volatile securityAssociation sa __attribute__((aligned (8)));
         volatile bufferDescriptor bd __attribute__((aligned (8)));
         volatile int k;
@@ -2730,7 +2724,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
 #else
     int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
     {
-        word32 blocks = sz / AES_BLOCK_SIZE;
+        word32 blocks = (sz / AES_BLOCK_SIZE);
 
     #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_AES)
         /* if async and byte count above threshold */

wolfcrypt/src/asn.c

@@ -159,6 +159,7 @@ ASN Options:
 #elif defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS) || defined(FREESCALE_KSDK_FREERTOS)
     #include <time.h>
     #ifndef XTIME
+        /*extern time_t ksdk_time(time_t* timer);*/
         #define XTIME(t1)   ksdk_time((t1))
     #endif
     #define XGMTIME(c, t)   gmtime((c))
@@ -244,10 +245,6 @@ ASN Options:
     struct tm* gmtime(const time_t* timer);
 #endif
 
-#if defined(FREESCALE_KSDK_BM) || defined(FREESCALE_FREE_RTOS)
-    /* extern time_t ksdk_time(time_t* timer); */
-#endif /* FREESCALE_KSDK_BM || FREESCALE_FREE_RTOS */
-
 
 #if defined(_WIN32_WCE)
 time_t windows_time(time_t* timer)

wolfcrypt/src/ecc.c

@@ -2283,6 +2283,8 @@ exit:
    return err;
 }
 
+#endif /* !FREESCALE_LTC_ECC */
+
 /** ECC Fixed Point mulmod global
     k        The multiplicand
     G        Base point to multiply
@@ -2299,8 +2301,6 @@ int wc_ecc_mulmod(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
     return wc_ecc_mulmod_ex(k, G, R, a, modulus, map, NULL);
 }
 
-#endif /* !FREESCALE_LTC_ECC */
-
 
 #ifdef ALT_ECC_SIZE