From patchwork Mon Nov 13 14:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 118751 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1836007qgn; Mon, 13 Nov 2017 06:07:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMacXRQCVBtepQ4L3UpBpbekG5Ntli32xhBRKb45lU2nE0t3vg7cPW6Bl9ZHFA8jz0B9M/oN X-Received: by 10.55.102.201 with SMTP id a192mr9610771qkc.269.1510582032130; Mon, 13 Nov 2017 06:07:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510582032; cv=none; d=google.com; s=arc-20160816; b=QIHmaPYHBmEyDqFlc0EaslEw9c6WfwLnmz782Kbj06ySPBtQVE58Ff5hLVNFlCL1yT or/nMFayNTWXtSPALbPH8MXiou5RnSOSwwiLzTb5yRLnQzx1jwwdwBBs7PNjH0AYQJM5 Cp/TkD/hCgv3xzILpGATdmR2B5Axz673BGKAimigzb4bFjdceBDtkPYa5T2zR9CnGoT6 1XAA7NkwKF/pxLP1I3dvNaKIjZMayJyB3oFqZOn4IuNcDEgKRhMyemksl/VVV3lRhtpc ghXwvKQhANl/w2/xT67/AqHsYNO7znrFhwu2quXMFa8E4jI8dFKgH67odjXLW3I769Vl yYiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=dNGi/NJmx6FhZHzLJaiCdq/EDKJsxV9SdwLjilmYEkQ=; b=SIi+gxnIhsF4ypgA34EfW2kOHKpB4MzXv2IYpZDZWGRcsqsVwoDQayXy0IOGL7BGjB Dog97JXP2RPn3BqqPHY8mZWSJdJHdZf3/4x61unGVCLoOErXg0mRxDzqiiXn37qeSqqM k/LDq6VLI7+s2KTzQnbjHsfP9OGrV2DMwQTRj5GjfCkROooDq5tZUoL8e5tCzPHYN6k4 5Uuk3cs71RSlJ+Kfq4CesuYrNV5Yf3PGXZjqv2pgFpyX/oRjLMEk9z8Dd5oMqJk52oJ6 gmyEZtQZr74pdAyHoY80u3+j2zRVTL14bkez38MWk/vRja5v2FP8Wq8Ay/SrjuamEIop sndw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id o47si2249624qtf.222.2017.11.13.06.07.11; Mon, 13 Nov 2017 06:07:12 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id BFE1C61015; Mon, 13 Nov 2017 14:07:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 61A7161027; Mon, 13 Nov 2017 14:01:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5E7D660965; Mon, 13 Nov 2017 14:00:29 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 16CC26068B for ; Mon, 13 Nov 2017 14:00:18 +0000 (UTC) Received: from mxback4o.mail.yandex.net (mxback4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1e]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 8D8E22A218DB for ; Mon, 13 Nov 2017 17:00:16 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback4o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id PS5NPhEZoL-0GlS7pCl; Mon, 13 Nov 2017 17:00:16 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eBFPNklri7-0G804Sq5; Mon, 13 Nov 2017 17:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 13 Nov 2017 17:00:05 +0300 Message-Id: <1510581611-13870-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510581611-13870-1-git-send-email-odpbot@yandex.ru> References: <1510581611-13870-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 288 Subject: [lng-odp] [PATCH API-NEXT v6 6/12] linux-gen: ipsec: add support for AES-GMAC-ESP X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Implement AES-GMAC-ESP support. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 288 (lumag:gmac) ** https://github.com/Linaro/odp/pull/288 ** Patch: https://github.com/Linaro/odp/pull/288.patch ** Base sha: a908a4dead95321e84d6a8a23de060051dcd8969 ** Merge commit sha: 60f2c36c67f6b216666f85876af63f7091b1bff0 **/ platform/linux-generic/odp_ipsec_sad.c | 66 +++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index b2d12eada..e76c7a195 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -263,6 +263,40 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) crypto_param.auth_alg = param->crypto.auth_alg; crypto_param.auth_key = param->crypto.auth_key; + switch (crypto_param.cipher_alg) { + case ODP_CIPHER_ALG_NULL: + ipsec_sa->esp_iv_len = 0; + ipsec_sa->esp_block_len = 1; + crypto_param.iv.length = 0; + break; + case ODP_CIPHER_ALG_DES: + case ODP_CIPHER_ALG_3DES_CBC: + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 8; + crypto_param.iv.length = 8; + break; +#if ODP_DEPRECATED_API + case ODP_CIPHER_ALG_AES128_CBC: +#endif + case ODP_CIPHER_ALG_AES_CBC: + ipsec_sa->esp_iv_len = 16; + ipsec_sa->esp_block_len = 16; + crypto_param.iv.length = 16; + break; +#if ODP_DEPRECATED_API + case ODP_CIPHER_ALG_AES128_GCM: +#endif + case ODP_CIPHER_ALG_AES_GCM: + ipsec_sa->use_counter_iv = 1; + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 16; + ipsec_sa->icv_len = 16; + crypto_param.iv.length = 12; + break; + default: + goto error; + } + switch (crypto_param.auth_alg) { case ODP_AUTH_ALG_NULL: ipsec_sa->icv_len = 0; @@ -291,37 +325,13 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) case ODP_AUTH_ALG_AES_GCM: ipsec_sa->icv_len = 16; break; - default: - goto error; - } - - switch (crypto_param.cipher_alg) { - case ODP_CIPHER_ALG_NULL: - ipsec_sa->esp_iv_len = 0; - ipsec_sa->esp_block_len = 1; - crypto_param.iv.length = 0; - break; - case ODP_CIPHER_ALG_DES: - case ODP_CIPHER_ALG_3DES_CBC: - ipsec_sa->esp_iv_len = 8; - ipsec_sa->esp_block_len = 8; - crypto_param.iv.length = 8; - break; -#if ODP_DEPRECATED_API - case ODP_CIPHER_ALG_AES128_CBC: -#endif - case ODP_CIPHER_ALG_AES_CBC: - ipsec_sa->esp_iv_len = 16; - ipsec_sa->esp_block_len = 16; - crypto_param.iv.length = 16; - break; -#if ODP_DEPRECATED_API - case ODP_CIPHER_ALG_AES128_GCM: -#endif - case ODP_CIPHER_ALG_AES_GCM: + case ODP_AUTH_ALG_AES_GMAC: + if (ODP_CIPHER_ALG_NULL != crypto_param.cipher_alg) + return ODP_IPSEC_SA_INVALID; ipsec_sa->use_counter_iv = 1; ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; + ipsec_sa->icv_len = 16; crypto_param.iv.length = 12; break; default: