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

[NUC472/M487] Refine code with SHA context selection in SHA alter.

pull/4925/head
ccli8 2017-11-09 15:55:42 +08:00
parent 980cb6b9c8
commit 116b14aa84
5 changed files with 80 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c
View File

@ -23,9 +23,15 @@
#include "nu_bitutil.h"
#include "string.h"
void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
/* Choose SHA S/W or H/W context and initialize it
*
* try_hw:
* 0: Initialize S/W context
* 1: Try acquiring SHA H/W resource first and initialize its H/W context if successful. If failed, initialize S/W context.
*/
static void mbedtls_sha1_init_internal(mbedtls_sha1_context *ctx, int try_hw)
{
if (crypto_sha_acquire()) {
if (try_hw && crypto_sha_acquire()) {
ctx->ishw = 1;
mbedtls_sha1_hw_init(&ctx->hw_ctx);
} else {
@ -34,6 +40,11 @@ void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
}
}
void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
{
mbedtls_sha1_init_internal(ctx, 1);
}
void mbedtls_sha1_free(mbedtls_sha1_context *ctx)
{
if (ctx == NULL) {
@ -52,18 +63,10 @@ void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
const mbedtls_sha1_context *src)
{
// If dst is H/W context, we need to change it to S/W context first before cloning to.
while (dst->ishw) {
if (dst->ishw) {
mbedtls_sha1_free(dst);
// We just want S/W context, so we lock SHA H/W resource if it is available.
if (crypto_sha_acquire()) {
mbedtls_sha1_init(dst);
crypto_sha_release();
}
else {
mbedtls_sha1_init(dst);
}
// We still have potential to get H/W context due to race condition. Retry if need be.
// Force S/W context
mbedtls_sha1_init_internal(dst, 0);
}
if (src->ishw) {

29
features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.c
View File

@ -23,9 +23,15 @@
#include "nu_bitutil.h"
#include "string.h"
void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
/* Choose SHA S/W or H/W context and initialize it
*
* try_hw:
* 0: Initialize S/W context
* 1: Try acquiring SHA H/W resource first and initialize its H/W context if successful. If failed, initialize S/W context.
*/
static void mbedtls_sha256_init_internal(mbedtls_sha256_context *ctx, int try_hw)
{
if (crypto_sha_acquire()) {
if (try_hw && crypto_sha_acquire()) {
ctx->ishw = 1;
mbedtls_sha256_hw_init(&ctx->hw_ctx);
} else {
@ -34,6 +40,11 @@ void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
}
}
void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
{
mbedtls_sha256_init_internal(ctx, 1);
}
void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
{
if (ctx == NULL) {
@ -52,18 +63,10 @@ void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
const mbedtls_sha256_context *src)
{
// If dst is H/W context, we need to change it to S/W context first before cloning to.
while (dst->ishw) {
if (dst->ishw) {
mbedtls_sha256_free(dst);
// We just want S/W context, so we lock SHA H/W resource if it is available.
if (crypto_sha_acquire()) {
mbedtls_sha256_init(dst);
crypto_sha_release();
}
else {
mbedtls_sha256_init(dst);
}
// We still have potential to get H/W context due to race condition. Retry if need be.
// Force S/W context
mbedtls_sha256_init_internal(dst, 0);
}
if (src->ishw) {

29
features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.c
View File

@ -23,9 +23,15 @@
#include "nu_bitutil.h"
#include "string.h"
void mbedtls_sha512_init(mbedtls_sha512_context *ctx)
/* Choose SHA S/W or H/W context and initialize it
*
* try_hw:
* 0: Initialize S/W context
* 1: Try acquiring SHA H/W resource first and initialize its H/W context if successful. If failed, initialize S/W context.
*/
static void mbedtls_sha512_init_internal(mbedtls_sha512_context *ctx, int try_hw)
{
if (crypto_sha_acquire()) {
if (try_hw && crypto_sha_acquire()) {
ctx->ishw = 1;
mbedtls_sha512_hw_init(&ctx->hw_ctx);
} else {
@ -34,6 +40,11 @@ void mbedtls_sha512_init(mbedtls_sha512_context *ctx)
}
}
void mbedtls_sha512_init(mbedtls_sha512_context *ctx)
{
mbedtls_sha512_init_internal(ctx, 1);
}
void mbedtls_sha512_free(mbedtls_sha512_context *ctx)
{
if (ctx == NULL) {
@ -52,18 +63,10 @@ void mbedtls_sha512_clone(mbedtls_sha512_context *dst,
const mbedtls_sha512_context *src)
{
// If dst is H/W context, we need to change it to S/W context first before cloning to.
while (dst->ishw) {
if (dst->ishw) {
mbedtls_sha512_free(dst);
// We just want S/W context, so we lock SHA H/W resource if it is available.
if (crypto_sha_acquire()) {
mbedtls_sha512_init(dst);
crypto_sha_release();
}
else {
mbedtls_sha512_init(dst);
}
// We still have potential to get H/W context due to race condition. Retry if need be.
// Force S/W context
mbedtls_sha512_init_internal(dst, 0);
}
if (src->ishw) {

29
features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c
View File

@ -23,9 +23,15 @@
#include "nu_bitutil.h"
#include "string.h"
void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
/* Choose SHA S/W or H/W context and initialize it
*
* try_hw:
* 0: Initialize S/W context
* 1: Try acquiring SHA H/W resource first and initialize its H/W context if successful. If failed, initialize S/W context.
*/
static void mbedtls_sha1_init_internal(mbedtls_sha1_context *ctx, int try_hw)
{
if (crypto_sha_acquire()) {
if (try_hw && crypto_sha_acquire()) {
ctx->ishw = 1;
mbedtls_sha1_hw_init(&ctx->hw_ctx);
} else {
@ -34,6 +40,11 @@ void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
}
}
void mbedtls_sha1_init(mbedtls_sha1_context *ctx)
{
mbedtls_sha1_init_internal(ctx, 1);
}
void mbedtls_sha1_free(mbedtls_sha1_context *ctx)
{
if (ctx == NULL) {
@ -52,18 +63,10 @@ void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
const mbedtls_sha1_context *src)
{
// If dst is H/W context, we need to change it to S/W context first before cloning to.
while (dst->ishw) {
if (dst->ishw) {
mbedtls_sha1_free(dst);
// We just want S/W context, so we lock SHA H/W resource if it is available.
if (crypto_sha_acquire()) {
mbedtls_sha1_init(dst);
crypto_sha_release();
}
else {
mbedtls_sha1_init(dst);
}
// We still have potential to get H/W context due to race condition. Retry if need be.
// Force S/W context
mbedtls_sha1_init_internal(dst, 0);
}
if (src->ishw) {

29
features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c
View File

@ -23,9 +23,15 @@
#include "nu_bitutil.h"
#include "string.h"
void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
/* Choose SHA S/W or H/W context and initialize it
*
* try_hw:
* 0: Initialize S/W context
* 1: Try acquiring SHA H/W resource first and initialize its H/W context if successful. If failed, initialize S/W context.
*/
static void mbedtls_sha256_init_internal(mbedtls_sha256_context *ctx, int try_hw)
{
if (crypto_sha_acquire()) {
if (try_hw && crypto_sha_acquire()) {
ctx->ishw = 1;
mbedtls_sha256_hw_init(&ctx->hw_ctx);
} else {
@ -34,6 +40,11 @@ void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
}
}
void mbedtls_sha256_init(mbedtls_sha256_context *ctx)
{
mbedtls_sha256_init_internal(ctx, 1);
}
void mbedtls_sha256_free(mbedtls_sha256_context *ctx)
{
if (ctx == NULL) {
@ -52,18 +63,10 @@ void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
const mbedtls_sha256_context *src)
{
// If dst is H/W context, we need to change it to S/W context first before cloning to.
while (dst->ishw) {
if (dst->ishw) {
mbedtls_sha256_free(dst);
// We just want S/W context, so we lock SHA H/W resource if it is available.
if (crypto_sha_acquire()) {
mbedtls_sha256_init(dst);
crypto_sha_release();
}
else {
mbedtls_sha256_init(dst);
}
// We still have potential to get H/W context due to race condition. Retry if need be.
// Force S/W context
mbedtls_sha256_init_internal(dst, 0);
}
if (src->ishw) {