wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab/space inconsistencies

Browse Source
This commit is contained in:
Dimitri Papadopoulos
2023-07-24 19:54:01 +02:00
parent 1285ae7816
commit 4ff99a6780
10 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/HEXAGON/ecc-verify-benchmark.c
View File

@ -133,7 +133,7 @@ static int hash_firmware_verify_dsp(int numThreads, int domain)
ret = wolfSSL_open(sp_URI_value, &(handle[i])); ret = wolfSSL_open(sp_URI_value, &(handle[i]));
if (ret != 0) { if (ret != 0) {
printf("unable to open CDSP? retVal = %d\n", ret); printf("unable to open CDSP? retVal = %d\n", ret);
return -1; return -1;
} }
wc_ecc_set_handle(&(eccKey[i]), handle[i]); wc_ecc_set_handle(&(eccKey[i]), handle[i]);
} }

28
IDE/MDK-ARM/LPC43xx/time-LCP43xx.c
View File

@ -34,9 +34,9 @@
static void init_RTC() static void init_RTC()
{ {
/* Enable GPIO register interface clock */ /* Enable GPIO register interface clock */
LPC_CCU1->CLK_M4_GPIO_CFG |= 1; LPC_CCU1->CLK_M4_GPIO_CFG |= 1;
while (!(LPC_CCU1->CLK_M4_GPIO_STAT & 1)) ; while (!(LPC_CCU1->CLK_M4_GPIO_STAT & 1)) ;
/* RTC Block section ------------------------------------------------------ */ /* RTC Block section ------------------------------------------------------ */
/* Init RTC module */ /* Init RTC module */
@ -82,7 +82,7 @@ double current_time()
void init_time(void) { void init_time(void) {
init_RTC() ; init_RTC() ;
init_TIM() ; init_TIM() ;
} }
@ -93,7 +93,7 @@ struct tm *Cyassl_MDK_gmtime(const time_t *c)
static struct tm date ; static struct tm date ;
RTC_TIME_Type RTCFullTime; RTC_TIME_Type RTCFullTime;
RTC_GetFullTime (LPC_RTC, &RTCFullTime); RTC_GetFullTime (LPC_RTC, &RTCFullTime);
date.tm_year = RTCFullTime.YEAR + 100 ; date.tm_year = RTCFullTime.YEAR + 100 ;
date.tm_mon = RTCFullTime.MONTH - 1 ; date.tm_mon = RTCFullTime.MONTH - 1 ;
@ -104,7 +104,7 @@ struct tm *Cyassl_MDK_gmtime(const time_t *c)
#if defined(DEBUG_CYASSL) #if defined(DEBUG_CYASSL)
{ {
extern void CYASSL_MSG(char *msg) ; extern void CYASSL_MSG(char *msg) ;
char msg[100] ; char msg[100] ;
sprintf(msg, "Debug::Cyassl_KEIL_gmtime(DATE=/%4d/%02d/%02d TIME=%02d:%02d:%02d)\n", sprintf(msg, "Debug::Cyassl_KEIL_gmtime(DATE=/%4d/%02d/%02d TIME=%02d:%02d:%02d)\n",
RTCFullTime.YEAR+2000, RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000, RTCFullTime.MONTH, RTCFullTime.DOM,
@ -127,14 +127,14 @@ typedef struct func_args {
void time_main(void *args) void time_main(void *args)
{ {
char * datetime ; char * datetime ;
int year ; int year ;
RTC_TIME_Type RTCFullTime; RTC_TIME_Type RTCFullTime;
if( args == NULL || ((func_args *)args)->argc == 1) { if( args == NULL || ((func_args *)args)->argc == 1) {
RTC_GetFullTime (LPC_RTC, &RTCFullTime); RTC_GetFullTime (LPC_RTC, &RTCFullTime);
printf("Date: %d/%d/%d, Time: %02d:%02d:%02d\n", printf("Date: %d/%d/%d, Time: %02d:%02d:%02d\n",
RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000, RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000,
RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ; RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ;
} else if(((func_args *)args)->argc == 3 && } else if(((func_args *)args)->argc == 3 &&
((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][0] == '-' &&
((func_args *)args)->argv[1][1] == 'd' ) { ((func_args *)args)->argv[1][1] == 'd' ) {
@ -143,13 +143,13 @@ void time_main(void *args)
sscanf(datetime, "%d/%d/%d", sscanf(datetime, "%d/%d/%d",
(int *)&RTCFullTime.MONTH, (int *)&RTCFullTime.DOM, &year) ; (int *)&RTCFullTime.MONTH, (int *)&RTCFullTime.DOM, &year) ;
RTCFullTime.YEAR = year - 2000 ; RTCFullTime.YEAR = year - 2000 ;
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MONTH, RTCFullTime.MONTH); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MONTH, RTCFullTime.MONTH);
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_YEAR, RTCFullTime.YEAR); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_YEAR, RTCFullTime.YEAR);
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_DAYOFMONTH, RTCFullTime.DOM); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_DAYOFMONTH, RTCFullTime.DOM);
} else if(((func_args *)args)->argc == 3 && } else if(((func_args *)args)->argc == 3 &&
((func_args *)args)->argv[1][0] == '-' && ((func_args *)args)->argv[1][0] == '-' &&
((func_args *)args)->argv[1][1] == 't' ) { ((func_args *)args)->argv[1][1] == 't' ) {
RTC_GetFullTime (LPC_RTC, &RTCFullTime); RTC_GetFullTime (LPC_RTC, &RTCFullTime);
datetime = ((func_args *)args)->argv[2]; datetime = ((func_args *)args)->argv[2];
sscanf(datetime, "%d:%d:%d", sscanf(datetime, "%d:%d:%d",
(int *)&RTCFullTime.HOUR, (int *)&RTCFullTime.HOUR,
@ -161,7 +161,3 @@ void time_main(void *args)
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_HOUR, RTCFullTime.HOUR); RTC_SetTime (LPC_RTC, RTC_TIMETYPE_HOUR, RTCFullTime.HOUR);
} else printf("Invalid argument\n") ; } else printf("Invalid argument\n") ;
} }

6
IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c
View File

@ -90,10 +90,10 @@ int main()
{ {
void *arg = NULL; void *arg = NULL;
SystemClock_Config(); SystemClock_Config();
#if !defined(NO_FILESYSTEM) #if !defined(NO_FILESYSTEM)
init_filesystem (); init_filesystem ();
#endif #endif
netInitialize(); netInitialize();
osDelay(300); osDelay(300);

18
IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c
View File

@ -531,7 +531,7 @@ static wolfSSL_Mutex command_mutex ;
#endif #endif
void exit_command(void) { void exit_command(void) {
printf("Command Aborted\n") ; printf("Command Aborted\n") ;
#ifdef WOLFSSL_CMSIS_RTOS #ifdef WOLFSSL_CMSIS_RTOS
osThreadTerminate(osThreadGetId()) ; osThreadTerminate(osThreadGetId()) ;
#else #else
@ -617,7 +617,7 @@ void shell_main(void *arg) {
func_args args ; func_args args ;
int bf_flg ; int bf_flg ;
#if defined(WOLFSSL_CMSIS_RTOS) #if defined(WOLFSSL_CMSIS_RTOS)
osThreadId cmd ; osThreadId cmd ;
#endif #endif
i = BackGround ; i = BackGround ;
/* Dummy for avoiding warning: BackGround is defined but not used. */ /* Dummy for avoiding warning: BackGround is defined but not used. */
@ -641,14 +641,14 @@ void shell_main(void *arg) {
os_tsk_pass (); os_tsk_pass ();
#else #else
#if defined(WOLFSSL_CMSIS_RTOS) #if defined(WOLFSSL_CMSIS_RTOS)
wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ; wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ;
cmd = osThreadCreate (osThread (command_invoke) , &args); cmd = osThreadCreate (osThread (command_invoke) , &args);
if(cmd == NULL) { if(cmd == NULL) {
printf("Cannon create command thread\n") ; printf("Cannon create command thread\n") ;
} }
osThreadYield (); osThreadYield ();
#else #else
command_invoke(&args) ; command_invoke(&args) ;
#endif #endif
#endif #endif
#ifdef HAVE_KEIL_RTX #ifdef HAVE_KEIL_RTX

2
IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c
View File

@ -51,7 +51,7 @@ void memcpy32(uint32_t* src, uint32_t* dst_beg, uint32_t* dst_end)
void meminit32(uint32_t* start, uint32_t* end) void meminit32(uint32_t* start, uint32_t* end)
{ {
while (start < end) { while (start < end) {
*start++ = 0; *start++ = 0;
} }
} }

4
mqx/util_lib/Sources/util.c
View File

@ -134,8 +134,8 @@ int sdcard_open(MQX_FILE_PTR *com_handle, MQX_FILE_PTR *sdcard_handle,
} }
int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle, int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle,
MQX_FILE_PTR *filesystem_handle, MQX_FILE_PTR *filesystem_handle,
char *partman_name, char *filesystem_name) char *partman_name, char *filesystem_name)
{ {
_mqx_int error_code; _mqx_int error_code;

8
mqx/util_lib/Sources/util.h
View File

@ -4,11 +4,11 @@
#define UTIL_H_ #define UTIL_H_
int sdcard_open(MQX_FILE_PTR *com_handle, MQX_FILE_PTR *sdcard_handle, int sdcard_open(MQX_FILE_PTR *com_handle, MQX_FILE_PTR *sdcard_handle,
MQX_FILE_PTR *partman_handle, MQX_FILE_PTR *filesystem_handle, MQX_FILE_PTR *partman_handle, MQX_FILE_PTR *filesystem_handle,
char *partman_name, char *filesystem_name); char *partman_name, char *filesystem_name);
int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle, int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle,
MQX_FILE_PTR *filesystem_handle, MQX_FILE_PTR *filesystem_handle,
char *partman_name, char *filesystem_name); char *partman_name, char *filesystem_name);
#endif /* UTIL_H_ */ #endif /* UTIL_H_ */

2
wolfcrypt/src/port/Renesas/renesas_common.c
View File

@ -543,7 +543,7 @@ void wc_CryptoCb_CleanupRenesasCmn(int* id)
#endif /* WOLF_CRYPTO_CB */ #endif /* WOLF_CRYPTO_CB */
#endif /* WOLFSSL_RENESAS_SCEPROTECT || WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY #endif /* WOLFSSL_RENESAS_SCEPROTECT || WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY
/* WOLFSSL_RENESAS_TSIP_TLS*/ /* WOLFSSL_RENESAS_TSIP_TLS*/
#if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_TSIP_TLS) #if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_TSIP_TLS)

2
wolfcrypt/src/port/kcapi/kcapi_hash.c
View File

@ -113,7 +113,7 @@ static int KcapiHashUpdate(wolfssl_KCAPI_Hash* hash, const byte* in, word32 sz)
hash->heap, DYNAMIC_TYPE_TMP_BUFFER); hash->heap, DYNAMIC_TYPE_TMP_BUFFER);
if (pt == NULL) { if (pt == NULL) {
ret = MEMORY_E; ret = MEMORY_E;
} }
else { else {
hash->msg = pt; hash->msg = pt;
} }

12
wolfcrypt/src/sp_dsp32.c
View File

@ -4464,10 +4464,10 @@ int wolfSSL_DSP_ECC_Verify_256(remote_handle64 h, int32 *u1, int hashLen, int32*
u2 = u2d; u2 = u2d;
tmp = tmpd; tmp = tmpd;
XMEMCPY(u2, r, 40); XMEMCPY(u2, r, 40);
XMEMCPY(p2->x, x, 40); XMEMCPY(p2->x, x, 40);
XMEMCPY(p2->y, y, 40); XMEMCPY(p2->y, y, 40);
XMEMCPY(p2->z, z, 40); XMEMCPY(p2->z, z, 40);
sp_256_mul_10(s, s, p256_norm_order); sp_256_mul_10(s, s, p256_norm_order);
err = sp_256_mod_10(s, s, p256_order); err = sp_256_mod_10(s, s, p256_order);
@ -4492,7 +4492,7 @@ int wolfSSL_DSP_ECC_Verify_256(remote_handle64 h, int32 *u1, int hashLen, int32*
/* (r + n*order).z'.z' mod prime == (u1.G + u2.Q)->x' */ /* (r + n*order).z'.z' mod prime == (u1.G + u2.Q)->x' */
/* Reload r and convert to Montgomery form. */ /* Reload r and convert to Montgomery form. */
XMEMCPY(u2, r, 40); XMEMCPY(u2, r, 40);
err = sp_256_mod_mul_norm_10(u2, u2, p256_mod); err = sp_256_mod_mul_norm_10(u2, u2, p256_mod);
} }
@ -4503,7 +4503,7 @@ int wolfSSL_DSP_ECC_Verify_256(remote_handle64 h, int32 *u1, int hashLen, int32*
*res = (int)(sp_256_cmp_10(p1->x, u1) == 0); *res = (int)(sp_256_cmp_10(p1->x, u1) == 0);
if (*res == 0) { if (*res == 0) {
/* Reload r and add order. */ /* Reload r and add order. */
XMEMCPY(u2, r, 40); XMEMCPY(u2, r, 40);
carry = sp_256_add_10(u2, u2, p256_order); carry = sp_256_add_10(u2, u2, p256_order);
/* Carry means result is greater than mod and is not valid. */ /* Carry means result is greater than mod and is not valid. */
if (carry == 0) { if (carry == 0) {