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

STM32 MBEDTLS: Keep specific STM32L4 implementation

pull/12747/head
jeromecoutant 2020-03-30 14:14:36 +02:00
parent 47aba83c2c
commit aa09e7d409
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/aes_alt.c → features/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.c
View File

@ -1,5 +1,5 @@
/* /*
* Hardware aes implementation for STM32F4 STM32F7 and STM32L4 families * Hardware AES implementation for STM32L4 family
******************************************************************************* *******************************************************************************
* Copyright (c) 2017, STMicroelectronics * Copyright (c) 2017, STMicroelectronics
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
@ -18,17 +18,15 @@
* *
*/ */
#include <string.h> #if (TARGET_STM32L4)
#include "mbedtls/aes.h" #include "mbedtls/aes.h"
#if defined(MBEDTLS_AES_ALT) #if defined(MBEDTLS_AES_ALT)
#include <string.h>
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
//the following defines are provided to maintain compatibility between STM32 families
#define __HAL_RCC_CRYP_CLK_ENABLE __HAL_RCC_AES_CLK_ENABLE
#define __HAL_RCC_CRYP_FORCE_RESET __HAL_RCC_AES_FORCE_RESET
#define __HAL_RCC_CRYP_RELEASE_RESET __HAL_RCC_AES_RELEASE_RESET
#define CRYP AES
static int aes_set_key(mbedtls_aes_context *ctx, const unsigned char *key, unsigned int keybits) static int aes_set_key(mbedtls_aes_context *ctx, const unsigned char *key, unsigned int keybits)
{ {
@ -48,7 +46,7 @@ static int aes_set_key(mbedtls_aes_context *ctx, const unsigned char *key, unsig
} }
ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B; ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B;
ctx->hcryp_aes.Instance = CRYP; ctx->hcryp_aes.Instance = AES;
/* Deinitializes the CRYP peripheral */ /* Deinitializes the CRYP peripheral */
if (HAL_CRYP_DeInit(&ctx->hcryp_aes) == HAL_ERROR) { if (HAL_CRYP_DeInit(&ctx->hcryp_aes) == HAL_ERROR) {
@ -56,7 +54,7 @@ static int aes_set_key(mbedtls_aes_context *ctx, const unsigned char *key, unsig
} }
/* Enable CRYP clock */ /* Enable CRYP clock */
__HAL_RCC_CRYP_CLK_ENABLE(); __HAL_RCC_AES_CLK_ENABLE();
ctx->hcryp_aes.Init.pKey = ctx->aes_key; ctx->hcryp_aes.Init.pKey = ctx->aes_key;
ctx->hcryp_aes.Init.KeyWriteFlag = CRYP_KEY_WRITE_ENABLE; ctx->hcryp_aes.Init.KeyWriteFlag = CRYP_KEY_WRITE_ENABLE;
@ -97,10 +95,10 @@ void mbedtls_aes_free(mbedtls_aes_context *ctx)
} }
#endif /* DUAL_CORE */ #endif /* DUAL_CORE */
/* Force the CRYP Periheral Clock Reset */ /* Force the CRYP Periheral Clock Reset */
__HAL_RCC_CRYP_FORCE_RESET(); __HAL_RCC_AES_FORCE_RESET();
/* Release the CRYP Periheral Clock Reset */ /* Release the CRYP Periheral Clock Reset */
__HAL_RCC_CRYP_RELEASE_RESET(); __HAL_RCC_AES_RELEASE_RESET();
#if defined(DUAL_CORE) #if defined(DUAL_CORE)
LL_HSEM_ReleaseLock(HSEM, CFG_HW_RCC_SEMID, HSEM_CR_COREID_CURRENT); LL_HSEM_ReleaseLock(HSEM, CFG_HW_RCC_SEMID, HSEM_CR_COREID_CURRENT);
#endif /* DUAL_CORE */ #endif /* DUAL_CORE */
@ -388,3 +386,4 @@ void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
} }
#endif /* MBEDTLS_DEPRECATED_REMOVED */ #endif /* MBEDTLS_DEPRECATED_REMOVED */
#endif /*MBEDTLS_AES_ALT*/ #endif /*MBEDTLS_AES_ALT*/
#endif /* TARGET_STM32L4 */

8
features/mbedtls/targets/TARGET_STM/TARGET_STM32L4/aes_alt.h → features/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.h
View File

@ -17,10 +17,11 @@
* limitations under the License. * limitations under the License.
* *
*/ */
#ifndef MBEDTLS_AES_ALT_H #ifndef MBEDTLS_STM32L4_AES_ALT_H
#define MBEDTLS_AES_ALT_H #define MBEDTLS_STM32L4_AES_ALT_H
#if (TARGET_STM32L4)
#if defined(MBEDTLS_AES_ALT) #if defined(MBEDTLS_AES_ALT)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#include "mbedtls/config.h" #include "mbedtls/config.h"
@ -303,5 +304,6 @@ MBEDTLS_DEPRECATED void mbedtls_aes_decrypt(mbedtls_aes_context *ctx,
#endif /* MBEDTLS_AES_ALT */ #endif /* MBEDTLS_AES_ALT */
#endif /* MBEDTLS_AES_ALT_H */ #endif /* TARGET_STM32L4 */
#endif /* MBEDTLS_STM32L4_AES_ALT_H */