Style fixes

Ron Eldor · Ron Eldor · commit d370d586b2a3 · 2018-11-15T10:50:32.000+02:00
1. Change camelcase variables to Mbed OS style.
2. Remove functions declarations from the `_alt` header, since they
are now added from the module header regardless whether an alternative
implementation exists.
3. Remove the `extern "c"` declaration from the `_alt` headers.
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.c b/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.c
@@ -76,10 +76,10 @@ int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
 int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
                              unsigned char output[20] )
 {
-    CRYSError_t CrysErr = CRYS_OK;
+    CRYSError_t crys_err = CRYS_OK;
     CRYS_HASH_Result_t crys_result = {0};
-    CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
-    if( CrysErr == CRYS_OK )
+    crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
+    if( crys_err == CRYS_OK )
     {
         memcpy( output, crys_result, 20 );
         return ( 0 );
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.h b/features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.h
@@ -22,10 +22,6 @@
 #define __SHA1_ALT__
 #if defined(MBEDTLS_SHA1_ALT)
 #include "crys_hash.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 /**
  * \brief          SHA-1 context structure
@@ -36,114 +32,6 @@ typedef struct
     int                    is_cc_initiated;
 } mbedtls_sha1_context;
 
-/**
- * \brief          This function initializes a SHA-1 context.
- *
- * \param ctx      The SHA-1 context to initialize.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_init( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function clears a SHA-1 context.
- *
- * \param ctx      The SHA-1 context to clear.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_free( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function clones the state of a SHA-1 context.
- *
- * \param dst      The destination context.
- * \param src      The context to clone.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
-                         const mbedtls_sha1_context *src );
-
-/**
- * \brief          This function starts a SHA-1 checksum calculation.
- *
- * \param ctx      The context to initialize.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function feeds an input buffer into an ongoing SHA-1
- *                 checksum calculation.
- *
- * \param ctx      The SHA-1 context.
- * \param input    The buffer holding the input data.
- * \param ilen     The length of the input data.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
-                             const unsigned char *input,
-                             size_t ilen );
-
-/**
- * \brief          This function finishes the SHA-1 operation, and writes
- *                 the result to the output buffer.
- *
- * \param ctx      The SHA-1 context.
- * \param output   The SHA-1 checksum result.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
-                             unsigned char output[20] );
-
-/**
- * \brief          SHA-1 process data block (internal use only)
- *
- * \param ctx      SHA-1 context
- * \param data     The data block being processed.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
-                                   const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif //MBEDTLS_SHA1_ALT
 #endif //__SHA1_ALT__
 
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.c b/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.c
@@ -96,10 +96,10 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
 int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
                                unsigned char output[32] )
 {
-    CRYSError_t CrysErr = CRYS_OK;
+    CRYSError_t crys_err = CRYS_OK;
     CRYS_HASH_Result_t crys_result = {0};
-    CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
-    if( CrysErr == CRYS_OK )
+    crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
+    if( crys_err == CRYS_OK )
     {
         memcpy( output, crys_result, 32 );
         return ( 0 );
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.h b/features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.h
@@ -24,10 +24,6 @@
 #if defined(MBEDTLS_SHA256_ALT)
 
 #include "crys_hash.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 /**
  * \brief          SHA-256 context structure
@@ -38,85 +34,5 @@ typedef struct
     int                    is_cc_initiated;
 } mbedtls_sha256_context;
 
-
-/**
- * \brief          This function initializes a SHA-256 context.
- *
- * \param ctx      The SHA-256 context to initialize.
- */
-void mbedtls_sha256_init( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          This function clears a SHA-256 context.
- *
- * \param ctx      The SHA-256 context to clear.
- */
-void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          This function clones the state of a SHA-256 context.
- *
- * \param dst      The destination context.
- * \param src      The context to clone.
- */
-void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
-                           const mbedtls_sha256_context *src );
-
-/**
- * \brief          This function starts a SHA-224 or SHA-256 checksum
- *                 calculation.
- *
- * \param ctx      The context to initialize.
- * \param is224    Determines which function to use.
- *                 <ul><li>0: Use SHA-256.</li>
- *                 <li>1: Use SHA-224.</li></ul>
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
-
-/**
- * \brief          This function feeds an input buffer into an ongoing
- *                 SHA-256 checksum calculation.
- *
- * \param ctx      SHA-256 context
- * \param input    buffer holding the data
- * \param ilen     length of the input data
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
-                               const unsigned char *input,
-                               size_t ilen );
-
-/**
- * \brief          This function finishes the SHA-256 operation, and writes
- *                 the result to the output buffer.
- *
- * \param ctx      The SHA-256 context.
- * \param output   The SHA-224 or SHA-256 checksum result.
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
-                               unsigned char output[32] );
-
-/**
- * \brief          This function processes a single data block within
- *                 the ongoing SHA-256 computation. This function is for
- *                 internal use only.
- *
- * \param ctx      The SHA-256 context.
- * \param data     The buffer holding one block of data.
- *
- * \return         \c 0 on success.
- */
-int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
-                                     const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif // MBEDTLS_SHA256_ALT__
 #endif //__SHA256_ALT__

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,10 @@ int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,`
`76`	`76`	`int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,`
`77`	`77`	`unsigned char output[20] )`
`78`	`78`	`{`
`79`		`- CRYSError_t CrysErr = CRYS_OK;`
	`79`	`+ CRYSError_t crys_err = CRYS_OK;`
`80`	`80`	`CRYS_HASH_Result_t crys_result = {0};`
`81`		`- CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );`
`82`		`- if( CrysErr == CRYS_OK )`
	`81`	`+ crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );`
	`82`	`+ if( crys_err == CRYS_OK )`
`83`	`83`	`{`
`84`	`84`	`memcpy( output, crys_result, 20 );`
`85`	`85`	`return ( 0 );`
Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,10 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,`
`96`	`96`	`int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,`
`97`	`97`	`unsigned char output[32] )`
`98`	`98`	`{`
`99`		`- CRYSError_t CrysErr = CRYS_OK;`
	`99`	`+ CRYSError_t crys_err = CRYS_OK;`
`100`	`100`	`CRYS_HASH_Result_t crys_result = {0};`
`101`		`- CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );`
`102`		`- if( CrysErr == CRYS_OK )`
	`101`	`+ crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );`
	`102`	`+ if( crys_err == CRYS_OK )`
`103`	`103`	`{`
`104`	`104`	`memcpy( output, crys_result, 32 );`
`105`	`105`	`return ( 0 );`