diff --git a/IDE/MDK5-ARM/Conf/user_settings.h b/IDE/MDK5-ARM/Conf/user_settings.h index 37b42134f..baa49f147 100644 --- a/IDE/MDK5-ARM/Conf/user_settings.h +++ b/IDE/MDK5-ARM/Conf/user_settings.h @@ -20,9 +20,9 @@ #define WOLFSSL_SHA384 #define HAVE_ECC #define HAVE_CURVE25519 -#define CURVE25519_SMALL +/* #define CURVE25519_SMALL */ #define HAVE_ED25519 -#define ED25519_SMALL +/* #define ED25519_SMALL */ #define NO_ERROR_STRINGS #define NO_BIG_INT @@ -69,6 +69,7 @@ unsigned int HAL_GetTick(void); #define HAVE_TM_TYPE #define WOLFSSL_USER_CURRTIME /* for benchmark */ +#define WOLFSSL_CURRTIME_OSTICK /* use OS tich for current_time */ #define USE_FAST_MATH #define TFM_TIMING_RESISTANT diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx index cf8773119..3868b57e2 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvoptx @@ -8,7 +8,7 @@ *.c *.s*; *.src; *.a* - *.obj + *.obj; *.o *.lib *.txt; *.h; *.inc *.plm @@ -22,16 +22,16 @@ - CryptBenchmark + wolfSSL-Benchmark 0x4 ARM-ADS - 12000000 + 25000000 1 1 - 0 - 1 + 1 + 0 0 @@ -45,7 +45,7 @@ 79 66 8 - .\Object\ + .\Output\ 1 @@ -78,23 +78,6 @@ 1 18 - - - 0 - Schematics (MCBSTM32F200) - C:\Keil_v5\ARM\PACK\Keil\STM32F2xx_DFP\2.2.0\MDK/Boards/Keil/MCBSTM32F200/Documentation/mcbstm32f200-schematics.pdf - - - 1 - User Manual (MCBSTM32F200) - C:\Keil_v5\ARM\PACK\Keil\STM32F2xx_DFP\2.2.0\MDK/Boards/Keil/MCBSTM32F200/Documentation/mcbstm32f200.chm - - - 2 - MCBSTM32F200 Evaluation Board Web Page (MCBSTM32F200) - http://www.keil.com/mcbstm32f200/ - - 0 1 @@ -117,7 +100,8 @@ 1 0 0 - 1 + 1 + 5 @@ -127,10 +111,15 @@ - .\STM32_SWO.ini - BIN\UL2CM3.DLL + + STLink\ST-LINKIII-KEIL_SWO.dll + + 0 + ST-LINKIII-KEIL_SWO + -U303030303030303030303031 -O8399 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO27 -TC216000000 -TP21 -TDS806B -TDT0 -TDC1F -TIEFFFFFFFF -TIP1 -FO15 -FD20010000 -FC1000 -FN1 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F756NGHx$CMSIS\Flash\STM32F7x_1024.FLM) + 0 ARMRTXEVENTFLAGS @@ -139,18 +128,13 @@ 0 DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(6017=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(6016=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) 0 ARMDBGFLAGS - - 0 - ULP2CM3 - -UP1135060 -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC120000000 -TP18 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIE1 -TIP1 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F2xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F207IG$CMSIS/Flash/STM32F2xx_1024.FLM) - 0 DLGUARM @@ -159,32 +143,45 @@ 0 UL2CM3 - -UM1020ADE -O206 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO19 -TC120000000 -TP21 -TDS801F -TDT0 -TDC1F -TIE1 -TIP1 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F2xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F207IGHx$CMSIS/Flash/STM32F2xx_1024.FLM) + -UV0998FBE -O207 -S10 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC216000000 -TP21 -TDS80B8 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20010000 -FC1000 -FN1 -FF0STM32F7x_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F756NGHx$CMSIS\Flash\STM32F7x_1024.FLM) - - - + + + 0 + 0 + 137 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + C:\wolfSSL\Support\MDK-Pack\wolfssl\IDE\MDK5-ARM\Projects\CryptTest\main.c + + +
+
+ + + 0 1 - 8 - 0x20000408 - 0 -
-
- - - 2 - 8 - 0x8004dc8 - 0 - - + eth_pins + + + + C:\Keil_v5\ARM\PACK\Keil\MDK-Middleware\7.4.1\FileSystem\FileSystem.scvd + Keil.MDK-Middleware.7.4.1 + 1 + 0 0 - 0 + 1 1 0 0 @@ -203,50 +200,29 @@ 0 0 1 - 1 + 0 0 0 0 + 0 + 0 + 0 + + + + + + 1 + 0 + 2 + 2000000 +
- - Source - 1 - 0 - 0 - 0 - - 1 - 1 - 1 - 0 - 0 - 0 - 0 - .\main.c - main.c - 0 - 0 - - - 1 - 2 - 1 - 0 - 0 - 0 - 0 - .\time-CortexM3-4.c - time-CortexM3-4.c - 0 - 0 - - - Configuration 1 @@ -254,11 +230,10 @@ 0 0 - 2 - 3 + 1 + 1 5 0 - 0 0 0 .\RTE\wolfSSL\config-Crypt.h @@ -267,11 +242,10 @@ 0 - 2 - 4 + 1 + 2 5 0 - 0 0 0 .\RTE\wolfSSL\user_settings.h @@ -288,11 +262,10 @@ 0 0 - 3 - 5 + 2 + 3 5 0 - 0 0 0 .\Abstract.txt @@ -302,6 +275,46 @@ + + Source + 1 + 0 + 0 + 0 + + 3 + 4 + 1 + 0 + 0 + 0 + ..\..\wolfssl\IDE\MDK5-ARM\Projects\CryptBenchmark\main.c + main.c + 0 + 0 + + + 3 + 5 + 1 + 0 + 0 + 0 + .\time-CortexM3-4.c + time-CortexM3-4.c + 0 + 0 + + + + + ::Board Support + 1 + 0 + 0 + 1 + + ::CMSIS 1 diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx index d04bf9176..3c126060a 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/CryptBenchmark.uvprojx @@ -7,21 +7,22 @@ - CryptBenchmark + wolfSSL-Benchmark 0x4 ARM-ADS + 5060422::V5.06 update 4 (build 422)::ARMCC - STM32F207IGHx + STM32F756NGHx STMicroelectronics - Keil.STM32F2xx_DFP.2.2.0 + Keil.STM32F7xx_DFP.2.9.0 http://www.keil.com/pack - IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE + IROM(0x08000000,0x100000) IROM2(0x00200000,0x100000) IRAM(0x20010000,0x40000) IRAM2(0x20000000,0x10000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ELITTLE - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F2xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F207IGHx$CMSIS/Flash/STM32F2xx_1024.FLM)) + UL2CM3(-S0 -C0 -P0 -FD20010000 -FC1000 -FN1 -FF0STM32F7x_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F756NGHx$CMSIS\Flash\STM32F7x_1024.FLM)) 0 - $$Device:STM32F207IGHx$Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h + $$Device:STM32F756NGHx$Drivers\CMSIS\Device\ST\STM32F7xx\Include\stm32f7xx.h @@ -31,7 +32,7 @@ - $$Device:STM32F207IGHx$CMSIS\SVD\STM32F20x.svd + $$Device:STM32F756NGHx$CMSIS\SVD\STM32F7x.svd 0 0 @@ -46,14 +47,14 @@ 0 1 - .\Object\ - CryptBenchmark + .\Output\ + wolfCryptTest 1 0 0 1 1 - .\Object\ + .\Output\ 1 0 0 @@ -84,6 +85,8 @@ 0 0 + 0 + 0 0 @@ -108,11 +111,11 @@ SARMCM3.DLL -REMAP -MPU DCM.DLL - -pCM3 + -pCM7 SARMCM3.DLL -MPU TCM.DLL - -pCM3 + -pCM7 @@ -122,47 +125,6 @@ 0 16 - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - 0 - 1 - - - - - - - - - - - - - .\STM32_SWO.ini - BIN\UL2CM3.DLL - @@ -171,11 +133,11 @@ 0 1 1 - 4100 + 4096 1 BIN\UL2CM3.DLL - + "" () @@ -211,7 +173,7 @@ 1 0 0 - "Cortex-M3" + "Cortex-M7" 1 0 @@ -220,13 +182,14 @@ 1 0 0 - 0 - 0 - 0 + 2 + 1 + 1 8 0 0 0 + 0 3 3 0 @@ -279,8 +242,8 @@ 0 - 0x20000000 - 0x20000 + 0x20010000 + 0x40000 1 @@ -314,8 +277,8 @@ 1 - 0x0 - 0x0 + 0x200000 + 0x100000 0 @@ -334,13 +297,13 @@ 0 - 0x20000000 - 0x20000 + 0x20010000 + 0x40000 0 - 0x0 - 0x0 + 0x20000000 + 0x10000 @@ -361,9 +324,16 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 - HAVE_CONFIG_H MDK_CONF_Benchmark WOLFSSL_USER_SETTINGS + USE_STM32756G_EVAL USE_IOEXPANDER WOLFSSL_USER_SETTINGS @@ -378,6 +348,7 @@ 0 0 0 + 0 @@ -386,16 +357,16 @@ - 1 + 0 0 0 0 1 0 - 0x08000000 - 0x20000000 + + - + .\CryptBenchmark.sct @@ -405,33 +376,18 @@ - - Source - - - main.c - 1 - .\main.c - - - time-CortexM3-4.c - 1 - .\time-CortexM3-4.c - - - Configuration config-Crypt.h 5 - .\RTE\wolfssl\config-Crypt.h + .\RTE\wolfSSL\config-Crypt.h user_settings.h 5 - .\RTE\wolfssl\user_settings.h + .\RTE\wolfSSL\user_settings.h @@ -445,6 +401,24 @@ + + Source + + + main.c + 1 + ..\..\wolfssl\IDE\MDK5-ARM\Projects\CryptBenchmark\main.c + + + time-CortexM3-4.c + 1 + .\time-CortexM3-4.c + + + + + ::Board Support + ::CMSIS @@ -468,351 +442,353 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - + + - + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + RTE\CMSIS\RTX_Conf_CM.c - - + + - + - - RTE\Device\STM32F207IGHx\RTE_Device.h - - + + RTE\Device\STM32F756NGHx\RTE_Device.h + + - + - - RTE\Device\STM32F207IGHx\startup_stm32f207xx.s - - + + RTE\Device\STM32F756NGHx\startup_stm32f756xx.s + + - + - - RTE\Device\STM32F207IGHx\stm32f2xx_hal_conf.h - - + + RTE\Device\STM32F756NGHx\stm32f7xx_hal_conf.h + + - + - - RTE\Device\STM32F207IGHx\system_stm32f2xx.c - - + + RTE\Device\STM32F756NGHx\system_stm32f7xx.c + + - + - - RTE\Device\STM32F207IG\RTE_Device.h - - - - - - RTE\Device\STM32F207IG\startup_stm32f207xx.s - - - - - - RTE\Device\STM32F207IG\startup_stm32f2xx.s - - - - - - RTE\Device\STM32F207IG\stm32f2xx_hal_conf.h - - - - - - RTE\Device\STM32F207IG\system_stm32f2xx.c - - - - - + RTE\File_System\FS_Config.c - - + + - + - + RTE\File_System\FS_Config_MC_0.h - - + + - + - + + RTE\File_System\FS_Config_NOR_0.h + + + + + + + RTE\Network\Net_Config.c - - + + - + RTE\Network\Net_Config_BSD.h - - + + - - RTE\Network\Net_Config_DNS_Client.h - - - - - + RTE\Network\Net_Config_ETH_0.h - - + + - + RTE\Network\Net_Config_TCP.h - - + + - + RTE\Network\Net_Config_UDP.h - - - - - - RTE\Network\Net_Debug.c - - - - - - RTE\Other\config-Crypt.h - - - - - - RTE\Other\config-FS.h - - - - - - RTE\Other\config-RTX-TCP-FS.h - - - - - - RTE\Other\config.h - - + + - RTE\wolfssl\config-Crypt.h - - + RTE\wolfSSL\config-Crypt.h + + - + - - RTE\wolfssl\config.h - - - - - - RTE\wolfssl\settings.h - - + + RTE\wolfSSL\config-wolfSSL.h + + - RTE\wolfssl\user_settings.h - - + RTE\wolfSSL\user_settings.h + + - + diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c b/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c index 0ce49c0b6..ef98aab01 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/main.c @@ -27,10 +27,6 @@ #include "wolfcrypt/test/test.h" -#include -#include "stm32f2xx_hal.h" -#include "cmsis_os.h" - /*----------------------------------------------------------------------------- * System Clock Configuration *----------------------------------------------------------------------------*/ @@ -77,7 +73,6 @@ int main() #if !defined(NO_FILESYSTEM) init_filesystem (); #endif - osDelay(300) ; printf("=== Start: Crypt Benchmark ===\n") ; benchmark_test(arg) ; diff --git a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c index 115a4f672..5408a1d7b 100644 --- a/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c +++ b/IDE/MDK5-ARM/Projects/CryptBenchmark/time-CortexM3-4.c @@ -1,4 +1,4 @@ -/* time-STM32F2.c +/* time-CortexM3-4.c * * Copyright (C) 2006-2017 wolfSSL Inc. * @@ -24,6 +24,23 @@ #include #endif +#include + +#ifdef WOLFSSL_CURRTIME_OSTICK +#include +extern uint32_t os_time; + +uint32_t HAL_GetTick(void) { + return os_time; +} + +double current_time(int reset) +{ + if(reset) os_time = 0 ; + return (double)os_time /1000.0; +} + +#else #include #define DWT ((DWT_Type *) (0xE0001000UL) ) @@ -40,3 +57,4 @@ double current_time(int reset) if(reset) DWT->CYCCNT = 0 ; return ((double)DWT->CYCCNT/SystemCoreClock) ; } +#endif