ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tidy up PR comments #3 

Signed-off-by: PARKJIHOON <jh6186.park@samsung.com>
pull/12372/head
PARKJIHOON 2020-01-07 00:57:58 +09:00 committed by adbridge
parent cd37b0cf8e
commit 6c3477117b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c
View File

@ -334,7 +334,7 @@ int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx,
ctx->state[i] += A[i]; ctx->state[i] += A[i];
} }
return( 0 ); return 0;
} }
@ -450,8 +450,6 @@ int mbedtls_sha256_sw_update_ret(mbedtls_sha256_context *ctx, const unsigned cha
return 0; return 0;
} }
#endif /* MBEDTLS_SHA256_ALT */ #endif /* MBEDTLS_SHA256_ALT */
#endif /* MBEDTLS_SHA256_C */ #endif /* MBEDTLS_SHA256_C */

19
features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c
View File

@ -138,7 +138,7 @@ int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384)
memset(ctx, 0, sizeof(mbedtls_sha512_context)); memset(ctx, 0, sizeof(mbedtls_sha512_context));
ctx->is384 = is384; ctx->is384 = is384;
return( 0 ); return 0;
} }
/* /*
@ -241,7 +241,18 @@ int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx, unsigned char output[
return ret; return ret;
} }
<<<<<<< cd37b0cf8e0be356705b7c17c0871c8f3acc03fa
} }
=======
//! step 3 : get hash result from SSS
ret = mb_hash_final(&stHASH_Input, &ctx->pstDigest);
if (ret != SSSR_SUCCESS) {
return ret;
}
}
>>>>>>> tidy up PR comments #3
return 0; return 0;
} }
@ -381,7 +392,7 @@ int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
ctx->state[i] += A[i]; ctx->state[i] += A[i];
} }
return( 0 ); return 0;
} }
int mbedtls_sha512_sw_finish_ret(mbedtls_sha512_context *ctx, int mbedtls_sha512_sw_finish_ret(mbedtls_sha512_context *ctx,
@ -444,7 +455,7 @@ int mbedtls_sha512_sw_finish_ret(mbedtls_sha512_context *ctx,
sha512_put_uint64_be(ctx->state[7], output, 56); sha512_put_uint64_be(ctx->state[7], output, 56);
} }
return( 0 ); return 0;
} }
int mbedtls_sha512_sw_update_ret(mbedtls_sha512_context *ctx, const unsigned char *input, size_t ilen) int mbedtls_sha512_sw_update_ret(mbedtls_sha512_context *ctx, const unsigned char *input, size_t ilen)
@ -494,7 +505,7 @@ int mbedtls_sha512_sw_update_ret(mbedtls_sha512_context *ctx, const unsigned cha
memcpy((void *)(ctx->buffer + left), input, ilen); memcpy((void *)(ctx->buffer + left), input, ilen);
} }
return( 0 ); return 0;
} }