diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c
index 196ceb69b..efc82f685 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/benchmark_main.c
@@ -119,34 +119,36 @@ Benchmark Test 0: Return code 0
SAMPLE OUTPUT: NXP K82 running at 150Mhz software only
Benchmark Test 0:
-RNG 25 kB took 0.026 seconds, 0.939 MB/s
-AES enc 25 kB took 0.002 seconds, 12.207 MB/s
-AES dec 25 kB took 0.002 seconds, 12.207 MB/s
-AES-GCM 25 kB took 0.002 seconds, 12.207 MB/s
-AES-CTR 25 kB took 0.002 seconds, 12.207 MB/s
-AES-CCM 25 kB took 0.004 seconds, 6.104 MB/s
+RNG 25 kB took 0.035 seconds, 0.698 MB/s
+AES enc 25 kB took 0.038 seconds, 0.642 MB/s
+AES dec 25 kB took 0.036 seconds, 0.678 MB/s
+AES-GCM 25 kB took 0.485 seconds, 0.050 MB/s
+AES-CTR 25 kB took 0.038 seconds, 0.642 MB/s
+AES-CCM 25 kB took 0.077 seconds, 0.317 MB/s
CHACHA 25 kB took 0.009 seconds, 2.713 MB/s
CHA-POLY 25 kB took 0.013 seconds, 1.878 MB/s
POLY1305 25 kB took 0.003 seconds, 8.138 MB/s
SHA 25 kB took 0.006 seconds, 4.069 MB/s
-SHA-256 25 kB took 0.008 seconds, 3.052 MB/s
-SHA-384 25 kB took 0.033 seconds, 0.740 MB/s
+SHA-256 25 kB took 0.014 seconds, 1.744 MB/s
+SHA-384 25 kB took 0.032 seconds, 0.763 MB/s
SHA-512 25 kB took 0.034 seconds, 0.718 MB/s
-RSA 2048 public 11.000 milliseconds, avg over 1 iterations
-RSA 2048 private 135.000 milliseconds, avg over 1 iterations
+RSA 1024 encryption took 18.000 milliseconds, avg over 1 iterations
+RSA 1024 decryption took 123.000 milliseconds, avg over 1 iterations
+RSA 2048 encryption took 63.000 milliseconds, avg over 1 iterations
+RSA 2048 decryption took 1011.000 milliseconds, avg over 1 iterations
-ECC 256 key generation 17.400 milliseconds, avg over 5 iterations
-EC-DHE key agreement 15.000 milliseconds, avg over 5 iterations
-EC-DSA sign time 20.400 milliseconds, avg over 5 iterations
-EC-DSA verify time 33.200 milliseconds, avg over 5 iterations
+ECC 256 key generation 180.800 milliseconds, avg over 5 iterations
+EC-DHE key agreement 178.600 milliseconds, avg over 5 iterations
+EC-DSA sign time 184.600 milliseconds, avg over 5 iterations
+EC-DSA verify time 130.200 milliseconds, avg over 5 iterations
-CURVE25519 256 key generation 14.600 milliseconds, avg over 5 iterations
-CURVE25519 key agreement 14.400 milliseconds, avg over 5 iterations
+CURVE25519 256 key generation 41.800 milliseconds, avg over 5 iterations
+CURVE25519 key agreement 41.600 milliseconds, avg over 5 iterations
-ED25519 key generation 15.000 milliseconds, avg over 5 iterations
-ED25519 sign time 16.800 milliseconds, avg over 5 iterations
-ED25519 verify time 30.400 milliseconds, avg over 5 iterations
+ED25519 key generation 14.800 milliseconds, avg over 5 iterations
+ED25519 sign time 16.600 milliseconds, avg over 5 iterations
+ED25519 verify time 48.000 milliseconds, avg over 5 iterations
Benchmark Test 0: Return code 0
*/
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
index c88a3c069..c911785e8 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/user_settings.h
@@ -206,9 +206,9 @@ extern "C" {
/* HW Crypto Acceleration */
/* ------------------------------------------------------------------------- */
#if 1
+#define FSL_HW_CRYPTO_MANUAL_SELECTION
/* NXP MMCAU / LTC Support (See README.md for instructions) */
#if defined(USE_NXP_MMCAU) || defined(USE_NXP_LTC)
- #define FSL_HW_CRYPTO_MANUAL_SELECTION
#ifdef USE_NXP_MMCAU
#define FREESCALE_USE_MMCAU
#endif
diff --git a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
index c66890231..ca6a3a5c5 100644
--- a/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
+++ b/IDE/ROWLEY-CROSSWORKS-ARM/wolfssl_ltc.hzp
@@ -4,7 +4,7 @@
@@ -322,7 +322,7 @@
arm_simulator_memory_simulation_parameter="MK82FN256xxx15;0x40000;0x0;0x0;0x40000;4"
arm_target_loader_applicable_loaders="Flash"
arm_target_loader_default_loader="Flash"
- c_preprocessor_definitions="WOLFSSL_ROWLEY_ARM;WOLFSSL_USER_SETTINGS;USE_NXP_LTC;USE_NXP_MMCAU"
+ c_preprocessor_definitions="WOLFSSL_ROWLEY_ARM;WOLFSSL_USER_SETTINGS"
c_user_include_directories=".;./drivers;./mmcau_2.0.0;./CMSIS/Include;../;../../;$(TargetsDir);$(TargetsDir)/Kinetis;$(TargetsDir)/Kinetis/CMSIS;$(TargetsDir)/Kinetis/CMSIS/include;$(TargetsDir)/CMSIS_3/CMSIS/include"
debug_register_definition_file="$(TargetsDir)/Kinetis/MK82F25615_Peripherals.xml"
linker_memory_map_file="$(TargetsDir)/Kinetis/MK82FN256xxx15_MemoryMap.xml"
@@ -377,7 +377,7 @@
arm_simulator_memory_simulation_parameter="MK82FN256xxx15;0x40000;0x0;0x0;0x40000;4"
arm_target_loader_applicable_loaders="Flash"
arm_target_loader_default_loader="Flash"
- c_preprocessor_definitions="WOLFSSL_ROWLEY_ARM;WOLFSSL_USER_SETTINGS;USE_NXP_LTC;USE_NXP_MMCAU"
+ c_preprocessor_definitions="WOLFSSL_ROWLEY_ARM;WOLFSSL_USER_SETTINGS"
c_user_include_directories=".;./drivers;./mmcau_2.0.0;./CMSIS/Include;../;../../;$(TargetsDir);$(TargetsDir)/Kinetis;$(TargetsDir)/Kinetis/CMSIS;$(TargetsDir)/Kinetis/CMSIS/include;$(TargetsDir)/CMSIS_3/CMSIS/include"
debug_register_definition_file="$(TargetsDir)/Kinetis/MK82F25615_Peripherals.xml"
linker_memory_map_file="$(TargetsDir)/Kinetis/MK82FN256xxx15_MemoryMap.xml"
@@ -453,7 +453,7 @@
Name="Debug"
c_preprocessor_definitions="DEBUG"
gcc_debugging_level="Level 3"
- gcc_optimization_level="Debug"
+ gcc_optimization_level="None"
hidden="Yes" />