From patchwork Wed Jan 24 19:00:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125711 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp608337ljf; Wed, 24 Jan 2018 11:08:49 -0800 (PST) X-Google-Smtp-Source: AH8x225L9EX2jib/4OScayZCxC3nPJxiOadQsPeqymqfzL3q6sTSxaCcz4a9YJNDclSIQxiplR7z X-Received: by 10.37.139.138 with SMTP id j10mr6330263ybl.231.1516820929211; Wed, 24 Jan 2018 11:08:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516820929; cv=none; d=google.com; s=arc-20160816; b=O5lb/5MNzzd5ulYTDf3rMF5loR4hUTFkj2JtpTvkfp0xmWQgDaMdMBhKwcyhfxNAAP MqcH4NwpR4Wlj18XoD+0HjaTBife4sP1VGmpupZwKFykdtDDxXuUTqmT0mWsOC5Fjy+1 nbU/QRD9Ytp0ZdBr3TRDEiCH4ncK7XXVvS3N2pxLoGmzxGvYFqVG8rf8AanrZ9Pwcx54 VUzrMcqr76vZ8JSl2kup3+mtZjuvQ6RJXi1kr3Q1IlOqKqWwNtCx4iqutGTMffFZLgZG EXbrJ//hgyLyRqCaBNBs3jQu+g9Plt57N3JKXm1bJ2x5rZ7h4l+QR1v7nVOqQZdtph7O 0Oew== 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=thcVtZA7FFW+q+NJVeETVaUtNdzkyKc6v6KLCL/80Vs=; b=tWSNyYTik38/DGe8Ifhi0pZZ6BET/SW4PWCDhWT5xhcC9v/GVB+zPlDqbKomXItLVT Lt7AUXHAqXkiqDOppXhkARjXtM5Hlhim8oViT9vkikdgn2sf9x0hzVvkGGmbw3CtD0HD oStAshCw3pC0LZppnYDeES3pqhA86Ehner2oNqdQ1598gfWsKeG/wBCNPtoLa98FlkNE bI+a6yiEHiT+RpRr1k9gj18lsz7LLlYqJ8vpRXsLB1zNAdgRz+bUuhb8LqLmJyFZTJmT R31LHyZUOx33eZ4SE7GXgfxB+bWZ1d+Sr0GQP7D79dOjc+gwqgmmj1kLNmK+NuWTnZv9 NLAQ== 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 p186si158902ywp.515.2018.01.24.11.08.48; Wed, 24 Jan 2018 11:08:49 -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 B954461782; Wed, 24 Jan 2018 19:08:48 +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_H2 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 F09E36178D; Wed, 24 Jan 2018 19:01:18 +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 A573161706; Wed, 24 Jan 2018 19:01:10 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 6D38D61718 for ; Wed, 24 Jan 2018 19:00:23 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward101j.mail.yandex.net (Yandex) with ESMTP id E2E281245229 for ; Wed, 24 Jan 2018 22:00:21 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id nXdaCWrfhc-0LMSKEZA; Wed, 24 Jan 2018 22:00:21 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id eveK2VsYyq-0LG0SI64; Wed, 24 Jan 2018 22:00:21 +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: Wed, 24 Jan 2018 22:00:10 +0300 Message-Id: <1516820410-23442-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516820410-23442-1-git-send-email-odpbot@yandex.ru> References: <1516820410-23442-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 428 Subject: [lng-odp] [PATCH API-NEXT v4 6/6] linux-gen: ipsec: support ChaCha20-Poly1305 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 Support IPsec ChaCha20-Poly1305 on top of linux-generic's crypto support. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 428 (lumag:chacha-poly1305) ** https://github.com/Linaro/odp/pull/428 ** Patch: https://github.com/Linaro/odp/pull/428.patch ** Base sha: 44974a09b01c79adb9637a5dff38539598a76737 ** Merge commit sha: 516808773882a012c221502d190787c1cdddd1b9 **/ platform/linux-generic/odp_ipsec.c | 1 + platform/linux-generic/odp_ipsec_sad.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index b6192377e..43d7b9f52 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -112,6 +112,7 @@ int odp_ipsec_auth_capability(odp_auth_alg_t auth, continue; if (ODP_AUTH_ALG_AES_GCM == auth || + ODP_AUTH_ALG_CHACHA20_POLY1305 == auth || ODP_DEPRECATE(ODP_AUTH_ALG_AES128_GCM) == auth) { uint8_t aad_len = 12; diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index 031adef65..d97735408 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -210,6 +210,8 @@ uint32_t _odp_ipsec_cipher_iv_len(odp_cipher_alg_t cipher) #endif case ODP_CIPHER_ALG_AES_GCM: return 12; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + return 12; default: return (uint32_t)-1; } @@ -240,6 +242,8 @@ uint32_t _odp_ipsec_auth_digest_len(odp_auth_alg_t auth) case ODP_AUTH_ALG_AES_GCM: case ODP_AUTH_ALG_AES_GMAC: return 16; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + return 16; default: return (uint32_t)-1; } @@ -392,6 +396,11 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->esp_iv_len = 8; ipsec_sa->esp_block_len = 16; break; + case ODP_CIPHER_ALG_CHACHA20_POLY1305: + ipsec_sa->use_counter_iv = 1; + ipsec_sa->esp_iv_len = 8; + ipsec_sa->esp_block_len = 1; + break; default: goto error; } @@ -411,6 +420,9 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param) ipsec_sa->esp_block_len = 16; crypto_param.auth_iv.length = 12; break; + case ODP_AUTH_ALG_CHACHA20_POLY1305: + crypto_param.auth_aad_len = sizeof(ipsec_aad_t); + break; default: break; }