TI am64x port

.wolfssl_known_macro_extras

@@ -740,6 +740,7 @@ THREADED_SNIFFTEST
 TIF_NEED_FPU_LOAD
 TIME_T_NOT_LONG
 TI_DUMMY_BUILD
+TI_MCU_PLUS_SDK
 TLS13_RSA_PSS_SIGN_CB_NO_PREHASH
 TSIP_AES_128_CTR
 TSIP_AES_256_CTR
@@ -1189,6 +1190,10 @@ WOLFSSL_STSAFE_TAKES_SLOT
 WOLFSSL_TELIT_M2MB
 WOLFSSL_TEMPLATE_EXAMPLE
 WOLFSSL_THREADED_CRYPT
+WOLFSSL_TI_AM64X_R5
+WOLFSSL_TI_AM64X_RNG_CTR_DRBG
+WOLFSSL_TI_AM64X_NO_AES
+WOLFSSL_TI_AM64X_NO_SHA
 WOLFSSL_TICKET_DECRYPT_NO_CREATE
 WOLFSSL_TICKET_ENC_AES128_GCM
 WOLFSSL_TICKET_ENC_AES256_CBC

wolfcrypt/benchmark/benchmark.c

@@ -222,6 +222,10 @@
     #endif
 #endif
 
+#ifdef WOLFSSL_TI_AM64X_R5
+    #include <wolfssl/wolfcrypt/port/ti/ti-sa2ul_r5_port.h>
+#endif
+
 #ifdef WOLFSSL_ASYNC_CRYPT
     #include <wolfssl/wolfcrypt/async.h>
 #endif
@@ -729,6 +733,10 @@ static WC_INLINE void bench_append_memory_info(char* buffer, size_t size,
     #define fprintf(fp, ...)  \
              __android_log_print(ANDROID_LOG_DEBUG, "[WOLFCRYPT]", __VA_ARGS__)
 
+#elif defined(TI_MCU_PLUS_SDK)
+    #include "kernel/nortos/dpl/common/printf.h"
+    #define printf printf_
+
 #else
     #if defined(XMALLOC_USER) || defined(FREESCALE_MQX)
         /* MQX classic needs for EXIT_FAILURE */
@@ -2484,7 +2492,11 @@ static const char* bench_result_words2[][6] = {
     };
     /* how many kB to test (en/de)cryption */
     #define NUM_BLOCKS 25
-    #define BENCH_SIZE (1024uL)
+    #ifdef BENCH_SIZE_EMBEDDED
+    # define BENCH_SIZE BENCH_SIZE_EMBEDDED
+    #else
+    # define BENCH_SIZE (1024uL)
+    #endif
 #else
     #ifndef BENCH_NTIMES
     #define BENCH_NTIMES 100
@@ -2635,7 +2647,11 @@ static void benchmark_static_init(int force)
         bench_pq_asym_algs = 0;
         bench_other_algs = 0;
         bench_pq_hash_sig_algs = 0;
+    #ifdef WOLFSSL_BENCHMARK_FIXED_CSV
+        csv_format = 1;
+    #else
         csv_format = 0;
+    #endif
     }
 }
 
@@ -3248,16 +3264,17 @@ static void bench_stats_sym_finish(const char* desc, int useDeviceID,
     #else
         #ifdef HAVE_GET_CYCLES
             (void)XSNPRINTF(msg, sizeof(msg),
-                            "sym,%s,%s,%lu," FLT_FMT "," FLT_FMT ",%lu,", desc,
+                            "sym,%s,%s,%llu," FLT_FMT "," FLT_FMT ",%llu,", desc,
                             BENCH_DEVID_GET_NAME(useDeviceID),
-                            bytes_processed, FLT_FMT_ARGS(total),
-                            FLT_FMT_ARGS(persec), total_cycles);
+                            (unsigned long long)bytes_processed,
+                            FLT_FMT_ARGS(total), FLT_FMT_ARGS(persec),
+                            (unsigned long long)total_cycles);
         #else
             (void)XSNPRINTF(msg, sizeof(msg),
-                            "sym,%s,%s,%lu," FLT_FMT "," FLT_FMT ",", desc,
+                            "sym,%s,%s,%llu," FLT_FMT "," FLT_FMT ",", desc,
                             BENCH_DEVID_GET_NAME(useDeviceID),
-                            bytes_processed, FLT_FMT_ARGS(total),
-                            FLT_FMT_ARGS(persec));
+                            (unsigned long long)bytes_processed,
+                            FLT_FMT_ARGS(total), FLT_FMT_ARGS(persec));
         #endif
     #endif
 #elif defined(BENCH_DEVID)
@@ -8921,13 +8938,15 @@ void bench_sha256(int useDeviceID)
                 printf("InitSha256_ex failed, ret = %d\n", ret);
                 goto exit;
             }
