Skip to content

Commit 8d77090

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #6650 from DimitriPapadopoulos/spaces
Fix tab/space inconsistencies
2 parents 3e5e16f + 4ff99a6 commit 8d77090

10 files changed

Lines changed: 40 additions & 44 deletions

File tree

‎IDE/HEXAGON/ecc-verify-benchmark.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static int hash_firmware_verify_dsp(int numThreads, int domain)
133133
ret = wolfSSL_open(sp_URI_value, &(handle[i]));
134134
if (ret != 0) {
135135
printf("unable to open CDSP? retVal = %d\n", ret);
136-
return -1;
136+
return -1;
137137
}
138138
wc_ecc_set_handle(&(eccKey[i]), handle[i]);
139139
}

‎IDE/MDK-ARM/LPC43xx/time-LCP43xx.c‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
static void init_RTC()
3636
{
37-
/* Enable GPIO register interface clock */
38-
LPC_CCU1->CLK_M4_GPIO_CFG |= 1;
39-
while (!(LPC_CCU1->CLK_M4_GPIO_STAT & 1)) ;
37+
/* Enable GPIO register interface clock */
38+
LPC_CCU1->CLK_M4_GPIO_CFG |= 1;
39+
while (!(LPC_CCU1->CLK_M4_GPIO_STAT & 1)) ;
4040

4141
/* RTC Block section ------------------------------------------------------ */
4242
/* Init RTC module */
@@ -82,7 +82,7 @@ double current_time()
8282

8383

8484
void init_time(void) {
85-
init_RTC() ;
85+
init_RTC() ;
8686
init_TIM() ;
8787
}
8888

@@ -93,7 +93,7 @@ struct tm *Cyassl_MDK_gmtime(const time_t *c)
9393
static struct tm date ;
9494

9595
RTC_TIME_Type RTCFullTime;
96-
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
96+
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
9797

9898
date.tm_year = RTCFullTime.YEAR + 100 ;
9999
date.tm_mon = RTCFullTime.MONTH - 1 ;
@@ -104,7 +104,7 @@ struct tm *Cyassl_MDK_gmtime(const time_t *c)
104104

105105
#if defined(DEBUG_CYASSL)
106106
{
107-
extern void CYASSL_MSG(char *msg) ;
107+
extern void CYASSL_MSG(char *msg) ;
108108
char msg[100] ;
109109
sprintf(msg, "Debug::Cyassl_KEIL_gmtime(DATE=/%4d/%02d/%02d TIME=%02d:%02d:%02d)\n",
110110
RTCFullTime.YEAR+2000, RTCFullTime.MONTH, RTCFullTime.DOM,
@@ -127,14 +127,14 @@ typedef struct func_args {
127127
void time_main(void *args)
128128
{
129129
char * datetime ;
130-
int year ;
130+
int year ;
131131
RTC_TIME_Type RTCFullTime;
132132

133133
if( args == NULL || ((func_args *)args)->argc == 1) {
134-
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
134+
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
135135
printf("Date: %d/%d/%d, Time: %02d:%02d:%02d\n",
136-
RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000,
137-
RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ;
136+
RTCFullTime.MONTH, RTCFullTime.DOM, RTCFullTime.YEAR+2000,
137+
RTCFullTime.HOUR, RTCFullTime.MIN, RTCFullTime.SEC) ;
138138
} else if(((func_args *)args)->argc == 3 &&
139139
((func_args *)args)->argv[1][0] == '-' &&
140140
((func_args *)args)->argv[1][1] == 'd' ) {
@@ -143,13 +143,13 @@ void time_main(void *args)
143143
sscanf(datetime, "%d/%d/%d",
144144
(int *)&RTCFullTime.MONTH, (int *)&RTCFullTime.DOM, &year) ;
145145
RTCFullTime.YEAR = year - 2000 ;
146-
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MONTH, RTCFullTime.MONTH);
146+
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_MONTH, RTCFullTime.MONTH);
147147
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_YEAR, RTCFullTime.YEAR);
148148
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_DAYOFMONTH, RTCFullTime.DOM);
149149
} else if(((func_args *)args)->argc == 3 &&
150150
((func_args *)args)->argv[1][0] == '-' &&
151151
((func_args *)args)->argv[1][1] == 't' ) {
152-
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
152+
RTC_GetFullTime (LPC_RTC, &RTCFullTime);
153153
datetime = ((func_args *)args)->argv[2];
154154
sscanf(datetime, "%d:%d:%d",
155155
(int *)&RTCFullTime.HOUR,
@@ -161,7 +161,3 @@ void time_main(void *args)
161161
RTC_SetTime (LPC_RTC, RTC_TIMETYPE_HOUR, RTCFullTime.HOUR);
162162
} else printf("Invalid argument\n") ;
163163
}
164-
165-
166-
167-

‎IDE/MDK5-ARM/Projects/wolfSSL-Full/main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ int main()
9090
{
9191
void *arg = NULL;
9292

93-
SystemClock_Config();
94-
#if !defined(NO_FILESYSTEM)
93+
SystemClock_Config();
94+
#if !defined(NO_FILESYSTEM)
9595
init_filesystem ();
96-
#endif
96+
#endif
9797

9898
netInitialize();
9999
osDelay(300);

‎IDE/MDK5-ARM/Projects/wolfSSL-Full/shell.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ static wolfSSL_Mutex command_mutex ;
531531
#endif
532532

533533
void exit_command(void) {
534-
printf("Command Aborted\n") ;
534+
printf("Command Aborted\n") ;
535535
#ifdef WOLFSSL_CMSIS_RTOS
536536
osThreadTerminate(osThreadGetId()) ;
537537
#else
@@ -617,7 +617,7 @@ void shell_main(void *arg) {
617617
func_args args ;
618618
int bf_flg ;
619619
#if defined(WOLFSSL_CMSIS_RTOS)
620-
osThreadId cmd ;
620+
osThreadId cmd ;
621621
#endif
622622
i = BackGround ;
623623
/* Dummy for avoiding warning: BackGround is defined but not used. */
@@ -641,14 +641,14 @@ void shell_main(void *arg) {
641641
os_tsk_pass ();
642642
#else
643643
#if defined(WOLFSSL_CMSIS_RTOS)
644-
wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ;
645-
cmd = osThreadCreate (osThread (command_invoke) , &args);
646-
if(cmd == NULL) {
647-
printf("Cannon create command thread\n") ;
648-
}
649-
osThreadYield ();
644+
wc_UnLockMutex((wolfSSL_Mutex *)&command_mutex) ;
645+
cmd = osThreadCreate (osThread (command_invoke) , &args);
646+
if(cmd == NULL) {
647+
printf("Cannon create command thread\n") ;
648+
}
649+
osThreadYield ();
650650
#else
651-
command_invoke(&args) ;
651+
command_invoke(&args) ;
652652
#endif
653653
#endif
654654
#ifdef HAVE_KEIL_RTX

‎IDE/ROWLEY-CROSSWORKS-ARM/arm_startup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void memcpy32(uint32_t* src, uint32_t* dst_beg, uint32_t* dst_end)
5151
void meminit32(uint32_t* start, uint32_t* end)
5252
{
5353
while (start < end) {
54-
*start++ = 0;
54+
*start++ = 0;
5555
}
5656
}
5757

‎mqx/util_lib/Sources/util.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ int sdcard_open(MQX_FILE_PTR *com_handle, MQX_FILE_PTR *sdcard_handle,
134134
}
135135

136136
int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle,
137-
MQX_FILE_PTR *filesystem_handle,
138-
char *partman_name, char *filesystem_name)
137+
MQX_FILE_PTR *filesystem_handle,
138+
char *partman_name, char *filesystem_name)
139139
{
140140
_mqx_int error_code;
141141

‎mqx/util_lib/Sources/util.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define UTIL_H_
55

66
int sdcard_open(MQX_FILE_PTR *com_handle, MQX_FILE_PTR *sdcard_handle,
7-
MQX_FILE_PTR *partman_handle, MQX_FILE_PTR *filesystem_handle,
8-
char *partman_name, char *filesystem_name);
7+
MQX_FILE_PTR *partman_handle, MQX_FILE_PTR *filesystem_handle,
8+
char *partman_name, char *filesystem_name);
99

1010
int sdcard_close(MQX_FILE_PTR *sdcard_handle, MQX_FILE_PTR *partman_handle,
11-
MQX_FILE_PTR *filesystem_handle,
12-
char *partman_name, char *filesystem_name);
11+
MQX_FILE_PTR *filesystem_handle,
12+
char *partman_name, char *filesystem_name);
1313

1414
#endif /* UTIL_H_ */

‎wolfcrypt/src/port/Renesas/renesas_common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ void wc_CryptoCb_CleanupRenesasCmn(int* id)
543543

544544
#endif /* WOLF_CRYPTO_CB */
545545
#endif /* WOLFSSL_RENESAS_SCEPROTECT || WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY
546-
/* WOLFSSL_RENESAS_TSIP_TLS*/
546+
/* WOLFSSL_RENESAS_TSIP_TLS*/
547547

548548
#if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_TSIP_TLS)
549549

‎wolfcrypt/src/port/kcapi/kcapi_hash.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static int KcapiHashUpdate(wolfssl_KCAPI_Hash* hash, const byte* in, word32 sz)
113113
hash->heap, DYNAMIC_TYPE_TMP_BUFFER);
114114
if (pt == NULL) {
115115
ret = MEMORY_E;
116-
}
116+
}
117117
else {
118118
hash->msg = pt;
119119
}

