Added (T)DES support to the crypto driver.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10904 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 353 insertions, 12 deletions

diff --git a/os/hal/templates/hal_crypto_lld.c b/os/hal/templates/hal_crypto_lld.c
index 1aa90d2af..2d8a18ef1 100644
--- a/os/hal/templates/hal_crypto_lld.c
+++ b/os/hal/templates/hal_crypto_lld.c
@@ -35,7 +35,7 @@
 /*===========================================================================*/

 

 /** @brief CRY1 driver identifier.*/

-#if PLATFORM_CRY_USE_CRY1 || defined(__DOXYGEN__)

+#if STM32_CRY_USE_CRYP1 || defined(__DOXYGEN__)

 CRYDriver CRYD1;

 #endif

 

@@ -119,6 +119,74 @@ cryerror_t cry_lld_loadkey(CRYDriver *cryp,
 }

 

 /**

+ * @brief   Encryption of a single block using AES.

+ * @note    The implementation of this function must guarantee that it can

+ *          be called from any context.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] in        buffer containing the input plaintext

+ * @param[out] out      buffer for the output cyphertext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_encrypt_AES(CRYDriver *cryp,

+                               crykey_t key_id,

+                               const uint8_t *in,

+                               uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Decryption of a single block using AES.

+ * @note    The implementation of this function must guarantee that it can

+ *          be called from any context.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] in        buffer containing the input cyphertext

+ * @param[out] out      buffer for the output plaintext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_decrypt_AES(CRYDriver *cryp,

+                               crykey_t key_id,

+                               const uint8_t *in,

+                               uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

  * @brief   Encryption operation using AES-ECB.

  * @note    The function operates on data buffers whose lenght is a multiple

  *          of an AES block, this means that padding must be done by the

@@ -138,7 +206,7 @@ cryerror_t cry_lld_loadkey(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -177,7 +245,7 @@ cryerror_t cry_lld_encrypt_AES_ECB(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -217,7 +285,7 @@ cryerror_t cry_lld_decrypt_AES_ECB(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -259,7 +327,7 @@ cryerror_t cry_lld_encrypt_AES_CBC(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -301,7 +369,7 @@ cryerror_t cry_lld_decrypt_AES_CBC(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -343,7 +411,7 @@ cryerror_t cry_lld_encrypt_AES_CFB(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -386,7 +454,7 @@ cryerror_t cry_lld_decrypt_AES_CFB(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -429,7 +497,7 @@ cryerror_t cry_lld_encrypt_AES_CTR(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -476,7 +544,7 @@ cryerror_t cry_lld_decrypt_AES_CTR(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -529,7 +597,7 @@ cryerror_t cry_lld_encrypt_AES_GCM(CRYDriver *cryp,
  *                              device instance.

  * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

  * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

- *                              or refers and empty key slot.

+ *                              or refers to an empty key slot.

  *

  * @notapi

  */

@@ -556,6 +624,237 @@ cryerror_t cry_lld_decrypt_AES_GCM(CRYDriver *cryp,
   return CRY_ERR_INV_ALGO;

 }

 

+/**

+ * @brief   Encryption of a single block using (T)DES.

+ * @note    The implementation of this function must guarantee that it can

+ *          be called from any context.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] in        buffer containing the input plaintext

+ * @param[out] out      buffer for the output cyphertext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_encrypt_DES(CRYDriver *cryp,

+                               crykey_t key_id,

+                               const uint8_t *in,

+                               uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Decryption of a single block using (T)DES.

+ * @note    The implementation of this function must guarantee that it can

+ *          be called from any context.

+ *

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] in        buffer containing the input cyphertext

+ * @param[out] out      buffer for the output plaintext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_decrypt_DES(CRYDriver *cryp,

+                               crykey_t key_id,

+                               const uint8_t *in,

+                               uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Encryption operation using (T)DES-ECB.

+ * @note    The function operates on data buffers whose length is a multiple

+ *          of an DES block, this means that padding must be done by the

+ *          caller.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] size      size of the plaintext buffer, this number must be a

+ *                      multiple of 8

+ * @param[in] in        buffer containing the input plaintext

+ * @param[out] out      buffer for the output cyphertext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_encrypt_DES_ECB(CRYDriver *cryp,

+                                  crykey_t key_id,

+                                  size_t size,

+                                  const uint8_t *in,

+                                  uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)size;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Decryption operation using (T)DES-ECB.

+ * @note    The function operates on data buffers whose length is a multiple

+ *          of an DES block, this means that padding must be done by the

+ *          caller.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] size      size of the plaintext buffer, this number must be a

+ *                      multiple of 8

+ * @param[in] in        buffer containing the input cyphertext

+ * @param[out] out      buffer for the output plaintext

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_decrypt_DES_ECB(CRYDriver *cryp,

+                                   crykey_t key_id,

+                                   size_t size,

+                                   const uint8_t *in,

+                                   uint8_t *out) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)size;

+  (void)in;

+  (void)out;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Encryption operation using (T)DES-CBC.

+ * @note    The function operates on data buffers whose length is a multiple

+ *          of an DES block, this means that padding must be done by the

+ *          caller.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] size      size of the plaintext buffer, this number must be a

+ *                      multiple of 8

+ * @param[in] in        buffer containing the input plaintext

+ * @param[out] out      buffer for the output cyphertext

+ * @param[in] iv        64 bits input vector

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_encrypt_DES_CBC(CRYDriver *cryp,

+                                   crykey_t key_id,

+                                   size_t size,

+                                   const uint8_t *in,

+                                   uint8_t *out,

+                                   const uint8_t *iv) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)size;

+  (void)in;

+  (void)out;

+  (void)iv;

+

+  return CRY_ERR_INV_ALGO;

+}

+

+/**

+ * @brief   Decryption operation using (T)DES-CBC.

+ * @note    The function operates on data buffers whose length is a multiple

+ *          of an DES block, this means that padding must be done by the

+ *          caller.

+ *

+ * @param[in] cryp      pointer to the @p CRYDriver object

+ * @param[in] key_id    the key to be used for the operation, zero is the

+ *                      transient key, other values are keys stored in an

+ *                      unspecified way

+ * @param[in] size      size of the plaintext buffer, this number must be a

+ *                      multiple of 8

+ * @param[in] in        buffer containing the input cyphertext

+ * @param[out] out      buffer for the output plaintext

+ * @param[in] iv        64 bits input vector

+ * @return              The operation status.

+ * @retval CRY_NOERROR          if the operation succeeded.

+ * @retval CRY_ERR_INV_ALGO     if the operation is unsupported on this

+ *                              device instance.

+ * @retval CRY_ERR_INV_KEY_TYPE the selected key is invalid for this operation.

+ * @retval CRY_ERR_INV_KEY_ID   if the specified key identifier is invalid

+ *                              or refers to an empty key slot.

+ *

+ * @notapi

+ */

