Correct typos and code alignment

k-stachowiak · k-stachowiak · commit 6370a3500d5f · 2018-02-28T17:03:47.000+01:00
diff --git a/features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h b/features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h
@@ -153,9 +153,8 @@ MBEDTLS_DEPRECATED void mbedtls_sha512_finish( mbedtls_sha512_context *ctx,
  * \param ctx      The SHA-512 context.
  * \param data     The buffer holding one block of data.
  */
-MBEDTLS_DEPRECATED void mbedtls_sha512_process(
-                                            mbedtls_sha512_context *ctx,
-                                            const unsigned char data[128] );
+MBEDTLS_DEPRECATED void mbedtls_sha512_process( mbedtls_sha512_context *ctx,
+                                                const unsigned char data[128] );
 
 #undef MBEDTLS_DEPRECATED
 #endif /* !MBEDTLS_DEPRECATED_REMOVED */
diff --git a/features/mbedtls/targets/TARGET_STM/md5_alt.c b/features/mbedtls/targets/TARGET_STM/md5_alt.c
@@ -105,7 +105,7 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     if (st_md5_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
 
@@ -115,14 +115,14 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )
 int mbedtls_internal_md5_process( mbedtls_md5_context *ctx, const unsigned char data[ST_MD5_BLOCK_SIZE] )
 {
     if (st_md5_restore_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     if (HAL_HASH_MD5_Accumulate(&ctx->hhash_md5, (uint8_t *)data, ST_MD5_BLOCK_SIZE) != 0) {
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     if (st_md5_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     return 0;
@@ -135,7 +135,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context *ctx, const unsigned char *input
     /* If ilen = 0 : do nothing */
     if (currentlen != 0) {
         if (st_md5_restore_hw_context(ctx) != 1) {
-            // Return HASH_BUSY timout error here
+            // Return HASH_BUSY timeout error here
             return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
         }
 
@@ -167,7 +167,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context *ctx, const unsigned char *input
         }
 
         if (st_md5_save_hw_context(ctx) != 1) {
-            // Return HASH_BUSY timout error here
+            // Return HASH_BUSY timeout error here
             return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
         }
     }
@@ -177,7 +177,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context *ctx, const unsigned char *input
 int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx, unsigned char output[16] )
 {
     if (st_md5_restore_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     /* Last accumulation for extra bytes in sbuf_len */
@@ -194,7 +194,7 @@ int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx, unsigned char output[16] )
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     if (st_md5_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;
     }
     return 0;
diff --git a/features/mbedtls/targets/TARGET_STM/sha256_alt.c b/features/mbedtls/targets/TARGET_STM/sha256_alt.c
@@ -114,7 +114,7 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
 int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, const unsigned char data[ST_SHA256_BLOCK_SIZE] )
 {
     if (st_sha256_restore_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
     if (ctx->is224 == 0) {
@@ -128,7 +128,7 @@ int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, const unsigned
     }
 
     if (st_sha256_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
     return 0;
@@ -139,7 +139,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char
     int err;
     size_t currentlen = ilen;
     if (st_sha256_restore_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
 
@@ -187,7 +187,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char
         }
     }
     if (st_sha256_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
     return 0;
@@ -196,7 +196,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char
 int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx, unsigned char output[32] )
 {
     if (st_sha256_restore_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
     /* Last accumulation for extra bytes in sbuf_len */
@@ -225,7 +225,7 @@ int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx, unsigned char output
         }
     }
     if (st_sha256_save_hw_context(ctx) != 1) {
-        // Return HASH_BUSY timout error here
+        // Return HASH_BUSY timeout error here
         return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;
     }
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )`
`105`	`105`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`106`	`106`	`}`
`107`	`107`	`if (st_md5_save_hw_context(ctx) != 1) {`
`108`		`- // Return HASH_BUSY timout error here`
	`108`	`+ // Return HASH_BUSY timeout error here`
`109`	`109`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`110`	`110`	`}`
`111`	`111`
`@@ -115,14 +115,14 @@ int mbedtls_md5_starts_ret( mbedtls_md5_context *ctx )`
`115`	`115`	`int mbedtls_internal_md5_process( mbedtls_md5_context *ctx, const unsigned char data[ST_MD5_BLOCK_SIZE] )`
`116`	`116`	`{`
`117`	`117`	`if (st_md5_restore_hw_context(ctx) != 1) {`
`118`		`- // Return HASH_BUSY timout error here`
	`118`	`+ // Return HASH_BUSY timeout error here`
`119`	`119`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`120`	`120`	`}`
`121`	`121`	`if (HAL_HASH_MD5_Accumulate(&ctx->hhash_md5, (uint8_t *)data, ST_MD5_BLOCK_SIZE) != 0) {`
`122`	`122`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`123`	`123`	`}`
`124`	`124`	`if (st_md5_save_hw_context(ctx) != 1) {`
`125`		`- // Return HASH_BUSY timout error here`
	`125`	`+ // Return HASH_BUSY timeout error here`
`126`	`126`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`127`	`127`	`}`
`128`	`128`	`return 0;`
`@@ -135,7 +135,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context ctx, const unsigned char input`
`135`	`135`	`/* If ilen = 0 : do nothing */`
`136`	`136`	`if (currentlen != 0) {`
`137`	`137`	`if (st_md5_restore_hw_context(ctx) != 1) {`
`138`		`- // Return HASH_BUSY timout error here`
	`138`	`+ // Return HASH_BUSY timeout error here`
`139`	`139`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`140`	`140`	`}`
`141`	`141`
`@@ -167,7 +167,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context ctx, const unsigned char input`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if (st_md5_save_hw_context(ctx) != 1) {`
`170`		`- // Return HASH_BUSY timout error here`
	`170`	`+ // Return HASH_BUSY timeout error here`
`171`	`171`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -177,7 +177,7 @@ int mbedtls_md5_update_ret( mbedtls_md5_context ctx, const unsigned char input`
`177`	`177`	`int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx, unsigned char output[16] )`
`178`	`178`	`{`
`179`	`179`	`if (st_md5_restore_hw_context(ctx) != 1) {`
`180`		`- // Return HASH_BUSY timout error here`
	`180`	`+ // Return HASH_BUSY timeout error here`
`181`	`181`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`182`	`182`	`}`
`183`	`183`	`/* Last accumulation for extra bytes in sbuf_len */`
`@@ -194,7 +194,7 @@ int mbedtls_md5_finish_ret( mbedtls_md5_context *ctx, unsigned char output[16] )`
`194`	`194`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`195`	`195`	`}`
`196`	`196`	`if (st_md5_save_hw_context(ctx) != 1) {`
`197`		`- // Return HASH_BUSY timout error here`
	`197`	`+ // Return HASH_BUSY timeout error here`
`198`	`198`	`return MBEDTLS_ERR_MD5_HW_ACCEL_FAILED;`
`199`	`199`	`}`
`200`	`200`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )`
`114`	`114`	`int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, const unsigned char data[ST_SHA256_BLOCK_SIZE] )`
`115`	`115`	`{`
`116`	`116`	`if (st_sha256_restore_hw_context(ctx) != 1) {`
`117`		`- // Return HASH_BUSY timout error here`
	`117`	`+ // Return HASH_BUSY timeout error here`
`118`	`118`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`119`	`119`	`}`
`120`	`120`	`if (ctx->is224 == 0) {`
`@@ -128,7 +128,7 @@ int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, const unsigned`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if (st_sha256_save_hw_context(ctx) != 1) {`
`131`		`- // Return HASH_BUSY timout error here`
	`131`	`+ // Return HASH_BUSY timeout error here`
`132`	`132`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`133`	`133`	`}`
`134`	`134`	`return 0;`
`@@ -139,7 +139,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char`
`139`	`139`	`int err;`
`140`	`140`	`size_t currentlen = ilen;`
`141`	`141`	`if (st_sha256_restore_hw_context(ctx) != 1) {`
`142`		`- // Return HASH_BUSY timout error here`
	`142`	`+ // Return HASH_BUSY timeout error here`
`143`	`143`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`144`	`144`	`}`
`145`	`145`
`@@ -187,7 +187,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`if (st_sha256_save_hw_context(ctx) != 1) {`
`190`		`- // Return HASH_BUSY timout error here`
	`190`	`+ // Return HASH_BUSY timeout error here`
`191`	`191`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`192`	`192`	`}`
`193`	`193`	`return 0;`
`@@ -196,7 +196,7 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, const unsigned char`
`196`	`196`	`int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx, unsigned char output[32] )`
`197`	`197`	`{`
`198`	`198`	`if (st_sha256_restore_hw_context(ctx) != 1) {`
`199`		`- // Return HASH_BUSY timout error here`
	`199`	`+ // Return HASH_BUSY timeout error here`
`200`	`200`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`201`	`201`	`}`
`202`	`202`	`/* Last accumulation for extra bytes in sbuf_len */`
`@@ -225,7 +225,7 @@ int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx, unsigned char output`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`	`if (st_sha256_save_hw_context(ctx) != 1) {`
`228`		`- // Return HASH_BUSY timout error here`
	`228`	`+ // Return HASH_BUSY timeout error here`
`229`	`229`	`return MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED;`
`230`	`230`	`}`
`231`	`231`	`return 0;`