From a4050f40f6b682e859567e229bb92afe0d843a86 Mon Sep 17 00:00:00 2001 From: PARKJIHOON Date: Mon, 6 Jan 2020 20:25:21 +0900 Subject: [PATCH] tidy up PR comments #1 Signed-off-by: PARKJIHOON --- .../targets/TARGET_Samsung/mbedtls_device.h | 37 ++++++++-------- .../targets/TARGET_Samsung/sha/sha256_alt.c | 44 ++++++++++++++----- .../targets/TARGET_Samsung/sha/sha256_alt.h | 21 ++++++++- .../targets/TARGET_Samsung/sha/sha512_alt.c | 21 ++++++++- .../targets/TARGET_Samsung/sha/sha512_alt.h | 20 ++++++++- .../TARGET_SIDK_S5JS100/PeripheralNames.h | 9 +--- 6 files changed, 111 insertions(+), 41 deletions(-) diff --git a/features/mbedtls/targets/TARGET_Samsung/mbedtls_device.h b/features/mbedtls/targets/TARGET_Samsung/mbedtls_device.h index e1d60690def7..b7988415a529 100644 --- a/features/mbedtls/targets/TARGET_Samsung/mbedtls_device.h +++ b/features/mbedtls/targets/TARGET_Samsung/mbedtls_device.h @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2015-2016 Nuvoton + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,27 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/**************************************************************************** + * + * Copyright 2019 Samsung Electronics All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ #ifndef MBEDTLS_DEVICE_H #define MBEDTLS_DEVICE_H -//#define MBEDTLS_DES_ALT - -//#define MBEDTLS_SHA1_ALT #define MBEDTLS_SHA256_ALT #define MBEDTLS_SHA512_ALT -//#define MBEDTLS_AES_ALT - -//#define MBEDTLS_ECP_INTERNAL_ALT -/* Support for Weierstrass curves with Jacobi representation */ -//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT -//#define MBEDTLS_ECP_ADD_MIXED_ALT -//#define MBEDTLS_ECP_DOUBLE_JAC_ALT -//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT -//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT -/* Support for curves with Montgomery arithmetic */ -//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT -//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT -//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT - #endif /* MBEDTLS_DEVICE_H */ diff --git a/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c b/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c index fd00e3ac98d9..baf96c0e8ceb 100644 --- a/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c +++ b/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2015-2016 Nuvoton + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/**************************************************************************** + * + * Copyright 2019 Samsung Electronics All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ + #include "mbedtls/sha256.h" #include "mbedtls/platform_util.h" @@ -76,8 +95,8 @@ void mbedtls_sha256_clone(mbedtls_sha256_context *dst, return; } - //SHA256_VALIDATE( dst != NULL ); - //SHA256_VALIDATE( src != NULL ); + SHA256_VALIDATE( dst != NULL ); + SHA256_VALIDATE( src != NULL ); memcpy(dst, src, sizeof(mbedtls_sha256_context)); } @@ -94,9 +113,8 @@ int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) ctx->total[1] = 0; if( is224 == 0 ) - { //SHA-256 by SSS H/W + { ctx->is224 = 0; - /// memset( ctx->sbuf, 0, sizeof( ctx->sbuf ) ); memset( ctx, 0, sizeof( mbedtls_sha256_context ) ); } else @@ -106,14 +124,15 @@ int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) ctx->state[1] = 0x367CD507; ctx->state[2] = 0x3070DD17; ctx->state[3] = 0xF70E5939; - ctx->state[4] = 0xFFC00B31; - ctx->state[5] = 0x68581511; - ctx->state[6] = 0x64F98FA7; - ctx->state[7] = 0xBEFA4FA4; + ctx->state[4] = 0xFFC00B31; + ctx->state[5] = 0x68581511; + ctx->state[6] = 0x64F98FA7; + ctx->state[7] = 0xBEFA4FA4; ctx->is224 = is224; } - return( 0 ); + // No any of H/W access, always return OK + return 0; } /* @@ -128,7 +147,6 @@ int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx, const unsigned char * if(ilen > MAX_MB_HASH_BLOCK_BLEN || ctx->totals > MAX_MB_HASH_BLOCK_BLEN) { // H/W SHA has limitation to seperated API with oversized message. // fall back to S/W SHA-256 - //memset( ctx, 0, sizeof( mbedtls_sha256_context ) ); if(ctx->totals == 0) { ctx->total[0] = 0; ctx->total[1] = 0; @@ -150,6 +168,8 @@ int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx, const unsigned char * ctx->pstMessage.u32DataByteLen += ilen; } } + + // No any of H/W access, always return OK return 0; } @@ -177,7 +197,7 @@ int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx, unsigned char output[ //! assign hash_byte_len to compare returned result from sss_fw after hash operation object_id = OID_SHA2_256; - block_byte_len = 64; /* meaningless*/ + block_byte_len = 64; /* dummy */ //! step 1 : set message length parameter to SSS ret = mb_hash_init(&ctx->pstMessage, object_id); diff --git a/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h b/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h index efa59f1fe0ca..53365919d041 100644 --- a/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h +++ b/features/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2015-2016 Nuvoton + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/**************************************************************************** + * + * Copyright 2019 Samsung Electronics All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ + #ifndef MBEDTLS_SHA256_ALT_H #define MBEDTLS_SHA256_ALT_H diff --git a/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c b/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c index 196bb7114b96..d9d94f1918b6 100644 --- a/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c +++ b/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2015-2016 Nuvoton + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/**************************************************************************** + * + * Copyright 2019 Samsung Electronics All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ + #include "mbedtls/sha512.h" #include "mbedtls/platform_util.h" diff --git a/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h b/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h index 3c588f64b2bf..66191e040b68 100644 --- a/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h +++ b/features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2015-2016 Nuvoton + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/**************************************************************************** + * + * Copyright 2019 Samsung Electronics All Rights Reserved. + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. + * + ****************************************************************************/ #ifndef MBEDTLS_SHA512_ALT_H #define MBEDTLS_SHA512_ALT_H diff --git a/targets/TARGET_Samsung/TARGET_SIDK_S5JS100/PeripheralNames.h b/targets/TARGET_Samsung/TARGET_SIDK_S5JS100/PeripheralNames.h index 84bf52f35366..7180a97cbef9 100644 --- a/targets/TARGET_Samsung/TARGET_SIDK_S5JS100/PeripheralNames.h +++ b/targets/TARGET_Samsung/TARGET_SIDK_S5JS100/PeripheralNames.h @@ -1,5 +1,5 @@ /* mbed Microcontroller Library - * Copyright (c) 2006-2018 ARM Limited + * Copyright (c) 2006-2019 ARM Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -107,13 +107,6 @@ typedef enum { #define STDIO_UART _UART_NAME(UART_, UART_STDIO_PORT) #endif - -/* what are these ports for? */ -//#define MBED_UART0 UART_TX0, UART_RX0 -//#define MBED_UART1 UART_TX1, UART_RX1 -//#define MBED_UARTUSB UART_TX1, UART_RX1 - -//USB UART - what for ??? #define USBTX UART_TX0 #define USBRX UART_RX0