Merge pull request #8946 from juhoeskeli/STM32L4_aes_set_key_fix

Cruz Monrreal · web-flow · commit 3d6dd4694838 · 2018-12-03T21:13:29.000-06:00
STM32L4: before calling HAL_CRYP_DeInit initialize the Instance member
diff --git a/features/mbedtls/targets/TARGET_STM/aes_alt.c b/features/mbedtls/targets/TARGET_STM/aes_alt.c
@@ -56,13 +56,14 @@ static int aes_set_key(mbedtls_aes_context *ctx, const unsigned char *key, unsig
             return (MBEDTLS_ERR_AES_INVALID_KEY_LENGTH);
     }
 
+    ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B;
+    ctx->hcryp_aes.Instance = CRYP;
+
     /* Deinitializes the CRYP peripheral */
     if (HAL_CRYP_DeInit(&ctx->hcryp_aes) == HAL_ERROR) {
         return (HAL_ERROR);
     }
 
-    ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B;
-    ctx->hcryp_aes.Instance = CRYP;
     /* Enable CRYP clock */
     __HAL_RCC_CRYP_CLK_ENABLE();
 

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,14 @@ static int aes_set_key(mbedtls_aes_context ctx, const unsigned char key, unsig`
`56`	`56`	`return (MBEDTLS_ERR_AES_INVALID_KEY_LENGTH);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B;`
	`60`	`+ ctx->hcryp_aes.Instance = CRYP;`
	`61`	`+`
`59`	`62`	`/* Deinitializes the CRYP peripheral */`
`60`	`63`	`if (HAL_CRYP_DeInit(&ctx->hcryp_aes) == HAL_ERROR) {`
`61`	`64`	`return (HAL_ERROR);`
`62`	`65`	`}`
`63`	`66`
`64`		`- ctx->hcryp_aes.Init.DataType = CRYP_DATATYPE_8B;`
`65`		`- ctx->hcryp_aes.Instance = CRYP;`
`66`	`67`	`/* Enable CRYP clock */`
`67`	`68`	`__HAL_RCC_CRYP_CLK_ENABLE();`
`68`	`69`