‎wolfcrypt/src/sp_dsp32.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4464,10 +4464,10 @@ int wolfSSL_DSP_ECC_Verify_256(remote_handle64 h, int32 *u1, int hashLen, int32*
44644464
u2 = u2d;
44654465
tmp = tmpd;
44664466

4467-
XMEMCPY(u2, r, 40);
4468-
XMEMCPY(p2->x, x, 40);
4469-
XMEMCPY(p2->y, y, 40);
4470-
XMEMCPY(p2->z, z, 40);
4467+
XMEMCPY(u2, r, 40);
4468+
XMEMCPY(p2->x, x, 40);
4469+
XMEMCPY(p2->y, y, 40);
4470+
XMEMCPY(p2->z, z, 40);
44714471

44724472
sp_256_mul_10(s, s, p256_norm_order);
44734473
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*
44924492

44934493
/* (r + n*order).z'.z' mod prime == (u1.G + u2.Q)->x' */
44944494
/* Reload r and convert to Montgomery form. */
4495-
XMEMCPY(u2, r, 40);
4495+
XMEMCPY(u2, r, 40);
44964496
err = sp_256_mod_mul_norm_10(u2, u2, p256_mod);
44974497
}
44984498

@@ -4503,7 +4503,7 @@ int wolfSSL_DSP_ECC_Verify_256(remote_handle64 h, int32 *u1, int hashLen, int32*
45034503
*res = (int)(sp_256_cmp_10(p1->x, u1) == 0);
45044504
if (*res == 0) {
45054505
/* Reload r and add order. */
4506-
XMEMCPY(u2, r, 40);
4506+
XMEMCPY(u2, r, 40);
45074507
carry = sp_256_add_10(u2, u2, p256_order);
45084508
/* Carry means result is greater than mod and is not valid. */
45094509
if (carry == 0) {

0 commit comments

Comments
 (0)