stmhal: Update STM32Cube F4 HAL driver to V1.3.0.

This patch updates ST's HAL to the latest version, V1.3.0, dated 19 June
2014.  Files were copied verbatim from the ST package.  Only change was
to suppress compiler warning of unused variables in 4 places.

A lot of the changes from ST are cosmetic: comments and white space.
Some small code changes here and there, and addition of F411 header.

Main code change is how SysTick interrupt is set: it now has a
configuration variable to set the priority, so we no longer need to work
around this (originall in system_stm32f4xx.c).

1 files changed, 175 insertions, 117 deletions

diff --git a/stmhal/hal/src/stm32f4xx_hal_cryp.c b/stmhal/hal/src/stm32f4xx_hal_cryp.c
index 2ecfb17d7..9e2489f59 100644
--- a/stmhal/hal/src/stm32f4xx_hal_cryp.c
+++ b/stmhal/hal/src/stm32f4xx_hal_cryp.c
@@ -2,8 +2,8 @@
   ******************************************************************************

   * @file    stm32f4xx_hal_cryp.c

   * @author  MCD Application Team

-  * @version V1.0.0

-  * @date    18-February-2014

+  * @version V1.1.0

+  * @date    19-June-2014

   * @brief   CRYP HAL module driver.

   *          This file provides firmware functions to manage the following 

   *          functionalities of the Cryptography (CRYP) peripheral:

@@ -29,18 +29,15 @@
              (+++) Enable the CRYP IRQ handler using HAL_NVIC_EnableIRQ()

              (+++) In CRYP IRQ handler, call HAL_CRYP_IRQHandler()

          (##) In case of using DMA to control data transfer (e.g. HAL_CRYP_AESECB_Encrypt_DMA())

-             (++) Enable the DMAx interface clock using 

-                 (+++) __DMAx_CLK_ENABLE()

-             (++) Configure and enable two DMA streams one for managing data transfer from

+             (+++) Enable the DMAx interface clock using __DMAx_CLK_ENABLE()

+             (+++) Configure and enable two DMA streams one for managing data transfer from

                  memory to peripheral (input stream) and another stream for managing data

                  transfer from peripheral to memory (output stream)

-             (++) Associate the initilalized DMA handle to the CRYP DMA handle

+             (+++) Associate the initilalized DMA handle to the CRYP DMA handle

                  using  __HAL_LINKDMA()

-             (++) Configure the priority and enable the NVIC for the transfer complete

+             (+++) Configure the priority and enable the NVIC for the transfer complete

                  interrupt on the two DMA Streams. The output stream should have higher

-                 priority than the input stream.

-                 (+++) HAL_NVIC_SetPriority()

-                 (+++) HAL_NVIC_EnableIRQ()

+                 priority than the input stream HAL_NVIC_SetPriority() and HAL_NVIC_EnableIRQ()

     

       (#)Initialize the CRYP HAL using HAL_CRYP_Init(). This function configures mainly:

          (##) The data type: 1-bit, 8-bit, 16-bit and 32-bit

@@ -51,13 +48,13 @@
     

       (#)Three processing (encryption/decryption) functions are available:

          (##) Polling mode: encryption and decryption APIs are blocking functions

-              i.e. they process the data and wait till the processing is finished

+              i.e. they process the data and wait till the processing is finished,

               e.g. HAL_CRYP_AESCBC_Encrypt()

          (##) Interrupt mode: encryption and decryption APIs are not blocking functions

-              i.e. they process the data under interrupt

+              i.e. they process the data under interrupt,

               e.g. HAL_CRYP_AESCBC_Encrypt_IT()

          (##) DMA mode: encryption and decryption APIs are not blocking functions

-              i.e. the data transfer is ensured by DMA

+              i.e. the data transfer is ensured by DMA,

               e.g. HAL_CRYP_AESCBC_Encrypt_DMA()

     

       (#)When the processing function is called at first time after HAL_CRYP_Init()

@@ -118,6 +115,7 @@
 

 /* Private typedef -----------------------------------------------------------*/

 /* Private define ------------------------------------------------------------*/

+#define CRYP_TIMEOUT_VALUE  1

 /* Private macro -------------------------------------------------------------*/

 /* Private variables ---------------------------------------------------------*/

 /* Private function prototypes -----------------------------------------------*/

@@ -161,7 +159,8 @@ static void CRYP_SetDESCBCMode(CRYP_HandleTypeDef *hcryp, uint32_t Direction);
 /**

   * @brief  Initializes the CRYP according to the specified

   *         parameters in the CRYP_InitTypeDef and creates the associated handle.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval HAL status

   */

 HAL_StatusTypeDef HAL_CRYP_Init(CRYP_HandleTypeDef *hcryp)

@@ -204,7 +203,8 @@ HAL_StatusTypeDef HAL_CRYP_Init(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  DeInitializes the CRYP peripheral. 

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval HAL status

   */

 HAL_StatusTypeDef HAL_CRYP_DeInit(CRYP_HandleTypeDef *hcryp)

@@ -243,7 +243,8 @@ HAL_StatusTypeDef HAL_CRYP_DeInit(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  Initializes the CRYP MSP.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

 __weak void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)

@@ -255,7 +256,8 @@ __weak void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  DeInitializes CRYP MSP.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

 __weak void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)

@@ -291,7 +293,8 @@ __weak void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
 /**

   * @brief  Initializes the CRYP peripheral in AES ECB encryption mode

   *         then encrypt pPlainData. The cypher data are available in pCypherData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -344,7 +347,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 /**

   * @brief  Initializes the CRYP peripheral in AES CBC encryption mode

   *         then encrypt pPlainData. The cypher data are available in pCypherData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -400,7 +404,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 /**

   * @brief  Initializes the CRYP peripheral in AES CTR encryption mode

   *         then encrypt pPlainData. The cypher data are available in pCypherData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -458,7 +463,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 /**

   * @brief  Initializes the CRYP peripheral in AES ECB decryption mode

   *         then decrypted pCypherData. The cypher data are available in pPlainData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -467,7 +473,7 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
   */

 HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData, uint32_t Timeout)

 {

-   uint32_t timeout = 0;

+   uint32_t tickstart = 0;

   

   /* Process Locked */

   __HAL_LOCK(hcryp);

@@ -487,15 +493,15 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
     /* Enable CRYP */

     __HAL_CRYP_ENABLE();

     

-    /* Get timeout */

-    timeout = HAL_GetTick() + Timeout;

+    /* Get tick */ 

+    tickstart = HAL_GetTick();

 

     while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

     {

       /* Check for the Timeout */

       if(Timeout != HAL_MAX_DELAY)

       {

-        if(HAL_GetTick() >= timeout)

+        if((Timeout == 0)||((HAL_GetTick() - tickstart ) > Timeout))

         {

           /* Change state */

           hcryp->State = HAL_CRYP_STATE_TIMEOUT;

@@ -545,7 +551,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
 /**

   * @brief  Initializes the CRYP peripheral in AES ECB decryption mode

   *         then decrypted pCypherData. The cypher data are available in pPlainData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -554,7 +561,7 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
   */

 HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData, uint32_t Timeout)

 {

-   uint32_t timeout = 0;   

+  uint32_t tickstart = 0;

   

   /* Process Locked */

   __HAL_LOCK(hcryp);

@@ -574,20 +581,20 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
     /* Enable CRYP */

     __HAL_CRYP_ENABLE();

     

-    /* Get Timeout */

-    timeout = HAL_GetTick() + Timeout;

+    /* Get tick */ 

+    tickstart = HAL_GetTick();

 

     while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

     {

       /* Check for the Timeout */

       if(Timeout != HAL_MAX_DELAY)

       {

-        if(HAL_GetTick() >= timeout)

+        if((Timeout == 0)||((HAL_GetTick() - tickstart ) > Timeout))

         {

           /* Change state */

           hcryp->State = HAL_CRYP_STATE_TIMEOUT;

           

-          /* Process Unlocked */          

+          /* Process Unlocked */

           __HAL_UNLOCK(hcryp);

           

           return HAL_TIMEOUT;

@@ -633,7 +640,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
 /**

   * @brief  Initializes the CRYP peripheral in AES CTR decryption mode

   *         then decrypted pCypherData. The cypher data are available in pPlainData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -688,7 +696,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pC
 

 /**

   * @brief  Initializes the CRYP peripheral in AES ECB encryption mode using Interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -788,7 +797,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CBC encryption mode using Interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -890,7 +900,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CTR encryption mode using Interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -993,7 +1004,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES ECB decryption mode using Interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1001,7 +1013,7 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
   */

 HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData)

 {

-  uint32_t timeout = 0;   

+  uint32_t tickstart = 0;

 

   uint32_t inputaddr;

   uint32_t outputaddr;

@@ -1030,13 +1042,13 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
     /* Enable CRYP */

     __HAL_CRYP_ENABLE();

     

-    /* Get timeout */

-    timeout = HAL_GetTick() + 1;

+    /* Get tick */ 

+    tickstart = HAL_GetTick();

 

     while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

     {

       /* Check for the Timeout */

-      if(HAL_GetTick() >= timeout)

+      if((HAL_GetTick() - tickstart ) > CRYP_TIMEOUT_VALUE)

       {

         /* Change state */

         hcryp->State = HAL_CRYP_STATE_TIMEOUT;

@@ -1121,7 +1133,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CBC decryption mode using IT.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1130,7 +1143,7 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData)

 {

 

-  uint32_t timeout = 0;   

+  uint32_t tickstart = 0;   

   uint32_t inputaddr;

   uint32_t outputaddr;

   

@@ -1160,18 +1173,18 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
       /* Enable CRYP */

       __HAL_CRYP_ENABLE();

       

-    /* Get timeout */

-    timeout = HAL_GetTick() + 1;

+    /* Get tick */

+    tickstart = HAL_GetTick();

 

     while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

     {

       /* Check for the Timeout */

-      if(HAL_GetTick() >= timeout)

+      if((HAL_GetTick() - tickstart ) > CRYP_TIMEOUT_VALUE)

       {

         /* Change state */

         hcryp->State = HAL_CRYP_STATE_TIMEOUT;

         

-        /* Process Unlocked */          

+        /* Process Unlocked */

         __HAL_UNLOCK(hcryp);

         

         return HAL_TIMEOUT;

@@ -1257,7 +1270,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CTR decryption mode using Interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1361,7 +1375,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES ECB encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1415,7 +1430,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CBC encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1472,7 +1488,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CTR encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16.

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1530,7 +1547,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES ECB decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1538,7 +1556,7 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
   */

 HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData)

 {

-  uint32_t timeout = 0;   

+  uint32_t tickstart = 0;   

   uint32_t inputaddr;

   uint32_t outputaddr;

   

@@ -1565,18 +1583,18 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
     /* Enable CRYP */

     __HAL_CRYP_ENABLE();

     

-    /* Get timeout */

-    timeout = HAL_GetTick() + 1;

+    /* Get tick */

+    tickstart = HAL_GetTick();

     

     while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

     {

       /* Check for the Timeout */

-      if(HAL_GetTick() >= timeout)

+      if((HAL_GetTick() - tickstart ) > CRYP_TIMEOUT_VALUE)

       {

         /* Change state */

         hcryp->State = HAL_CRYP_STATE_TIMEOUT;

         

-        /* Process Unlocked */          

+        /* Process Unlocked */

         __HAL_UNLOCK(hcryp);

         

         return HAL_TIMEOUT;

@@ -1613,7 +1631,8 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CBC encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16 bytes

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1621,7 +1640,7 @@ HAL_StatusTypeDef HAL_CRYP_AESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
   */

 HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t *pCypherData, uint16_t Size, uint8_t *pPlainData)

 {

-  uint32_t timeout = 0;   

+  uint32_t tickstart = 0;   

   uint32_t inputaddr;

   uint32_t outputaddr;

   

@@ -1648,18 +1667,18 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
       /* Enable CRYP */

       __HAL_CRYP_ENABLE();

       

-      /* Get timeout */

-      timeout = HAL_GetTick() + 1;

+      /* Get tick */

+      tickstart = HAL_GetTick();

 

       while(HAL_IS_BIT_SET(CRYP->SR, CRYP_FLAG_BUSY))

       {

         /* Check for the Timeout */

-        if(HAL_GetTick() >= timeout)

+        if((HAL_GetTick() - tickstart ) > CRYP_TIMEOUT_VALUE)

         {

           /* Change state */

           hcryp->State = HAL_CRYP_STATE_TIMEOUT;

           

-          /* Process Unlocked */          

+          /* Process Unlocked */

           __HAL_UNLOCK(hcryp);

           

           return HAL_TIMEOUT;

@@ -1699,7 +1718,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in AES CTR decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 16

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -1768,10 +1788,10 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
   ==============================================================================  

     [..]  This section provides functions allowing to:

       (+) Encrypt plaintext using DES using ECB or CBC chaining modes

-      (+) Decrypt cyphertext using using ECB or CBC chaining modes

+      (+) Decrypt cyphertext using ECB or CBC chaining modes

     [..]  Three processing functions are available:

-      (+) polling mode

-      (+) interrupt mode

+      (+) Polling mode

+      (+) Interrupt mode

       (+) DMA mode

 

 @endverbatim

@@ -1780,7 +1800,8 @@ HAL_StatusTypeDef HAL_CRYP_AESCTR_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB encryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1819,7 +1840,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1858,7 +1880,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 

 /**

   * @brief  Initializes the CRYP peripheral in DES CBC encryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1897,7 +1920,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -1936,7 +1960,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *pP
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB encryption mode using IT.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2020,7 +2045,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES CBC encryption mode using interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2105,7 +2131,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode using IT.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2189,7 +2216,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode using interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2273,7 +2301,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2315,7 +2344,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES CBC encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2357,7 +2387,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2399,7 +2430,8 @@ HAL_StatusTypeDef HAL_CRYP_DESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in DES ECB decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2451,11 +2483,11 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
                       ##### TDES processing functions #####

   ==============================================================================  

     [..]  This section provides functions allowing to:

-      (+) Encrypt plaintext using TDES using ECB or CBC chaining modes

-      (+) Decrypt cyphertext using TDES using ECB or CBC chaining modes

+      (+) Encrypt plaintext using TDES based on ECB or CBC chaining modes

+      (+) Decrypt cyphertext using TDES based on ECB or CBC chaining modes

     [..]  Three processing functions are available:

-      (+) polling mode

-      (+) interrupt mode

+      (+) Polling mode

+      (+) Interrupt mode

       (+) DMA mode

 

 @endverbatim

@@ -2465,7 +2497,8 @@ HAL_StatusTypeDef HAL_CRYP_DESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_t
 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB encryption mode

   *         then encrypt pPlainData. The cypher data are available in pCypherData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2505,7 +2538,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *p
 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB decryption mode

   *         then decrypted pCypherData. The cypher data are available in pPlainData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2545,7 +2579,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *p
 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC encryption mode

   *         then encrypt pPlainData. The cypher data are available in pCypherData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2585,7 +2620,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Encrypt(CRYP_HandleTypeDef *hcryp, uint8_t *p
 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC decryption mode

   *         then decrypted pCypherData. The cypher data are available in pPlainData

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -2624,7 +2660,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Decrypt(CRYP_HandleTypeDef *hcryp, uint8_t *p
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB encryption mode using interrupt.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2708,7 +2745,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC encryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2791,7 +2829,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Encrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB decryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2874,7 +2913,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC decryption mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -2957,7 +2997,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Decrypt_IT(CRYP_HandleTypeDef *hcryp, uint8_t
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -2999,7 +3040,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC encryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -3041,7 +3083,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Encrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES ECB decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pPlainData: Pointer to the plaintext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pCypherData: Pointer to the cyphertext buffer

@@ -3083,7 +3126,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESECB_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_
 

 /**

   * @brief  Initializes the CRYP peripheral in TDES CBC decryption mode using DMA.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  pCypherData: Pointer to the cyphertext buffer

   * @param  Size: Length of the plaintext buffer, must be a multiple of 8

   * @param  pPlainData: Pointer to the plaintext buffer

@@ -3145,7 +3189,8 @@ HAL_StatusTypeDef HAL_CRYP_TDESCBC_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint8_
 

 /**

   * @brief  Input FIFO transfer completed callbacks.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

 __weak void HAL_CRYP_InCpltCallback(CRYP_HandleTypeDef *hcryp)

@@ -3157,7 +3202,8 @@ __weak void HAL_CRYP_InCpltCallback(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  Output FIFO transfer completed callbacks.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

 __weak void HAL_CRYP_OutCpltCallback(CRYP_HandleTypeDef *hcryp)

@@ -3169,7 +3215,8 @@ __weak void HAL_CRYP_OutCpltCallback(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  CRYP error callbacks.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

  __weak void HAL_CRYP_ErrorCallback(CRYP_HandleTypeDef *hcryp)

@@ -3198,7 +3245,8 @@ __weak void HAL_CRYP_OutCpltCallback(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  This function handles CRYP interrupt request.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval None

   */

 void HAL_CRYP_IRQHandler(CRYP_HandleTypeDef *hcryp)

@@ -3286,7 +3334,8 @@ void HAL_CRYP_IRQHandler(CRYP_HandleTypeDef *hcryp)
 

 /**

   * @brief  Returns the CRYP state.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @retval HAL state

   */

 HAL_CRYP_STATETypeDef HAL_CRYP_GetState(CRYP_HandleTypeDef *hcryp)

@@ -3352,7 +3401,8 @@ static void CRYP_DMAError(DMA_HandleTypeDef *hdma)
 

 /**

   * @brief  Writes the Key in Key registers. 

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Key: Pointer to Key buffer

   * @param  KeySize: Size of Key

   * @retval None

@@ -3410,7 +3460,8 @@ static void CRYP_SetKey(CRYP_HandleTypeDef *hcryp, uint8_t *Key, uint32_t KeySiz
 

 /**

   * @brief  Writes the InitVector/InitCounter in IV registers. 

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  InitVector: Pointer to InitVector/InitCounter buffer

   * @param  IVSize: Size of the InitVector/InitCounter

   * @retval None

@@ -3448,7 +3499,8 @@ static void CRYP_SetInitVector(CRYP_HandleTypeDef *hcryp, uint8_t *InitVector, u
 

 /**

   * @brief  Process Data: Writes Input data in polling mode and read the output data

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Input: Pointer to the Input buffer

   * @param  Ilength: Length of the Input buffer, must be a multiple of 16.

   * @param  Output: Pointer to the returned buffer

@@ -3456,7 +3508,7 @@ static void CRYP_SetInitVector(CRYP_HandleTypeDef *hcryp, uint8_t *InitVector, u
   */

 static HAL_StatusTypeDef CRYP_ProcessData(CRYP_HandleTypeDef *hcryp, uint8_t* Input, uint16_t Ilength, uint8_t* Output, uint32_t Timeout)

 {

-  uint32_t timeout = 0;

+  uint32_t tickstart = 0;

   

   uint32_t i = 0;

   uint32_t inputaddr  = (uint32_t)Input;

@@ -3474,20 +3526,20 @@ static HAL_StatusTypeDef CRYP_ProcessData(CRYP_HandleTypeDef *hcryp, uint8_t* In
     CRYP->DR = *(uint32_t*)(inputaddr);

     inputaddr+=4;

     

-    /* Get timeout */

-    timeout = HAL_GetTick() + Timeout;

+    /* Get tick */

+    tickstart = HAL_GetTick();

 

     while(HAL_IS_BIT_CLR(CRYP->SR, CRYP_FLAG_OFNE))

     {    

       /* Check for the Timeout */

       if(Timeout != HAL_MAX_DELAY)

       {

-        if(HAL_GetTick() >= timeout)

+        if((Timeout == 0)||((HAL_GetTick() - tickstart ) > Timeout))

         {

           /* Change state */

           hcryp->State = HAL_CRYP_STATE_TIMEOUT;

           

-          /* Process Unlocked */          

+          /* Process Unlocked */

           __HAL_UNLOCK(hcryp);

         

           return HAL_TIMEOUT;

@@ -3510,7 +3562,8 @@ static HAL_StatusTypeDef CRYP_ProcessData(CRYP_HandleTypeDef *hcryp, uint8_t* In
 

 /**

   * @brief  Process Data: Write Input data in polling mode. 

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Input: Pointer to the Input buffer

   * @param  Ilength: Length of the Input buffer, must be a multiple of 8

   * @param  Output: Pointer to the returned buffer

@@ -3519,7 +3572,7 @@ static HAL_StatusTypeDef CRYP_ProcessData(CRYP_HandleTypeDef *hcryp, uint8_t* In
   */

 static HAL_StatusTypeDef CRYP_ProcessData2Words(CRYP_HandleTypeDef *hcryp, uint8_t* Input, uint16_t Ilength, uint8_t* Output, uint32_t Timeout)

 {

-  uint32_t timeout = 0;   

+  uint32_t tickstart = 0;   

   

   uint32_t i = 0;

   uint32_t inputaddr  = (uint32_t)Input;

@@ -3533,15 +3586,15 @@ static HAL_StatusTypeDef CRYP_ProcessData2Words(CRYP_HandleTypeDef *hcryp, uint8
     CRYP->DR = *(uint32_t*)(inputaddr);

     inputaddr+=4;

     

-    /* Get timeout */

-    timeout = HAL_GetTick() + Timeout;

+    /* Get tick */

+    tickstart = HAL_GetTick();

     

     while(HAL_IS_BIT_CLR(CRYP->SR, CRYP_FLAG_OFNE))

     {

       /* Check for the Timeout */

       if(Timeout != HAL_MAX_DELAY)

       {

-        if(HAL_GetTick() >= timeout)

+        if((Timeout == 0)||((HAL_GetTick() - tickstart ) > Timeout))

         {

           /* Change state */

           hcryp->State = HAL_CRYP_STATE_TIMEOUT;

@@ -3565,7 +3618,8 @@ static HAL_StatusTypeDef CRYP_ProcessData2Words(CRYP_HandleTypeDef *hcryp, uint8
 

 /**

   * @brief  Set the DMA configuration and start the DMA transfer

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  inputaddr: address of the Input buffer

   * @param  Size: Size of the Input buffer, must be a multiple of 16.

   * @param  outputaddr: address of the Output buffer

@@ -3602,7 +3656,8 @@ static void CRYP_SetDMAConfig(CRYP_HandleTypeDef *hcryp, uint32_t inputaddr, uin
 

 /**

   * @brief  Sets the CRYP peripheral in DES ECB mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Direction: Encryption or decryption

   * @retval None

   */

@@ -3628,7 +3683,8 @@ static void CRYP_SetDESECBMode(CRYP_HandleTypeDef *hcryp, uint32_t Direction)
 

 /**

   * @brief  Sets the CRYP peripheral in DES CBC mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Direction: Encryption or decryption

   * @retval None

   */

@@ -3657,7 +3713,8 @@ static void CRYP_SetDESCBCMode(CRYP_HandleTypeDef *hcryp, uint32_t Direction)
 

 /**

   * @brief  Sets the CRYP peripheral in TDES ECB mode.

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Direction: Encryption or decryption

   * @retval None

   */

@@ -3682,7 +3739,8 @@ static void CRYP_SetTDESECBMode(CRYP_HandleTypeDef *hcryp, uint32_t Direction)
 

 /**

   * @brief  Sets the CRYP peripheral in TDES CBC mode

-  * @param  hcryp: CRYP handle

+  * @param  hcryp: pointer to a CRYP_HandleTypeDef structure that contains

+  *         the configuration information for CRYP module

   * @param  Direction: Encryption or decryption

   * @retval None

   */