-        #ifdef WOLFSSL_PIC32MZ_HASH
-            wc_Sha256SizeSet(hash[i], numBlocks * bench_size);
-        #endif
         }
 
         bench_stats_start(&count, &start);
         do {
+            #ifdef WOLFSSL_PIC32MZ_HASH
+            for (i = 0; i < BENCH_MAX_PENDING; i++) {
+                wc_Sha256SizeSet(hash[i], numBlocks * bench_size);
+            }
+            #endif
             for (times = 0; times < numBlocks || pending > 0; ) {
                 bench_async_poll(&pending);
 
@@ -19728,7 +19747,7 @@ int wolfcrypt_benchmark_main(int argc, char** argv)
         argc--;
         argv++;
     }
-#endif /* MAIN_NO_ARGS */
+#endif /* !MAIN_NO_ARGS */
 
 #if defined(WOLFSSL_BENCHMARK_FIXED_CSV)
     /* when defined, we'll always output CSV regardless of params.

wolfcrypt/src/aes.c

@@ -3820,9 +3820,6 @@ WC_ALL_ARGS_NOT_NULL static WARN_UNUSED_RESULT int wc_AesEncrypt(
 {
 #if defined(MAX3266X_AES)
     word32 keySize;
-#endif
-#if defined(MAX3266X_CB)
-    int ret_cb;
 #endif
     word32 r;
 
@@ -3973,12 +3970,12 @@ WC_ALL_ARGS_NOT_NULL static WARN_UNUSED_RESULT int wc_AesEncrypt(
                                     outBlock, (unsigned int)keySize);
     }
 #endif
-#if defined(MAX3266X_CB) && defined(HAVE_AES_ECB) /* Can do a basic ECB block */
+#if (defined(WOLFSSL_TI_AM64X_R5) || defined(MAX3266X_CB)) && defined(HAVE_AES_ECB)
     #ifndef WOLF_CRYPTO_CB_FIND
     if (aes->devId != INVALID_DEVID)
     #endif
     {
-        ret_cb = wc_CryptoCb_AesEcbEncrypt(aes, outBlock, inBlock,
+        int ret_cb = wc_CryptoCb_AesEcbEncrypt(aes, outBlock, inBlock,
                                             WC_AES_BLOCK_SIZE);
         if (ret_cb != WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE))
             return ret_cb;
@@ -4705,9 +4702,6 @@ WC_ALL_ARGS_NOT_NULL static WARN_UNUSED_RESULT int wc_AesDecrypt(
 {
 #if defined(MAX3266X_AES)
     word32 keySize;
-#endif
-#if defined(MAX3266X_CB)
-    int ret_cb;
 #endif
     word32 r;
 
@@ -4832,12 +4826,12 @@ WC_ALL_ARGS_NOT_NULL static WARN_UNUSED_RESULT int wc_AesDecrypt(
     }
 #endif
 
-#if defined(MAX3266X_CB) && defined(HAVE_AES_ECB) /* Can do a basic ECB block */
+#if (defined(WOLFSSL_TI_AM64X_R5) || defined(MAX3266X_CB)) && defined(HAVE_AES_ECB)
     #ifndef WOLF_CRYPTO_CB_FIND
     if (aes->devId != INVALID_DEVID)
     #endif
     {
-        ret_cb = wc_CryptoCb_AesEcbDecrypt(aes, outBlock, inBlock,
+        int ret_cb = wc_CryptoCb_AesEcbDecrypt(aes, outBlock, inBlock,
                                             WC_AES_BLOCK_SIZE);
         if (ret_cb != WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE))
             return ret_cb;

wolfcrypt/src/ecc.c

@@ -292,6 +292,10 @@ ECC Curve Sizes:
     #include <xsecure_ellipticclient.h>
 #endif
 
+#ifdef TI_MCU_PLUS_SDK
+    #include <strings.h>
+#endif
+
 #if defined(WOLFSSL_ECDSA_DETERMINISTIC_K) || \
     defined(WOLFSSL_ECDSA_DETERMINISTIC_K_VARIANT)
     #include <wolfssl/wolfcrypt/hmac.h>

wolfcrypt/src/include.am

@@ -84,6 +84,8 @@ EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \
               wolfcrypt/src/port/ti/ti-ccm.c \
               wolfcrypt/src/port/ti/ti-c2000-aes.c \
               wolfcrypt/src/port/ti/ti-c2000-entropy.c \
+              wolfcrypt/src/port/ti/ti-sa2ul_r5_port.c \
+              wolfcrypt/src/port/ti/README_sa2ul.md \
               wolfcrypt/src/port/pic32/pic32mz-crypt.c \
               wolfcrypt/src/port/nrf51.c \
               wolfcrypt/src/port/aria/aria-crypt.c \

wolfcrypt/src/port/ti/README_sa2ul.md

@@ -0,0 +1,43 @@
+# wolfSSL TI SA2UL Hardware Acceleration Port
+
+wolfSSL supports hardware acceleration on the TI AM6442 via the SA2UL peripheral,
+with software running on one of the Cortex-R5F cores.
+
+## SA2UL on the TI AM6442
+
+The TI AM6442 is a multi-core SoC, with one dual-core Cortex-A53, two dual-core Cortex-R5F,
+a Cortex-M4F, and a dedicated security core based on a Cortex-M3. This support has been
+tested on the TMDS64EVM board (rev 101D).
+
+Basic hardware acceleration supported:
+- TRNG (NRBG and CTR-DRBG SP800-90A)
+- AES-ECB (128, 256)
+- AES-CBC (128, 256)
+- AES-GCM (128, 256)
+- SHA256, SHA512
+- HMAC-SHA256, HMAC-SHA512
+- CMAC-AES (128, 256)
+
+Note: The wolfCrypt sa2ul support depends on the TI MCU Plus SDK.  wolfBoot has
+an example (ti-am64x-r5.config) of how to compile with the MCU Plus SDK.
+
+### wolfSSL TI AM64x Hardware Acceleration Switches
+
+To enable all the above, with TRNG in NRBG mode, set the following build switch:
+
+**`WOLFSSL_TI_AM64X_R5`**
+
+To change the TRNG to CTR-DRBG mode, then also set this switch:
+
+**`WOLFSSL_TI_AM64X_RNG_CTR_DRBG`**
+
+In addition, parts of the hardware acceleration can be disabled (in favor of
+wolfCrypt software algorithms), with the following switches:
+
+**`WOLFSSL_TI_AM64X_NO_AES`**
+
+**`WOLFSSL_TI_AM64X_NO_SHA`**
+
+## Support
+
+For questions please email support@wolfssl.com