From nobody Mon Feb 9 13:36:31 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012044.outbound.protection.outlook.com [52.101.53.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A98C43563F1; Tue, 11 Nov 2025 11:22:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762860136; cv=fail; b=SoHLnwC2neD0EMYd0AP2Vk/tK/oQRF5l/vrXAnm3Nm1ofnJl6824spj7l3GYogvUyvkJcmiF0PgJESNjW7jIPJtY5DqpApc63R5nOywgL/fRfJXnchJGVtPjmVRi4gwbkSX51YBLkA37SJyofKIL5+G/OAlNqg36bH1mn346pjQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762860136; c=relaxed/simple; bh=AS1oGlma6sB5lPPcVownIO9jQwVCnsBEkp4MAEEi67c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A2FP+Uq6X7SiY1jz49EtDLbZQlE5V1kNbhNNpEBQFM9mHkqauHAi/xug3reAsjqAomwtauGtREgo0H1iip8B13zmWnT6OHpN/WSlxFztvKevnJsG0/Dq3kGRK/zht64L15WkdaIpl/e9CmmAgGjG5OYBVQ7bGOnnE/N1oeDlb4s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=q7zFbJnd; arc=fail smtp.client-ip=52.101.53.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="q7zFbJnd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SSpVycNn1N2Gey511pGR1e1on/cz85yxWYorpaCGOKY15MjZ6rEY9zZQ05Cqrk3wky+UIuYiIvmNskwngO3gp4SCdT0H74SJh6NOaXpmrFzCfAIBMatJZGbbtPxHVhB2ONufMGl7Q5yLZ3Hf3+7Z1t+u4VnPletoDBXj/nEbbeQEewD2W+E8gm4GzE5cwVWjmZMr9Ssug20pb8wh+RR7gB4K7kC8OC6mvW+om+O3C7qgFpFivZ1PQvPHDZKrT07HDFZnorGtOM528aHnntEr2gNzryPKJJRmr7be//fMeFocQuTwqo1SzoWXnUDg9nssvDJTm+lJ/TTG8GGqJUrRXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BRhZ99t5iP+KnJhFnmSMssKX+OS5Q9bjlarJIZuUX8s=; b=uyPlowcVs3V5UdlSrOH4F6Y+6F2POIiu+W/WjYUzLpwZ3LPike53Jm/a7On0rCqty/uyT3zZenxeHhMwzKuzkQVryAXzmw542veq58A9ScrwcwcX+9ko+a4i69haBTXA+fcjxOfHo0pmOrsHdWu+syCLdxR+r3HJiIbYH/3n23GjeR4Q6c+jIEFSaf7Ci+n8hDS7Si/6GgDYiBXW3npnvZW42cxZWxOZGh+VYjCj2lgDUAKkT44z7wW1+db/IAjoAaPbk6spFhzb0CItWXzFEWa3a4hYPbC+OPjyIba0eFihl4pFfuMoO8iV/MsEIWtbbDz64+9zAF4+cfmgLzW4GQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.194) smtp.rcpttodomain=gondor.apana.org.au smtp.mailfrom=ti.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=ti.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BRhZ99t5iP+KnJhFnmSMssKX+OS5Q9bjlarJIZuUX8s=; b=q7zFbJnd/qHCfcqZnL1wh/8q2wL7gMhvLaJU3BXakZv1VcaIkW9O8ZD+9Ku8NPUyCVMMGPmFXEZqTMr3XdYnFRyPmLcVtHN8L3ru4saCSGPXwwY6xLYXO40amIe5eNk53tA2XYnDi/HQ/5RU7iPqeoLccceeOSnQP5bo3wJKnbA= Received: from PH8P220CA0021.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:345::13) by CH3PR10MB7574.namprd10.prod.outlook.com (2603:10b6:610:180::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.15; Tue, 11 Nov 2025 11:22:08 +0000 Received: from SN1PEPF000252A1.namprd05.prod.outlook.com (2603:10b6:510:345:cafe::ea) by PH8P220CA0021.outlook.office365.com (2603:10b6:510:345::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9320.15 via Frontend Transport; Tue, 11 Nov 2025 11:22:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.194) smtp.mailfrom=ti.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ti.com; Received-SPF: Pass (protection.outlook.com: domain of ti.com designates 198.47.21.194 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.194; helo=flwvzet200.ext.ti.com; pr=C Received: from flwvzet200.ext.ti.com (198.47.21.194) by SN1PEPF000252A1.mail.protection.outlook.com (10.167.242.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9320.13 via Frontend Transport; Tue, 11 Nov 2025 11:22:06 +0000 Received: from DFLE204.ent.ti.com (10.64.6.62) by flwvzet200.ext.ti.com (10.248.192.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Tue, 11 Nov 2025 05:22:04 -0600 Received: from DFLE201.ent.ti.com (10.64.6.59) by DFLE204.ent.ti.com (10.64.6.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Tue, 11 Nov 2025 05:22:03 -0600 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE201.ent.ti.com (10.64.6.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Tue, 11 Nov 2025 05:22:03 -0600 Received: from pratham-Workstation-PC (pratham-workstation-pc.dhcp.ti.com [10.24.69.191]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 5ABBM29c828548; Tue, 11 Nov 2025 05:22:03 -0600 From: T Pratham To: T Pratham , Herbert Xu , "David S. Miller" CC: Manorit Chawdhry , Kamlesh Gurudasani , Shiva Tripathi , Kavitha Malarvizhi , Vishal Mahaveer , , Subject: [PATCH v6 4/4] crypto: ti - Add support for AES-CCM in DTHEv2 driver Date: Tue, 11 Nov 2025 16:38:33 +0530 Message-ID: <20251111112137.976121-5-t-pratham@ti.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251111112137.976121-1-t-pratham@ti.com> References: <20251111112137.976121-1-t-pratham@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A1:EE_|CH3PR10MB7574:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d8ff193-8581-4443-44b5-08de21148bf8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?foDljOu+GMEwznjL45GyMQMAol/NA0j+ZwtxbCHG344V77kbWnWrZNHXQqEc?= =?us-ascii?Q?sryqMqpX+yjzKW6mzBw86R01RpSSlV2FfFCXtqM7V9rbzvQQUd0CGsYDWcwk?= =?us-ascii?Q?mcdsSVy3ggR15gR7bCeZ6TVzTsY/x+VWg2oOvzalQ0Mh6ZPVNkB0GAxmkNl6?= =?us-ascii?Q?MTNVDbE/Kzea2BoJrJdiZ6QsOVfkExCsr6vcm60KgZ09IESUjctnpEkvYuHy?= =?us-ascii?Q?6VKQJFnQf5nahvJm0E5p1jAf3n9FxZ9dyF/KcF7G3Ct4laJ0Y/iLw5ddMHtC?= =?us-ascii?Q?4J4vUgxvOjJvfTlBA/8ozSktVnacy/ZtwS7Esb9zf8Sx3Zh34os4O8QlwPRS?= =?us-ascii?Q?Rd0bY5t30zjgEIjN5pfgA4KWBEgTH6iEtc/spmfM7ce4I96YirqGdmyaR6bE?= =?us-ascii?Q?oKHzT35p3zHQwrl++KJZ78Jgg/sWc90zwVXX5E5RWQys27pTvbddc8Z4uKv8?= =?us-ascii?Q?3LwdPWRvF03EiId0pbHGlIoDQuW84IkZKREtQsmKrqkGh/Sgh0neELUt9j5o?= =?us-ascii?Q?xGLQAuJBVXLoPxvwplizGUgzdwe0GCEY3aOIbEAux/LZ6tUYJOY2OsJosoJC?= =?us-ascii?Q?EnLI+HUr/jz6auiHpzo8h0wjAKGnjSiUmMDJ8iKIbl2tc3jHEKMusxWyNIsx?= =?us-ascii?Q?icnvS+5Akvu5beINSSXGtsoLU6b383Xf80T52RV0cXlF2lFayr5frovN+71n?= =?us-ascii?Q?EDCxW+HP9YGkGFfHO2lL6hk4bgVPRoXACUrafVxfIzG+ViGIEsqU96CPhRo7?= =?us-ascii?Q?ZmUkBpwJwhyi5vdAY8c6vLVQ+kr3WrQ46HhCeDSt4zxKapFHb/E0DXH7X5tq?= =?us-ascii?Q?fNQjo9kVDBSxgBvjzu9hpRJsV/vGbTBIRt3DbqqmDglYcJwk4q3uAdF5RSFs?= =?us-ascii?Q?fr5H4LPJ89kzbC0Mm+eFOVJsWynLLbVoPawj06G30x+Wim/BGNyuyVmWut2a?= =?us-ascii?Q?v+MSkBf5Sz0Z1Gqk4t+J+HTAAAwA8tpDdo7lPyPpZ8eqHHbvGrpkbMVrVvAY?= =?us-ascii?Q?DBEIykIHC2/0RovpfjXOlIsFaEMCw6BQK84tBl+8n+8RgrIUHEpWRPJJR2ma?= =?us-ascii?Q?pm7tzutGmkXQM0kZ6x4AJAw9dUhvolJIj4mBpJ/lqA/R2zdrNaqr+oB8NYVH?= =?us-ascii?Q?D0cVR+l+b/j7J/uyg5F4QWygD6UDw3ssc5pnTJJ9bIvc+7stqNiv8eCHryO3?= =?us-ascii?Q?9265JKidqo1DSmzqH3FiMSDjlY33SEzK3YLRndRFPCER/6NvlTXrerRUUW2/?= =?us-ascii?Q?rnRrpGvqJCxhQSlX0VAVAteUuw5eonSLgfdKTLAfhi4RrqSfOpaIoiP9JhF9?= =?us-ascii?Q?ewO4oo8mUMjnqcTLLpbX4n/nSE1Io8raabboB3EMeespmI7d4TTd+q4jY4pD?= =?us-ascii?Q?AOyc4zfB7/bk0hWIT/Q+UUTwVdFXjttLZMV8FW+2sxrTYqIbAUB3QM67TOZ7?= =?us-ascii?Q?rEEj8VD/n5ac4mQrrQ9EZNrhhqNGTvPAgtlxjS8t+sJux287lCm7r841cKiI?= =?us-ascii?Q?uhvvjCuMRsdn4h1eDB0hq1C8pQAk2NW7UbJ1anWeSXsw62dHRfaLe89cMXfu?= =?us-ascii?Q?SyuDQAq94i8S4M9J4lE=3D?= X-Forefront-Antispam-Report: CIP:198.47.21.194;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet200.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2025 11:22:06.4214 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d8ff193-8581-4443-44b5-08de21148bf8 X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.194];Helo=[flwvzet200.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7574 Content-Type: text/plain; charset="utf-8" AES-CCM is an AEAD algorithm supporting both encryption and authentication of data. This patch introduces support for AES-CCM AEAD algorithm in the DTHEv2 driver. Signed-off-by: T Pratham --- drivers/crypto/ti/Kconfig | 1 + drivers/crypto/ti/dthev2-aes.c | 129 ++++++++++++++++++++++++++---- drivers/crypto/ti/dthev2-common.h | 1 + 3 files changed, 115 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/ti/Kconfig b/drivers/crypto/ti/Kconfig index 221e483737439..1a3a571ac8cef 100644 --- a/drivers/crypto/ti/Kconfig +++ b/drivers/crypto/ti/Kconfig @@ -9,6 +9,7 @@ config CRYPTO_DEV_TI_DTHEV2 select CRYPTO_CTR select CRYPTO_XTS select CRYPTO_GCM + select CRYPTO_CCM select SG_SPLIT help This enables support for the TI DTHE V2 hw cryptography engine diff --git a/drivers/crypto/ti/dthev2-aes.c b/drivers/crypto/ti/dthev2-aes.c index f52e888cc7bd9..5e46733736a7a 100644 --- a/drivers/crypto/ti/dthev2-aes.c +++ b/drivers/crypto/ti/dthev2-aes.c @@ -16,6 +16,7 @@ =20 #include "dthev2-common.h" =20 +#include #include #include #include @@ -69,6 +70,7 @@ enum aes_ctrl_mode_masks { AES_CTRL_CTR_MASK =3D BIT(6), AES_CTRL_XTS_MASK =3D BIT(12) | BIT(11), AES_CTRL_GCM_MASK =3D BIT(17) | BIT(16) | BIT(6), + AES_CTRL_CCM_MASK =3D BIT(18) | BIT(6), }; =20 #define DTHE_AES_CTRL_MODE_CLEAR_MASK ~GENMASK(28, 5) @@ -81,6 +83,11 @@ enum aes_ctrl_mode_masks { =20 #define DTHE_AES_CTRL_CTR_WIDTH_128B (BIT(7) | BIT(8)) =20 +#define DTHE_AES_CCM_L_FROM_IV_MASK GENMASK(2, 0) +#define DTHE_AES_CCM_M_BITS GENMASK(2, 0) +#define DTHE_AES_CTRL_CCM_L_FIELD_MASK GENMASK(21, 19) +#define DTHE_AES_CTRL_CCM_M_FIELD_MASK GENMASK(24, 22) + #define DTHE_AES_CTRL_SAVE_CTX_SET BIT(29) =20 #define DTHE_AES_CTRL_OUTPUT_READY BIT_MASK(0) @@ -96,6 +103,8 @@ enum aes_ctrl_mode_masks { #define AES_BLOCK_WORDS (AES_BLOCK_SIZE / sizeof(u32)) #define AES_IV_WORDS AES_BLOCK_WORDS #define DTHE_AES_GCM_AAD_MAXLEN (BIT_ULL(32) - 1) +#define DTHE_AES_CCM_AAD_MAXLEN (BIT(16) - BIT(8)) +#define DTHE_AES_CCM_CRYPT_MAXLEN (BIT_ULL(61) - 1) #define POLL_TIMEOUT_INTERVAL HZ =20 static struct scatterlist *dthe_chain_pad_sg(struct scatterlist *sg, @@ -304,6 +313,13 @@ static void dthe_aes_set_ctrl_key(struct dthe_tfm_ctx = *ctx, case DTHE_AES_GCM: ctrl_val |=3D AES_CTRL_GCM_MASK; break; + case DTHE_AES_CCM: + ctrl_val |=3D AES_CTRL_CCM_MASK; + ctrl_val |=3D FIELD_PREP(DTHE_AES_CTRL_CCM_L_FIELD_MASK, + (iv_in[0] & DTHE_AES_CCM_L_FROM_IV_MASK)); + ctrl_val |=3D FIELD_PREP(DTHE_AES_CTRL_CCM_M_FIELD_MASK, + ((ctx->authsize - 2) >> 1) & DTHE_AES_CCM_M_BITS); + break; } =20 if (iv_in) { @@ -824,10 +840,6 @@ static int dthe_aead_setkey(struct crypto_aead *tfm, c= onst u8 *key, unsigned int if (keylen !=3D AES_KEYSIZE_128 && keylen !=3D AES_KEYSIZE_192 && keylen = !=3D AES_KEYSIZE_256) return -EINVAL; =20 - ctx->aes_mode =3D DTHE_AES_GCM; - ctx->keylen =3D keylen; - memcpy(ctx->key, key, keylen); - crypto_sync_aead_clear_flags(ctx->aead_fb, CRYPTO_TFM_REQ_MASK); crypto_sync_aead_set_flags(ctx->aead_fb, crypto_aead_get_flags(tfm) & @@ -836,6 +848,28 @@ static int dthe_aead_setkey(struct crypto_aead *tfm, c= onst u8 *key, unsigned int return crypto_sync_aead_setkey(ctx->aead_fb, key, keylen); } =20 +static int dthe_gcm_aes_setkey(struct crypto_aead *tfm, const u8 *key, uns= igned int keylen) +{ + struct dthe_tfm_ctx *ctx =3D crypto_aead_ctx(tfm); + + ctx->aes_mode =3D DTHE_AES_GCM; + ctx->keylen =3D keylen; + memcpy(ctx->key, key, keylen); + + return dthe_aead_setkey(tfm, key, keylen); +} + +static int dthe_ccm_aes_setkey(struct crypto_aead *tfm, const u8 *key, uns= igned int keylen) +{ + struct dthe_tfm_ctx *ctx =3D crypto_aead_ctx(tfm); + + ctx->aes_mode =3D DTHE_AES_CCM; + ctx->keylen =3D keylen; + memcpy(ctx->key, key, keylen); + + return dthe_aead_setkey(tfm, key, keylen); +} + static int dthe_aead_setauthsize(struct crypto_aead *tfm, unsigned int aut= hsize) { struct dthe_tfm_ctx *ctx =3D crypto_aead_ctx(tfm); @@ -994,14 +1028,18 @@ static int dthe_aead_run(struct crypto_engine *engin= e, void *areq) writel_relaxed(1, aes_base_reg + DTHE_P_AES_AUTH_LENGTH); } =20 - if (req->iv) { - memcpy(iv_in, req->iv, GCM_AES_IV_SIZE); + if (ctx->aes_mode =3D=3D DTHE_AES_GCM) { + if (req->iv) { + memcpy(iv_in, req->iv, GCM_AES_IV_SIZE); + } else { + iv_in[0] =3D 0; + iv_in[1] =3D 0; + iv_in[2] =3D 0; + } + iv_in[3] =3D 0x01000000; } else { - iv_in[0] =3D 0; - iv_in[1] =3D 0; - iv_in[2] =3D 0; + memcpy(iv_in, req->iv, AES_IV_SIZE); } - iv_in[3] =3D 0x01000000; =20 /* Clear key2 to reset previous GHASH intermediate data */ for (int i =3D 0; i < AES_KEYSIZE_256 / sizeof(u32); ++i) @@ -1071,20 +1109,54 @@ static int dthe_aead_crypt(struct aead_request *req) struct dthe_data *dev_data =3D dthe_get_dev(ctx); struct crypto_engine *engine; unsigned int cryptlen =3D req->cryptlen; + bool is_zero_ctr =3D true; =20 /* In decryption, last authsize bytes are the TAG */ if (!rctx->enc) cryptlen -=3D ctx->authsize; =20 + if (ctx->aes_mode =3D=3D DTHE_AES_CCM) { + /* + * For CCM Mode, the 128-bit IV contains the following: + * | 0 .. 2 | 3 .. 7 | 8 .. (127-8*L) | (128-8*L) .. 127 | + * | L-1 | Zero | Nonce | Counter | + * L needs to be between 2-8 (inclusive), i.e. 1 <=3D (L-1) <=3D 7 + * and the next 5 bits need to be zeroes. Else return -EINVAL + */ + u8 *iv =3D req->iv; + u8 L =3D iv[0]; + + if (L < 1 || L > 7) + return -EINVAL; + /* + * DTHEv2 HW can only work with zero initial counter in CCM mode. + * Check if the initial counter value is zero or not + */ + for (int i =3D 0; i < L + 1; ++i) { + if (iv[AES_IV_SIZE - 1 - i] !=3D 0) { + is_zero_ctr =3D false; + break; + } + } + } + /* * Need to fallback to software in the following cases due to HW restrict= ions: * - Both AAD and plaintext/ciphertext are zero length - * - AAD length is more than 2^32 - 1 bytes - * PS: req->cryptlen is currently unsigned int type, which causes the abo= ve condition - * tautologically false. If req->cryptlen were to be changed to a 64-bit = type, - * the check for this would need to be added below. + * - For AES-GCM, AAD length is more than 2^32 - 1 bytes + * - For AES-CCM, AAD length is more than 2^16 - 2^8 bytes + * - For AES-CCM, plaintext/ciphertext length is more than 2^61 - 1 bytes + * - For AES-CCM, AAD length is non-zero but plaintext/ciphertext length = is zero + * - For AES-CCM, the initial counter (last L+1 bytes of IV) is not all z= eroes + * + * PS: req->cryptlen is currently unsigned int type, which causes the sec= ond and fourth + * cases above tautologically false. If req->cryptlen is to be changed to= a 64-bit + * type, the check for these would also need to be added below. */ - if (req->assoclen =3D=3D 0 && cryptlen =3D=3D 0) + if ((req->assoclen =3D=3D 0 && cryptlen =3D=3D 0) || + (ctx->aes_mode =3D=3D DTHE_AES_CCM && req->assoclen > DTHE_AES_CCM_AA= D_MAXLEN) || + (ctx->aes_mode =3D=3D DTHE_AES_CCM && cryptlen =3D=3D 0) || + (ctx->aes_mode =3D=3D DTHE_AES_CCM && !is_zero_ctr)) return dthe_aead_do_fallback(req); =20 engine =3D dev_data->engine; @@ -1207,7 +1279,7 @@ static struct aead_engine_alg aead_algs[] =3D { { .base.init =3D dthe_aead_init_tfm, .base.exit =3D dthe_aead_exit_tfm, - .base.setkey =3D dthe_aead_setkey, + .base.setkey =3D dthe_gcm_aes_setkey, .base.setauthsize =3D dthe_aead_setauthsize, .base.maxauthsize =3D AES_BLOCK_SIZE, .base.encrypt =3D dthe_aead_encrypt, @@ -1229,6 +1301,31 @@ static struct aead_engine_alg aead_algs[] =3D { }, .op.do_one_request =3D dthe_aead_run, }, /* GCM AES */ + { + .base.init =3D dthe_aead_init_tfm, + .base.exit =3D dthe_aead_exit_tfm, + .base.setkey =3D dthe_ccm_aes_setkey, + .base.setauthsize =3D dthe_aead_setauthsize, + .base.maxauthsize =3D AES_BLOCK_SIZE, + .base.encrypt =3D dthe_aead_encrypt, + .base.decrypt =3D dthe_aead_decrypt, + .base.chunksize =3D AES_BLOCK_SIZE, + .base.ivsize =3D AES_IV_SIZE, + .base.base =3D { + .cra_name =3D "ccm(aes)", + .cra_driver_name =3D "ccm-aes-dthev2", + .cra_priority =3D 299, + .cra_flags =3D CRYPTO_ALG_TYPE_AEAD | + CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | + CRYPTO_ALG_NEED_FALLBACK, + .cra_blocksize =3D 1, + .cra_ctxsize =3D sizeof(struct dthe_tfm_ctx), + .cra_reqsize =3D sizeof(struct dthe_aes_req_ctx), + .cra_module =3D THIS_MODULE, + }, + .op.do_one_request =3D dthe_aead_run, + }, /* CCM AES */ }; =20 int dthe_register_aes_algs(void) diff --git a/drivers/crypto/ti/dthev2-common.h b/drivers/crypto/ti/dthev2-c= ommon.h index 7c54291359bf5..3b8d30b3408a0 100644 --- a/drivers/crypto/ti/dthev2-common.h +++ b/drivers/crypto/ti/dthev2-common.h @@ -39,6 +39,7 @@ enum dthe_aes_mode { DTHE_AES_CTR, DTHE_AES_XTS, DTHE_AES_GCM, + DTHE_AES_CCM, }; =20 /* Driver specific struct definitions */ --=20 2.43.0