+cryerror_t cry_lld_decrypt_DES_CBC(CRYDriver *cryp,

+                                   crykey_t key_id,

+                                   size_t size,

+                                   const uint8_t *in,

+                                   uint8_t *out,

+                                   const uint8_t *iv) {

+

+  (void)cryp;

+  (void)key_id;

+  (void)size;

+  (void)in;

+  (void)out;

+  (void)iv;

+

+  return CRY_ERR_INV_ALGO;

+}

+

 #endif /* HAL_USE_CRY == TRUE */

 

 /** @} */

diff --git a/os/hal/templates/hal_crypto_lld.h b/os/hal/templates/hal_crypto_lld.h
index eb139e4aa..3900b5b64 100644
--- a/os/hal/templates/hal_crypto_lld.h
+++ b/os/hal/templates/hal_crypto_lld.h
@@ -35,11 +35,15 @@
  * @name    Driver capability switches

  * @{

  */

+#define CRY_LLD_SUPPORTS_AES                TRUE

 #define CRY_LLD_SUPPORTS_AES_ECB            TRUE

 #define CRY_LLD_SUPPORTS_AES_CBC            TRUE

-#define CRY_LLD_SUPPORTS_AES_CFB            TRUE

+#define CRY_LLD_SUPPORTS_AES_CFB            FALSE

 #define CRY_LLD_SUPPORTS_AES_CTR            TRUE

 #define CRY_LLD_SUPPORTS_AES_GCM            TRUE

+#define CRY_LLD_SUPPORTS_DES                TRUE

+#define CRY_LLD_SUPPORTS_DES_ECB            TRUE

+#define CRY_LLD_SUPPORTS_DES_CBC            TRUE

 /** @{ */

 

 /*===========================================================================*/

@@ -140,6 +144,14 @@ extern "C" {
                              cryalgorithm_t algorithm,

                              size_t size,

                              const uint8_t *keyp);

+  cryerror_t cry_lld_encrypt_AES(CRYDriver *cryp,

+                                 crykey_t key_id,

+                                 const uint8_t *in,

+                                 uint8_t *out);

+  cryerror_t cry_lld_decrypt_AES(CRYDriver *cryp,

+                                 crykey_t key_id,

+                                 const uint8_t *in,

+                                 uint8_t *out);

   cryerror_t cry_lld_encrypt_AES_ECB(CRYDriver *cryp,

                                      crykey_t key_id,

                                      size_t size,

@@ -204,6 +216,36 @@ extern "C" {
                                      size_t aadsize,

                                      const uint8_t *aad,

                                      uint8_t *authtag);

+  cryerror_t cry_lld_encrypt_DES(CRYDriver *cryp,

+                                 crykey_t key_id,

+                                 const uint8_t *in,

+                                 uint8_t *out);

+  cryerror_t cry_lld_decrypt_DES(CRYDriver *cryp,

+                                 crykey_t key_id,

+                                 const uint8_t *in,

+                                 uint8_t *out);

+  cryerror_t cry_lld_encrypt_DES_ECB(CRYDriver *cryp,

+                                    crykey_t key_id,

+                                    size_t size,

+                                    const uint8_t *in,

+                                    uint8_t *out);

+  cryerror_t cry_lld_decrypt_DES_ECB(CRYDriver *cryp,

+                                     crykey_t key_id,

+                                     size_t size,

+                                     const uint8_t *in,

+                                     uint8_t *out);

+  cryerror_t cry_lld_encrypt_DES_CBC(CRYDriver *cryp,

+                                     crykey_t key_id,

+                                     size_t size,

+                                     const uint8_t *in,

+                                     uint8_t *out,

+                                     const uint8_t *iv);

+  cryerror_t cry_lld_decrypt_DES_CBC(CRYDriver *cryp,

+                                     crykey_t key_id,

+                                     size_t size,

+                                     const uint8_t *in,

+                                     uint8_t *out,

+                                     const uint8_t *iv);

 #ifdef __cplusplus

 }

 #endif