github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 23:36:51 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix violations in sha256.c for crypto lib

Browse Source 
-remove goto
-remove multiple return
-Modify assignment operator in boolean expression
-Modify/fix code style violations
-fix attempt to change parameters passed by value
-fix value need U suffix
-fix use of mixed arithmetic
-fix assigment in expression
-other fixes

Tracked-On: #861
Signed-off-by: Chen Gang G <gang.g.chen@intel.com>
Reviewed-by: Bing Zhu <bing.zhu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Chen Gang G 2018-12-27 14:03:08 +08:00 committed by wenlingz
parent 488e7b2a8c
commit c230a1a6c8
1 changed files with 187 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

378
hypervisor/lib/crypto/mbedtls/sha256.c
View File

@ -34,38 +34,36 @@
#ifndef GET_UINT32_BE #ifndef GET_UINT32_BE
#define GET_UINT32_BE(n,b,i) \ #define GET_UINT32_BE(n,b,i) \
do { \ do { \
(n) = ( (uint32_t) (b)[(i) ] << 24 ) \ (n) = ((uint32_t) (b)[(i) ] << 24) \
| ( (uint32_t) (b)[(i) + 1] << 16 ) \ | ((uint32_t) (b)[(i) + 1] << 16) \
| ( (uint32_t) (b)[(i) + 2] << 8 ) \ | ((uint32_t) (b)[(i) + 2] << 8) \
| ( (uint32_t) (b)[(i) + 3] ); \ | ((uint32_t) (b)[(i) + 3] ); \
} while( 0 ) } while(0)
#endif #endif
#ifndef PUT_UINT32_BE #ifndef PUT_UINT32_BE
#define PUT_UINT32_BE(n,b,i) \ #define PUT_UINT32_BE(n,b,i) \
do { \ do { \
(b)[(i) ] = (uint8_t) ( (n) >> 24 ); \ (b)[(i) ] = (uint8_t) ((n) >> 24); \
(b)[(i) + 1] = (uint8_t) ( (n) >> 16 ); \ (b)[(i) + 1] = (uint8_t) ((n) >> 16); \
(b)[(i) + 2] = (uint8_t) ( (n) >> 8 ); \ (b)[(i) + 2] = (uint8_t) ((n) >> 8); \
(b)[(i) + 3] = (uint8_t) ( (n) ); \ (b)[(i) + 3] = (uint8_t) ((n) ); \
} while( 0 ) } while(0)
#endif #endif
void mbedtls_sha256_init( mbedtls_sha256_context *ctx ) void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
{ {
memset( ctx, 0, sizeof( mbedtls_sha256_context ) ); memset(ctx, 0U, sizeof(mbedtls_sha256_context));
} }
void mbedtls_sha256_free( mbedtls_sha256_context *ctx ) void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
{ {
if( ctx == NULL ) if (ctx != NULL) {
return; mbedtls_platform_zeroize(ctx, sizeof(mbedtls_sha256_context));
}
mbedtls_platform_zeroize( ctx, sizeof( mbedtls_sha256_context ) );
} }
void mbedtls_sha256_clone( mbedtls_sha256_context *dst, void mbedtls_sha256_clone(mbedtls_sha256_context *dst, const mbedtls_sha256_context *src)
const mbedtls_sha256_context *src )
{ {
*dst = *src; *dst = *src;
} }
@ -73,266 +71,264 @@ void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
/* /*
* SHA-256 context setup * SHA-256 context setup
*/ */
int32_t mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int32_t is224 ) int32_t mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int32_t is224)
{ {
ctx->total[0] = 0; ctx->total[0] = 0U;
ctx->total[1] = 0; ctx->total[1] = 0U;
if( is224 == 0 ) if (is224 == 0) {
{
/* SHA-256 */ /* SHA-256 */
ctx->state[0] = 0x6A09E667; ctx->state[0] = 0x6A09E667U;
ctx->state[1] = 0xBB67AE85; ctx->state[1] = 0xBB67AE85U;
ctx->state[2] = 0x3C6EF372; ctx->state[2] = 0x3C6EF372U;
ctx->state[3] = 0xA54FF53A; ctx->state[3] = 0xA54FF53AU;
ctx->state[4] = 0x510E527F; ctx->state[4] = 0x510E527FU;
ctx->state[5] = 0x9B05688C; ctx->state[5] = 0x9B05688CU;
ctx->state[6] = 0x1F83D9AB; ctx->state[6] = 0x1F83D9ABU;
ctx->state[7] = 0x5BE0CD19; ctx->state[7] = 0x5BE0CD19U;
} } else {
else
{
/* SHA-224 */ /* SHA-224 */
ctx->state[0] = 0xC1059ED8; ctx->state[0] = 0xC1059ED8U;
ctx->state[1] = 0x367CD507; ctx->state[1] = 0x367CD507U;
ctx->state[2] = 0x3070DD17; ctx->state[2] = 0x3070DD17U;
ctx->state[3] = 0xF70E5939; ctx->state[3] = 0xF70E5939U;
ctx->state[4] = 0xFFC00B31; ctx->state[4] = 0xFFC00B31U;
ctx->state[5] = 0x68581511; ctx->state[5] = 0x68581511U;
ctx->state[6] = 0x64F98FA7; ctx->state[6] = 0x64F98FA7U;
ctx->state[7] = 0xBEFA4FA4; ctx->state[7] = 0xBEFA4FA4U;
} }
ctx->is224 = is224; ctx->is224 = is224;
return( 0 ); return(0);
} }
static const uint32_t K[] = static const uint32_t K[] =
{ {
0x428A2F98, 0x71374491, 0xB5C0FBCF, 0xE9B5DBA5, 0x428A2F98U, 0x71374491U, 0xB5C0FBCFU, 0xE9B5DBA5U,
0x3956C25B, 0x59F111F1, 0x923F82A4, 0xAB1C5ED5, 0x3956C25BU, 0x59F111F1U, 0x923F82A4U, 0xAB1C5ED5U,
0xD807AA98, 0x12835B01, 0x243185BE, 0x550C7DC3, 0xD807AA98U, 0x12835B01U, 0x243185BEU, 0x550C7DC3U,
0x72BE5D74, 0x80DEB1FE, 0x9BDC06A7, 0xC19BF174, 0x72BE5D74U, 0x80DEB1FEU, 0x9BDC06A7U, 0xC19BF174U,
0xE49B69C1, 0xEFBE4786, 0x0FC19DC6, 0x240CA1CC, 0xE49B69C1U, 0xEFBE4786U, 0x0FC19DC6U, 0x240CA1CCU,
0x2DE92C6F, 0x4A7484AA, 0x5CB0A9DC, 0x76F988DA, 0x2DE92C6FU, 0x4A7484AAU, 0x5CB0A9DCU, 0x76F988DAU,
0x983E5152, 0xA831C66D, 0xB00327C8, 0xBF597FC7, 0x983E5152U, 0xA831C66DU, 0xB00327C8U, 0xBF597FC7U,
0xC6E00BF3, 0xD5A79147, 0x06CA6351, 0x14292967, 0xC6E00BF3U, 0xD5A79147U, 0x06CA6351U, 0x14292967U,
0x27B70A85, 0x2E1B2138, 0x4D2C6DFC, 0x53380D13, 0x27B70A85U, 0x2E1B2138U, 0x4D2C6DFCU, 0x53380D13U,
0x650A7354, 0x766A0ABB, 0x81C2C92E, 0x92722C85, 0x650A7354U, 0x766A0ABBU, 0x81C2C92EU, 0x92722C85U,
0xA2BFE8A1, 0xA81A664B, 0xC24B8B70, 0xC76C51A3, 0xA2BFE8A1U, 0xA81A664BU, 0xC24B8B70U, 0xC76C51A3U,
0xD192E819, 0xD6990624, 0xF40E3585, 0x106AA070, 0xD192E819U, 0xD6990624U, 0xF40E3585U, 0x106AA070U,
0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, 0x19A4C116U, 0x1E376C08U, 0x2748774CU, 0x34B0BCB5U,
0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, 0x391C0CB3U, 0x4ED8AA4AU, 0x5B9CCA4FU, 0x682E6FF3U,
0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208, 0x748F82EEU, 0x78A5636FU, 0x84C87814U, 0x8CC70208U,
0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2, 0x90BEFFFAU, 0xA4506CEBU, 0xBEF9A3F7U, 0xC67178F2U,
}; };
#define SHR(x,n) ((x & 0xFFFFFFFF) >> n) #define SHR(x,n) (((x) & 0xFFFFFFFFU) >> (n))
#define ROTR(x,n) (SHR(x,n) | (x << (32 - n))) #define ROTR(x,n) (SHR((x),(n)) | ((x) << (32U - (n))))
#define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^ SHR(x, 3)) #define S0(x) (ROTR((x), 7U) ^ ROTR((x),18U) ^ SHR((x), 3U))
#define S1(x) (ROTR(x,17) ^ ROTR(x,19) ^ SHR(x,10)) #define S1(x) (ROTR((x),17U) ^ ROTR((x),19U) ^ SHR((x),10U))
#define S2(x) (ROTR(x, 2) ^ ROTR(x,13) ^ ROTR(x,22)) #define S2(x) (ROTR((x), 2U) ^ ROTR((x),13U) ^ ROTR((x),22U))
#define S3(x) (ROTR(x, 6) ^ ROTR(x,11) ^ ROTR(x,25)) #define S3(x) (ROTR((x), 6U) ^ ROTR((x),11U) ^ ROTR((x),25U))
#define F0(x,y,z) ((x & y) | (z & (x | y))) #define F0(x,y,z) (((x) & (y)) | ((z) & ((x) | (y))))
#define F1(x,y,z) (z ^ (x & (y ^ z))) #define F1(x,y,z) ((z) ^ ((x) & ((y) ^ (z))))
#define R(t) \ #define R(t) \
( \ ( \
W[t] = S1(W[t - 2]) + W[t - 7] + \ W[(t)] = S1(W[(t) - 2]) + W[(t) - 7] + \
S0(W[t - 15]) + W[t - 16] \ S0(W[(t) - 15]) + W[(t) - 16] \
) )
#define P(a,b,c,d,e,f,g,h,x,K) \ #define P(a,b,c,d,e,f,g,h,x,K) \
{ \ { \
temp1 = h + S3(e) + F1(e,f,g) + K + x; \ temp1 = (h) + S3(e) + F1((e),(f),(g)) + (K) + (x); \
temp2 = S2(a) + F0(a,b,c); \ temp2 = S2(a) + F0((a),(b),(c)); \
d += temp1; h = temp1 + temp2; \ (d) += temp1; (h) = temp1 + temp2; \
} }
int32_t mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx, int32_t mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx, const uint8_t data[64])
const uint8_t data[64] )
{ {
uint32_t temp1, temp2, W[64]; uint32_t temp1, temp2, W[64];
uint32_t A[8]; uint32_t A[8];
uint32_t i; int32_t i;
for( i = 0; i < 8; i++ ) for (i = 0; i < 8; i++) {
A[i] = ctx->state[i]; A[i] = ctx->state[i];
for( i = 0; i < 16; i++ )
GET_UINT32_BE( W[i], data, 4 * i );
for( i = 0; i < 16; i += 8 )
{
P( A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i+0], K[i+0] );
P( A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i+1], K[i+1] );
P( A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i+2], K[i+2] );
P( A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i+3], K[i+3] );
P( A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i+4], K[i+4] );
P( A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i+5], K[i+5] );
P( A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i+6], K[i+6] );
P( A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i+7], K[i+7] );
} }
for( i = 16; i < 64; i += 8 ) for (i = 0; i < 16; i++) {
{ GET_UINT32_BE(W[i], data, 4 * i);
P( A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], R(i+0), K[i+0] );
P( A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], R(i+1), K[i+1] );
P( A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], R(i+2), K[i+2] );
P( A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], R(i+3), K[i+3] );
P( A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], R(i+4), K[i+4] );
P( A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], R(i+5), K[i+5] );
P( A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], R(i+6), K[i+6] );
P( A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], R(i+7), K[i+7] );
} }
for( i = 0; i < 8; i++ ) for (i = 0; i < 16; i += 8) {
P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i+0], K[i+0]);
P(A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i+1], K[i+1]);
P(A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i+2], K[i+2]);
P(A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i+3], K[i+3]);
P(A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i+4], K[i+4]);
P(A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i+5], K[i+5]);
P(A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i+6], K[i+6]);
P(A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i+7], K[i+7]);
}
for (i = 16; i < 64; i += 8) {
P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], R(i+0), K[i+0]);
P(A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], R(i+1), K[i+1]);
P(A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], R(i+2), K[i+2]);
P(A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], R(i+3), K[i+3]);
P(A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], R(i+4), K[i+4]);
P(A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], R(i+5), K[i+5]);
P(A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], R(i+6), K[i+6]);
P(A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], R(i+7), K[i+7]);
}
for (i = 0; i < 8; i++) {
ctx->state[i] += A[i]; ctx->state[i] += A[i];
}
return( 0 ); return 0;
} }
/* /*
* SHA-256 process buffer * SHA-256 process buffer
*/ */
int32_t mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx, int32_t mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx, const uint8_t *input, size_t ilen)
const uint8_t *input,
size_t ilen )
{ {
int32_t ret; int32_t ret = 0;
size_t fill; size_t fill;
uint32_t left; uint32_t left;
const uint8_t *data = input;
size_t len = ilen;
if( ilen == 0 ) if ((len != 0U) && (data != NULL)) {
return( 0 ); left = ctx->total[0] & 0x3FU;
fill = 64U - left;
left = ctx->total[0] & 0x3F; ctx->total[0] += (uint32_t)len;
fill = 64 - left; ctx->total[0] &= 0xFFFFFFFFU;
ctx->total[0] += (uint32_t) ilen; if (ctx->total[0] < (uint32_t)len) {
ctx->total[0] &= 0xFFFFFFFF; ctx->total[1]++;
}
if( ctx->total[0] < (uint32_t) ilen ) if ((left != 0U) && (len >= fill)) {
ctx->total[1]++; (void)memcpy_s((void *)&ctx->buffer[left], fill, data, fill);
if( left && ilen >= fill ) ret = mbedtls_internal_sha256_process(ctx, ctx->buffer);
{ if (ret == 0) {
memcpy_s( (void *) (ctx->buffer + left), fill, input, fill ); data += fill;
len -= fill;
left = 0U;
}
}
if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 ) if (ret == 0) {
return( ret ); while (len >= 64U) {
ret = mbedtls_internal_sha256_process(ctx, data);
if (ret == 0) {
data += 64;
len -= 64U;
break;
}
}
input += fill; if (ret == 0) {
ilen -= fill; if (len > 0U) {
left = 0; (void)memcpy_s((void *)&ctx->buffer[left], len, data, len);
}
}
}
} }
while( ilen >= 64 ) return ret;
{
if( ( ret = mbedtls_internal_sha256_process( ctx, input ) ) != 0 )
return( ret );
input += 64;
ilen -= 64;
}
if( ilen > 0 )
memcpy_s( (void *) (ctx->buffer + left), ilen, input, ilen );
return( 0 );
} }
/* /*
* SHA-256 final digest * SHA-256 final digest
*/ */
int32_t mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx, int32_t mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx, uint8_t output[32])
uint8_t output[32] )
{ {
int32_t ret; int32_t ret = 0;
uint32_t used; uint32_t used;
uint32_t high, low; uint32_t high, low;
/* /*
* Add padding: 0x80 then 0x00 until 8 bytes remain for the length * Add padding: 0x80 then 0x00 until 8 bytes remain for the length
*/ */
used = ctx->total[0] & 0x3F; used = ctx->total[0] & 0x3FU;
ctx->buffer[used++] = 0x80; ctx->buffer[used] = 0x80U;
if( used <= 56 ) used ++;
{
if (used <= 56U) {
/* Enough room for padding + length in current block */ /* Enough room for padding + length in current block */
memset( ctx->buffer + used, 0, 56 - used ); (void)memset((void *)&ctx->buffer[used], 0U, 56U - used);
} } else {
else
{
/* We'll need an extra block */ /* We'll need an extra block */
memset( ctx->buffer + used, 0, 64 - used ); (void)memset((void *)&ctx->buffer[used], 0U, 64U - used);
if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 ) ret = mbedtls_internal_sha256_process(ctx, ctx->buffer);
return( ret ); if (ret == 0) {
(void)memset(ctx->buffer, 0U, 56U);
memset( ctx->buffer, 0, 56 ); }
} }
/* /*
* Add message length * Add message length
*/ */
high = ( ctx->total[0] >> 29 ) if (ret == 0) {
| ( ctx->total[1] << 3 ); high = (ctx->total[0] >> 29)
low = ( ctx->total[0] << 3 ); | (ctx->total[1] << 3);
low = (ctx->total[0] << 3);
PUT_UINT32_BE( high, ctx->buffer, 56 ); PUT_UINT32_BE(high, ctx->buffer, 56);
PUT_UINT32_BE( low, ctx->buffer, 60 ); PUT_UINT32_BE(low, ctx->buffer, 60);
if( ( ret = mbedtls_internal_sha256_process( ctx, ctx->buffer ) ) != 0 ) ret = mbedtls_internal_sha256_process(ctx, ctx->buffer);
return( ret ); if (ret == 0) {
/*
* Output final state
*/
PUT_UINT32_BE(ctx->state[0], output, 0);
PUT_UINT32_BE(ctx->state[1], output, 4);
PUT_UINT32_BE(ctx->state[2], output, 8);
PUT_UINT32_BE(ctx->state[3], output, 12);
PUT_UINT32_BE(ctx->state[4], output, 16);
PUT_UINT32_BE(ctx->state[5], output, 20);
PUT_UINT32_BE(ctx->state[6], output, 24);
/* if (ctx->is224 == 0) {
* Output final state PUT_UINT32_BE(ctx->state[7], output, 28);
*/ }
PUT_UINT32_BE( ctx->state[0], output, 0 ); }
PUT_UINT32_BE( ctx->state[1], output, 4 ); }
PUT_UINT32_BE( ctx->state[2], output, 8 );
PUT_UINT32_BE( ctx->state[3], output, 12 );
PUT_UINT32_BE( ctx->state[4], output, 16 );
PUT_UINT32_BE( ctx->state[5], output, 20 );
PUT_UINT32_BE( ctx->state[6], output, 24 );
if( ctx->is224 == 0 ) return ret;
PUT_UINT32_BE( ctx->state[7], output, 28 );
return( 0 );
} }
/* /*
* output = SHA-256( input buffer ) * output = SHA-256(input buffer)
*/ */
int32_t mbedtls_sha256_ret( const uint8_t *input, int32_t mbedtls_sha256_ret(const uint8_t *input, size_t ilen, uint8_t output[32], int32_t is224)
size_t ilen,
uint8_t output[32],
int32_t is224 )
{ {
int32_t ret; int32_t ret = 0;
mbedtls_sha256_context ctx; mbedtls_sha256_context ctx;
mbedtls_sha256_init( &ctx ); mbedtls_sha256_init(&ctx);
if( ( ret = mbedtls_sha256_starts_ret( &ctx, is224 ) ) != 0 ) ret = mbedtls_sha256_starts_ret(&ctx, is224);
goto exit; if (ret == 0) {
ret = mbedtls_sha256_update_ret(&ctx, input, ilen);
}
if( ( ret = mbedtls_sha256_update_ret( &ctx, input, ilen ) ) != 0 ) if (ret == 0) {
goto exit; ret = mbedtls_sha256_finish_ret(&ctx, output);
}
if( ( ret = mbedtls_sha256_finish_ret( &ctx, output ) ) != 0 ) mbedtls_sha256_free(&ctx);
goto exit;
exit: return ret;
mbedtls_sha256_free( &ctx );
return( ret );
} }