From abc49200f7cdd8b9698e767cec7df95a4ec039e2 Mon Sep 17 00:00:00 2001
From: areviu <areviu.info@gmail.com>
Date: Mon, 13 Nov 2017 20:31:01 +0000
Subject: added aes and (t)des in dma mode + test suite crypto

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10993 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/ports/SAMA/LLD/CRYPTOv1/sama_aes_lld.c  |  44 +++--
 os/hal/ports/SAMA/LLD/CRYPTOv1/sama_tdes_lld.c | 233 +++++++++++++------------
 os/hal/ports/SAMA/SAMA5D2x/hal_crypto_lld.c    |  78 +++++----
 3 files changed, 197 insertions(+), 158 deletions(-)

(limited to 'os')

diff --git a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_aes_lld.c b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_aes_lld.c
index 563269d42..f8d9124db 100644
--- a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_aes_lld.c
+++ b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_aes_lld.c
@@ -16,10 +16,6 @@
 #include "hal.h"
 #include "sama_crypto_lld.h"
 
-
-
-
-
 void sama_aes_lld_write_key(const uint32_t * key, const uint32_t * vectors,
 		uint32_t len) {
 
@@ -160,6 +156,8 @@ cryerror_t sama_aes_lld_process_polling(CRYDriver *cryp, aesparams *params,
 cryerror_t sama_aes_lld_process_dma(CRYDriver *cryp,  aesparams *params,
 		const uint8_t *in, uint8_t *out, size_t indata_len) {
 
+	cryerror_t ret;
+
 	osalDbgAssert(cryp->thread == NULL, "already waiting");
 
 	//set chunk size
@@ -168,7 +166,7 @@ cryerror_t sama_aes_lld_process_dma(CRYDriver *cryp,  aesparams *params,
 	if ((cryp->config->cfbs != AES_CFBS_128))
 		cryp->dmachunksize = DMA_CHUNK_SIZE_1;
 
-	//set dma with
+	//set dma width
 	cryp->dmawith = DMA_DATA_WIDTH_WORD;
 
 	if (cryp->config->cfbs == AES_CFBS_16)
@@ -198,6 +196,9 @@ cryerror_t sama_aes_lld_process_dma(CRYDriver *cryp,  aesparams *params,
 	XDMAC_CC_DAM_FIXED_AM |
 	XDMAC_CC_PERID(PERID_AES_TX);
 
+	dmaChannelSetMode(cryp->dmarx, cryp->rxdmamode);
+	dmaChannelSetMode(cryp->dmatx, cryp->txdmamode);
+
 	/* Writing channel */
 	dmaChannelSetSource(cryp->dmatx, in);
 	dmaChannelSetDestination(cryp->dmatx, AES->AES_IDATAR);
@@ -209,16 +210,33 @@ cryerror_t sama_aes_lld_process_dma(CRYDriver *cryp,  aesparams *params,
 	dmaChannelSetDestination(cryp->dmarx, out);
 	dmaChannelSetTransactionSize(cryp->dmarx,  ( indata_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith)));
 
-	if (params->encrypt)
-		AES->AES_MR |= AES_MR_CIPHER;
-	else
-		AES->AES_MR &= ~AES_MR_CIPHER;
+	//AES soft reset
+		AES->AES_CR = AES_CR_SWRST;
+
+	//AES set op mode
+		AES->AES_MR |= ((AES_MR_OPMOD_Msk & (params->mode)) | AES_MR_CKEY_PASSWD);
+
+	//AES set key size
+	ret = sama_aes_lld_set_key_size(cryp->key0_size);
+
+	if (ret == CRY_NOERROR) {
 
-	AES->AES_MR |= (((AES_MR_SMOD_Msk & (AES_MR_SMOD_IDATAR0_START)))
-			| AES_MR_CKEY_PASSWD);
+		AES->AES_MR |= (AES_MR_CFBS(cryp->config->cfbs) | AES_MR_CKEY_PASSWD);
+
+		sama_aes_lld_write_key(key0_buffer,( const uint32_t *) params->iv, cryp->key0_size);
 
-	//Enable aes interrupt
-	AES->AES_IER = AES_IER_DATRDY;
+		if (params->encrypt)
+			AES->AES_MR |= AES_MR_CIPHER;
+		else
+			AES->AES_MR &= ~AES_MR_CIPHER;
+
+		AES->AES_MR |= (((AES_MR_SMOD_Msk & (AES_MR_SMOD_IDATAR0_START)))
+				| AES_MR_CKEY_PASSWD);
+
+		//Enable aes interrupt
+		AES->AES_IER = AES_IER_DATRDY;
+
+	}
 
 	osalSysLock();
 
diff --git a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_tdes_lld.c b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_tdes_lld.c
index 2e804cf8e..c6de6fca7 100644
--- a/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_tdes_lld.c
+++ b/os/hal/ports/SAMA/LLD/CRYPTOv1/sama_tdes_lld.c
@@ -1,18 +1,18 @@
 /*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+ ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
 
-    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
+ 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
+ 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.
-*/
+ 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 "hal.h"
 #include "sama_crypto_lld.h"
 #include "sama_tdes_lld.h"
@@ -135,115 +135,122 @@ cryerror_t sama_tdes_lld_dma(CRYDriver *cryp, tdes_config_t *params,
 		bool encrypt, const uint8_t *data, size_t data_len, uint8_t * out,
 		const uint8_t *iv) {
 
-
 	uint32_t mode = 0;
 	uint32_t *vectors = (uint32_t *) iv;
 
 	cryp->dmachunksize = DMA_CHUNK_SIZE_1;
-	cryp->dmawith = 4;
+
+	cryp->dmawith = DMA_DATA_WIDTH_WORD;
+
 	if ((params->mode == TDES_MODE_CFB)) {
-			if (cryp->config->cfbs == TDES_CFBS_16)
-				cryp->dmawith  = DMA_DATA_WIDTH_HALF_WORD;
-			if (cryp->config->cfbs == TDES_CFBS_8)
-				cryp->dmawith  = DMA_DATA_WIDTH_BYTE;
+		if (cryp->config->cfbs == TDES_CFBS_16)
+			cryp->dmawith = DMA_DATA_WIDTH_HALF_WORD;
+		if (cryp->config->cfbs == TDES_CFBS_8)
+			cryp->dmawith = DMA_DATA_WIDTH_BYTE;
+	}
+
+	cryp->rxdmamode = XDMAC_CC_TYPE_PER_TRAN |
+	XDMAC_CC_PROT_SEC |
+	XDMAC_CC_MBSIZE_SINGLE |
+	XDMAC_CC_DSYNC_PER2MEM | XDMAC_CC_CSIZE(cryp->dmachunksize) |
+	XDMAC_CC_DWIDTH(cryp->dmawith) |
+	XDMAC_CC_SIF_AHB_IF1 |
+	XDMAC_CC_DIF_AHB_IF0 |
+	XDMAC_CC_SAM_FIXED_AM |
+	XDMAC_CC_DAM_INCREMENTED_AM |
+	XDMAC_CC_PERID(PERID_TDES_RX);
+
+	cryp->txdmamode = XDMAC_CC_TYPE_PER_TRAN |
+	XDMAC_CC_PROT_SEC |
+	XDMAC_CC_MBSIZE_SINGLE |
+	XDMAC_CC_DSYNC_MEM2PER | XDMAC_CC_CSIZE(cryp->dmachunksize) |
+	XDMAC_CC_DWIDTH(cryp->dmawith) |
+	XDMAC_CC_SIF_AHB_IF0 |
+	XDMAC_CC_DIF_AHB_IF1 |
+	XDMAC_CC_SAM_INCREMENTED_AM |
+	XDMAC_CC_DAM_FIXED_AM |
+	XDMAC_CC_PERID(PERID_TDES_TX);
+
+	dmaChannelSetMode(cryp->dmarx, cryp->rxdmamode);
+	dmaChannelSetMode(cryp->dmatx, cryp->txdmamode);
+
+	/* Writing channel */
+	dmaChannelSetSource(cryp->dmatx, data);
+	dmaChannelSetDestination(cryp->dmatx, TDES->TDES_IDATAR);
+	dmaChannelSetTransactionSize(cryp->dmatx,
+			(data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith)));
+
+	//  ( data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith))
+
+	/* Reading channel */
+	dmaChannelSetSource(cryp->dmarx, TDES->TDES_ODATAR);
+	dmaChannelSetDestination(cryp->dmarx, out);
+	dmaChannelSetTransactionSize(cryp->dmarx,
+			(data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith)));
+
+	//soft reset
+	TDES->TDES_CR = TDES_CR_SWRST;
+
+	//configure
+	if (encrypt)
+		mode |= TDES_MR_CIPHER_ENCRYPT;
+	else
+		mode |= TDES_MR_CIPHER_DECRYPT;
+
+	if (cryp->key0_size == 16)
+		mode |= (TDES_KEY_TWO << 4);
+	else
+		mode |= (TDES_KEY_THREE << 4);
+
+	mode |= TDES_MR_TDESMOD(params->algo);
+
+	mode |= TDES_MR_SMOD_IDATAR0_START;
+
+	mode |= TDES_MR_OPMOD(params->mode);
+
+	if (cryp->config != NULL) {
+		mode |= TDES_MR_CFBS(cryp->config->cfbs);
 	}
-	cryp->rxdmamode =
-		XDMAC_CC_DSYNC_PER2MEM |
-		XDMAC_CC_CSIZE(cryp->dmachunksize) |
-		XDMAC_CC_DWIDTH(cryp->dmawith) |
-		XDMAC_CC_SIF_AHB_IF1 |
-		XDMAC_CC_DIF_AHB_IF0 |
-		XDMAC_CC_SAM_FIXED_AM |
-		XDMAC_CC_DAM_INCREMENTED_AM |
-		XDMAC_CC_PERID(PERID_TDES_RX);
-
-		cryp->txdmamode =
-		XDMAC_CC_DSYNC_MEM2PER |
-		XDMAC_CC_CSIZE(cryp->dmachunksize) |
-		XDMAC_CC_DWIDTH(cryp->dmawith) |
-		XDMAC_CC_SIF_AHB_IF0 |
-		XDMAC_CC_DIF_AHB_IF1 |
-		XDMAC_CC_SAM_INCREMENTED_AM |
-		XDMAC_CC_DAM_FIXED_AM |
-		XDMAC_CC_PERID(PERID_TDES_TX);
-
-		  dmaChannelSetMode(cryp->dmarx, cryp->rxdmamode);
-		  dmaChannelSetMode(cryp->dmatx, cryp->txdmamode);
-
-		/* Writing channel */
-		dmaChannelSetSource(cryp->dmatx, data);
-		dmaChannelSetDestination(cryp->dmatx, TDES->TDES_IDATAR);
-		dmaChannelSetTransactionSize(cryp->dmatx, ( data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith)) );
-
-		//  ( data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith))
-
-		/* Reading channel */
-		dmaChannelSetSource(cryp->dmarx, TDES->TDES_ODATAR);
-		dmaChannelSetDestination(cryp->dmarx, out);
-		dmaChannelSetTransactionSize(cryp->dmarx, ( data_len / DMA_DATA_WIDTH_TO_BYTE(cryp->dmawith))  );
-
-
-		//soft reset
-			TDES->TDES_CR = TDES_CR_SWRST;
-			//configure
-			if (encrypt)
-				mode |= TDES_MR_CIPHER_ENCRYPT;
-			else
-				mode |= TDES_MR_CIPHER_DECRYPT;
-
-			if (cryp->key0_size == 16)
-				mode |= (TDES_KEY_TWO << 4);
-			else
-				mode |= (TDES_KEY_THREE << 4);
-
-			mode |= TDES_MR_TDESMOD(params->algo);
-
-			mode |= TDES_MR_SMOD(2);
-
-			mode |= TDES_MR_OPMOD(params->mode);
-
-			TDES->TDES_MR = mode;
-
-				//write keys
-				/* Write the 64-bit key(s) in the different Key Word Registers,
-				 * depending on whether one, two or three keys are required. */
-
-				TDES->TDES_KEY1WR[0] = key0_buffer[0];
-				TDES->TDES_KEY1WR[1] = key0_buffer[1];
-
-				if (cryp->key0_size > 8) {
-					TDES->TDES_KEY2WR[0] = key0_buffer[2];
-					TDES->TDES_KEY2WR[1] = key0_buffer[3];
-				} else {
-					TDES->TDES_KEY2WR[0] = 0x0;
-					TDES->TDES_KEY2WR[1] = 0x0;
-				}
-				if (cryp->key0_size > 16) {
-					TDES->TDES_KEY3WR[0] = key0_buffer[4];
-					TDES->TDES_KEY3WR[1] = key0_buffer[5];
-				} else {
-					TDES->TDES_KEY3WR[0] = 0x0;
-					TDES->TDES_KEY3WR[1] = 0x0;
-				}
-				/* The Initialization Vector Registers apply to all modes except ECB. */
-				if (params->mode != TDES_MODE_ECB && vectors != NULL) {
-					TDES->TDES_IVR[0] = vectors[0];
-					TDES->TDES_IVR[1] = vectors[1];
-				}
-				if (params->algo == TDES_ALGO_XTEA) {
-					TDES->TDES_XTEA_RNDR = TDES_XTEA_RNDR_XTEA_RNDS(32);
-				}
-
-
-		osalSysLock();
-
-		dmaChannelEnable(cryp->dmarx);
-		dmaChannelEnable(cryp->dmatx);
-
-
-		osalThreadSuspendS(&cryp->thread);
-		osalSysUnlock();
 
+	TDES->TDES_MR = mode;
+
+	//write keys
+	TDES->TDES_KEY1WR[0] = key0_buffer[0];
+	TDES->TDES_KEY1WR[1] = key0_buffer[1];
+
+	if (cryp->key0_size > 8) {
+		TDES->TDES_KEY2WR[0] = key0_buffer[2];
+		TDES->TDES_KEY2WR[1] = key0_buffer[3];
+	} else {
+		TDES->TDES_KEY2WR[0] = 0x0;
+		TDES->TDES_KEY2WR[1] = 0x0;
+	}
+	if (cryp->key0_size > 16) {
+		TDES->TDES_KEY3WR[0] = key0_buffer[4];
+		TDES->TDES_KEY3WR[1] = key0_buffer[5];
+	} else {
+		TDES->TDES_KEY3WR[0] = 0x0;
+		TDES->TDES_KEY3WR[1] = 0x0;
+	}
+	/* The Initialization Vector Registers apply to all modes except ECB. */
+	if (params->mode != TDES_MODE_ECB && vectors != NULL) {
+		TDES->TDES_IVR[0] = vectors[0];
+		TDES->TDES_IVR[1] = vectors[1];
+	}
+	if (params->algo == TDES_ALGO_XTEA) {
+		TDES->TDES_XTEA_RNDR = TDES_XTEA_RNDR_XTEA_RNDS(32);
+	}
+
+//enable interrutps
+	TDES->TDES_IER = TDES_IER_DATRDY;
+
+	osalSysLock();
+
+	dmaChannelEnable(cryp->dmarx);
+	dmaChannelEnable(cryp->dmatx);
+
+	osalThreadSuspendS(&cryp->thread);
+	osalSysUnlock();
 
 	return CRY_NOERROR;
 }
diff --git a/os/hal/ports/SAMA/SAMA5D2x/hal_crypto_lld.c b/os/hal/ports/SAMA/SAMA5D2x/hal_crypto_lld.c
index 7665f9204..8d8a92009 100644
--- a/os/hal/ports/SAMA/SAMA5D2x/hal_crypto_lld.c
+++ b/os/hal/ports/SAMA/SAMA5D2x/hal_crypto_lld.c
@@ -817,26 +817,24 @@ cryerror_t cry_lld_encrypt_DES(CRYDriver *cryp, crykey_t key_id,
 
 	cryerror_t ret = CRY_NOERROR;
 
-	if(key_id != 0 )
+	if (key_id != 0)
 		return CRY_ERR_INV_KEY_ID;
 
-	if (  ( cryp->config->tdes_algo == TDES_ALGO_SINGLE && cryp->key0_size != 8 ) ||
-		 ( cryp->config->tdes_algo == TDES_ALGO_TRIPLE && cryp->key0_size != 24 ) )
-		 return CRY_ERR_INV_KEY_SIZE;
+	if ((cryp->config->tdes_algo == TDES_ALGO_SINGLE && cryp->key0_size != 8)
+			|| (cryp->config->tdes_algo == TDES_ALGO_TRIPLE
+					&& !(cryp->key0_size == 16 || cryp->key0_size == 24)))
+		return CRY_ERR_INV_KEY_SIZE;
 
-	tdes_config_t params = {		cryp->config->tdes_algo,
-									0
-							};
+	tdes_config_t params = { cryp->config->tdes_algo, 0 };
 
-		if (!(cryp->enabledPer & TDES_PER)) {
-			cryp->enabledPer |= TDES_PER;
-			pmcEnableDES();
-		}
+	if (!(cryp->enabledPer & TDES_PER)) {
+		cryp->enabledPer |= TDES_PER;
+		pmcEnableDES();
+	}
 
-		ret = sama_tdes_lld_polling(cryp,&params, true, in,
-				8, out,NULL);
+	ret = sama_tdes_lld_polling(cryp, &params, true, in, 8, out, NULL);
 
-			return ret;
+	return ret;
 }
 
 /**
@@ -865,21 +863,23 @@ cryerror_t cry_lld_decrypt_DES(CRYDriver *cryp, crykey_t key_id,
 		const uint8_t *in, uint8_t *out) {
 
 	cryerror_t ret = CRY_NOERROR;
-		tdes_config_t params = {		cryp->config->tdes_algo,
-										0
-										};
-		if(key_id != 0 )
-						  return CRY_ERR_INV_KEY_ID;
-		if (!(cryp->enabledPer & TDES_PER)) {
-			cryp->enabledPer |= TDES_PER;
-			pmcEnableDES();
-		}
+	tdes_config_t params = { cryp->config->tdes_algo, 0 };
+	if (key_id != 0)
+		return CRY_ERR_INV_KEY_ID;
 
-		ret = sama_tdes_lld_polling(cryp,&params, false, in,
-				8, out,NULL);
+	if ((cryp->config->tdes_algo == TDES_ALGO_SINGLE && cryp->key0_size != 8)
+			|| (cryp->config->tdes_algo == TDES_ALGO_TRIPLE
+					&& !(cryp->key0_size == 16 || cryp->key0_size == 24)))
+		return CRY_ERR_INV_KEY_SIZE;
+
+	if (!(cryp->enabledPer & TDES_PER)) {
+		cryp->enabledPer |= TDES_PER;
+		pmcEnableDES();
+	}
 
+	ret = sama_tdes_lld_polling(cryp, &params, false, in, 8, out, NULL);
 
-			return ret;
+	return ret;
 }
 
 /**
@@ -911,17 +911,20 @@ cryerror_t cry_lld_encrypt_DES_ECB(CRYDriver *cryp, crykey_t key_id,
 
 	cryerror_t ret = CRY_NOERROR;
 	tdes_config_t params = { cryp->config->tdes_algo, TDES_MODE_ECB };
+
 	if (key_id != 0)
 		return CRY_ERR_INV_KEY_ID;
 
-	if (cryp->key0_size != 16 && cryp->key0_size != 24) {
+	if (cryp->config->tdes_algo == TDES_ALGO_SINGLE && cryp->key0_size != 8) {
+			return CRY_ERR_INV_KEY_SIZE;
+	}
+	if (cryp->config->tdes_algo == TDES_ALGO_TRIPLE && !(cryp->key0_size == 16 || cryp->key0_size == 24) ) {
 		return CRY_ERR_INV_KEY_SIZE;
 	}
 
 	if (!(cryp->enabledPer & TDES_PER)) {
 		cryp->enabledPer |= TDES_PER;
-		pmcEnableDES()
-		;
+		pmcEnableDES();
 	}
 	if (cryp->config->transfer_mode == TRANSFER_POLLING)
 		ret = sama_tdes_lld_polling(cryp, &params, true, in, size, out, NULL);
@@ -963,9 +966,12 @@ cryerror_t cry_lld_decrypt_DES_ECB(CRYDriver *cryp, crykey_t key_id,
 	if (key_id != 0)
 		return CRY_ERR_INV_KEY_ID;
 
-	if (cryp->key0_size != 16 && cryp->key0_size != 24) {
-		return CRY_ERR_INV_KEY_SIZE;
-	}
+	if (cryp->config->tdes_algo == TDES_ALGO_SINGLE && cryp->key0_size != 8) {
+				return CRY_ERR_INV_KEY_SIZE;
+		}
+		if (cryp->config->tdes_algo == TDES_ALGO_TRIPLE && !(cryp->key0_size == 16 || cryp->key0_size == 24) ) {
+			return CRY_ERR_INV_KEY_SIZE;
+		}
 	if (!(cryp->enabledPer & TDES_PER)) {
 		cryp->enabledPer |= TDES_PER;
 		pmcEnableDES()
@@ -1011,9 +1017,13 @@ cryerror_t cry_lld_encrypt_DES_CBC(CRYDriver *cryp, crykey_t key_id,
 
 	cryerror_t ret = CRY_NOERROR;
 	tdes_config_t params = { cryp->config->tdes_algo, TDES_MODE_CBC };
+
 	if (key_id != 0)
 		return CRY_ERR_INV_KEY_ID;
 
+	if (cryp->config->tdes_algo == TDES_ALGO_SINGLE)
+			return CRY_ERR_INV_ALGO;
+
 	if (cryp->key0_size != 16 && cryp->key0_size != 24) {
 		return CRY_ERR_INV_KEY_SIZE;
 	}
@@ -1061,9 +1071,13 @@ cryerror_t cry_lld_decrypt_DES_CBC(CRYDriver *cryp, crykey_t key_id,
 
 	cryerror_t ret = CRY_NOERROR;
 	tdes_config_t params = { cryp->config->tdes_algo, TDES_MODE_CBC };
+
 	if (key_id != 0)
 		return CRY_ERR_INV_KEY_ID;
 
+	if (cryp->config->tdes_algo == TDES_ALGO_SINGLE)
+		return CRY_ERR_INV_ALGO;
+
 	if (cryp->key0_size != 16 && cryp->key0_size != 24) {
 		return CRY_ERR_INV_KEY_SIZE;
 	}
-- 
cgit v1.2.3