From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3FA7A0C53; Wed, 3 Nov 2021 14:19:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B78F41134; Wed, 3 Nov 2021 14:19:05 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id A17F240E5A for ; Wed, 3 Nov 2021 14:19:03 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A3BxMbS012596; Wed, 3 Nov 2021 06:19:02 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Mlxe4xEoy7zFn2TGx8g0FG/9aQ5NLW7iXRyp+Qc4JcY=; b=lGweL5MILmSo2R1q7jej2S1UZ/oJz7tVTUPu0+k3QMsNhBZi3X0vuo1hIKaeZjPnfIIY vZ5um88W7bVE65i0gttQkpKklq92DnH6myFg6Pfk2C3UlxHcnUzB0f9oczComGXIg57b MktyOyYrIz1kuu/ERdFMKwf48Ci+7EoCxub8XY12s0TXeO/ZR5q1GezAYEn9F010/gwk umf7IRwkEHH3zAEHgtVOKKR4cVYfBnDA5S9C5g6H9CSsbf+A9m/6hF5fty+J1G1yMOOV ua+oVLR4GjZI7NCZhBB0O8xSh3aJLf+prXNCIayt7uZW2j6TInPkmD5UgP+DQtVv2tIB YQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3c3dd8bkab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 03 Nov 2021 06:19:02 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 3 Nov 2021 06:19:00 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 3 Nov 2021 06:18:59 -0700 Received: from vvelumuri_asim.marvell.com (unknown [10.29.53.48]) by maili.marvell.com (Postfix) with ESMTP id 5F2EA3F7041; Wed, 3 Nov 2021 06:18:57 -0700 (PDT) From: Vidya Sagar Velumuri To: , , , , , CC: , Date: Wed, 3 Nov 2021 13:18:52 +0000 Message-ID: <20211103131853.1050-1-vvelumuri@marvell.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211103112210.32650-1-vvelumuri@marvell.com> References: <20211103112210.32650-1-vvelumuri@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: EuIvZJrZBVBc9_ePtiogxnFoVXiW8Qpz X-Proofpoint-GUID: EuIvZJrZBVBc9_ePtiogxnFoVXiW8Qpz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-03_04,2021-11-03_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH v2 1/2] common/cnxk: fix: use appropriate zuc constants X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use appropriate ZUC constants based on key length and mac length Fixes: a90db80d7d72 ("common/cnxk: set key length for PDCP algos") Cc: vvelumuri@marvell.com Signed-off-by: Vidya Sagar Velumuri v2: * Fixed remove gerrit ID warning diff --git a/drivers/common/cnxk/roc_se.c b/drivers/common/cnxk/roc_se.c index 4edbc8e547..e81a0c9ecb 100644 --- a/drivers/common/cnxk/roc_se.c +++ b/drivers/common/cnxk/roc_se.c @@ -4,10 +4,26 @@ #include "roc_api.h" -static uint8_t zuc_d[32] = {0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E, - 0x57, 0x89, 0x35, 0xE2, 0x71, 0x35, 0x09, 0xAF, - 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4, 0x1A, 0xF1, - 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC}; +static uint8_t zuc_key128[32] = { + 0x44, 0xD7, 0x26, 0xBC, 0x62, 0x6B, 0x13, 0x5E, 0x57, 0x89, 0x35, + 0xE2, 0x71, 0x35, 0x09, 0xAF, 0x4D, 0x78, 0x2F, 0x13, 0x6B, 0xC4, + 0x1A, 0xF1, 0x5E, 0x26, 0x3C, 0x4D, 0x78, 0x9A, 0x47, 0xAC}; + +static uint8_t zuc_key256[16] = {0x22, 0x2f, 0x24, 0x2a, 0x6d, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x52, 0x10, 0x30}; + +static uint8_t zuc_key256_mac4[16] = {0x22, 0x2f, 0x25, 0x2a, 0x6d, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x52, 0x10, 0x30}; + +static uint8_t zuc_key256_mac8[16] = {0x23, 0x2f, 0x24, 0x2a, 0x6d, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x52, 0x10, 0x30}; + +static uint8_t zuc_key256_mac16[16] = {0x23, 0x2f, 0x25, 0x2a, 0x6d, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x52, 0x10, 0x30}; static inline void cpt_snow3g_key_gen(const uint8_t *ck, uint32_t *keyx) @@ -185,6 +201,28 @@ cpt_pdcp_mac_len_set(struct roc_se_zuc_snow3g_ctx *zs_ctx, uint16_t mac_len) return 0; } +static void +cpt_pdcp_update_zuc_const(uint8_t *zuc_const, int key_len, int mac_len) +{ + if (key_len == 16) { + memcpy(zuc_const, zuc_key128, 32); + } else if (key_len == 32) { + switch (mac_len) { + case 4: + memcpy(zuc_const, zuc_key256_mac4, 16); + break; + case 8: + memcpy(zuc_const, zuc_key256_mac8, 16); + break; + case 16: + memcpy(zuc_const, zuc_key256_mac16, 16); + break; + default: + plt_err("Unsupported mac len"); + } + } +} + int roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type, const uint8_t *key, uint16_t key_len, uint16_t mac_len) @@ -245,7 +283,7 @@ roc_se_auth_key_set(struct roc_se_ctx *se_ctx, roc_se_auth_type type, return ret; se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC; memcpy(ci_key, key, key_len); - memcpy(zuc_const, zuc_d, 32); + cpt_pdcp_update_zuc_const(zuc_const, key_len, mac_len); se_ctx->fc_type = ROC_SE_PDCP; se_ctx->zsk_flags = 0x1; break; @@ -421,7 +459,11 @@ roc_se_ciph_key_set(struct roc_se_ctx *se_ctx, roc_se_cipher_type type, zs_ctx->zuc.otk_ctx.w0.s.alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC; se_ctx->pdcp_alg_type = ROC_SE_PDCP_ALG_TYPE_ZUC; memcpy(ci_key, key, key_len); - memcpy(zuc_const, zuc_d, 32); + if (key_len == 32) + memcpy(zuc_const, zuc_key256, 16); + else + memcpy(zuc_const, zuc_key128, 32); + se_ctx->zsk_flags = 0; goto success; case ROC_SE_AES_CTR_EEA2: diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h index 051d496f88..5be832fa75 100644 --- a/drivers/common/cnxk/roc_se.h +++ b/drivers/common/cnxk/roc_se.h @@ -259,7 +259,8 @@ struct roc_se_fc_params { struct roc_se_buf_ptr meta_buf; struct roc_se_buf_ptr ctx_buf; uint32_t rsvd2; - uint16_t rsvd3; + uint8_t rsvd3; + uint8_t iv_ovr; uint8_t cipher_iv_len; uint8_t auth_iv_len; -- 2.31.1