From patchwork Thu Nov 2 17:00:06 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: 117834 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp2314796edm; Thu, 2 Nov 2017 10:00:21 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TrFp8sT5N96B5wIwe16gEW9Qr2xiRyYdJv75qWMEYouRllMDg/QRazMvSrcvzhGWNLKe/y X-Received: by 10.200.27.116 with SMTP id p49mr6178809qtk.336.1509642021019; Thu, 02 Nov 2017 10:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509642021; cv=none; d=google.com; s=arc-20160816; b=GLCGPQ7VB7/iv2GctjZw11FXBCi39MBm0mEFg4kKKcA8bAoheA2k8sOmURc5mM6WZB umBpgtJbHOq68y9W6EhXq14GKwxISRMVEvRtAtkpvPhHljaWzhH8yIQ4oU2+0Z+sE3wD kr7WLy7xmx4B9MlieaJTv/OH3Rm0MsG8FK0mfgJajTv6jCawys99IpCVzwNkVWZJpcyp s/jqdJ0pD9Ru0bTjHAey28V7iEj24nduQLR1vk89jIS74qeDMy6rhJ4Tw+3HZNyMPYXy Agkhk7vyq3nyHj3YI3Js0okmllP+Bwo+7RqstNci3MFIPBZpQh6OY/Hd697hZShaPaRU qmLQ== 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=OXDHZMdK+d3/bUCe8/XpmS1FoT54PeiK5+G7eTFwlps=; b=HXS2tk3A+d2/ON8Uo6xoWZLUa3apBRlAN2Lf7076HU1YBTbMssbdvyRgZbdO+GHYoV 2pCMz+6MmfoJ+FIcDY9aNwt99fvp1eaMVFHM7zTJT8j6uXundfjU62HcEbKzDSyiFHLO KI2owJEQC+E6ewTagEmCxqjbNZykSYHxTiFdn3onHND/H202qE4JxLLPWB3tYjtN5R7k Br1ksKZSwt7dVgkpTZhy2t1SbnXlqQpKQK9y2wGr9+H//DLsUyf5OtOvGiE0qrYjS1jB 6Ah9VNLujZScsfrTDIy7VHiDsdPQkzWOJJQDT/Pu05jBLi5jw7sNGbqeKzuREAtLjAJ4 4lvQ== 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 w64si3567156qkg.155.2017.11.02.10.00.20; Thu, 02 Nov 2017 10:00:20 -0700 (PDT) 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 2925860A31; Thu, 2 Nov 2017 17:00:20 +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 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 9898F6069C; Thu, 2 Nov 2017 17:00:16 +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 39A00608E8; Thu, 2 Nov 2017 17:00:13 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 1194E6069C for ; Thu, 2 Nov 2017 17:00:12 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 76AE6218230B for ; Thu, 2 Nov 2017 20:00:10 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ExToLE7EZc-0ASKUqfd; Thu, 02 Nov 2017 20:00:10 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id EKt7cPg9I4-09sa9wYT; Thu, 02 Nov 2017 20:00:09 +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: Thu, 2 Nov 2017 20:00:06 +0300 Message-Id: <1509642008-6978-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> References: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v2 1/3] api: crypto: add AES-CTR declarations 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 Add declarations for AES-CTR cryptographic mode support. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 271 (lumag:aes-ctr) ** https://github.com/Linaro/odp/pull/271 ** Patch: https://github.com/Linaro/odp/pull/271.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: b976868759b2e8ee4ff32d3749e1df5cbd844ef7 **/ include/odp/api/spec/crypto.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index 7dcb71264..4f8123bec 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -90,7 +90,10 @@ typedef enum { ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_CBC), /** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */ - ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_GCM) + ODP_DEPRECATE(ODP_CIPHER_ALG_AES128_GCM), + + /** AES with counter mode */ + ODP_CIPHER_ALG_AES_CTR, } odp_cipher_alg_t; @@ -169,6 +172,9 @@ typedef union odp_crypto_cipher_algos_t { /** @deprecated Use aes_gcm instead */ uint32_t ODP_DEPRECATE(aes128_gcm) : 1; + /** ODP_CIPHER_ALG_AES_CTR */ + uint32_t aes_ctr : 1; + } bit; /** All bits of the bit field structure From patchwork Thu Nov 2 17:00:07 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: 117836 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp2317874edm; Thu, 2 Nov 2017 10:02:30 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RCGCbIf0eBFynk7183C2Z64iwgd4c5WeaURvjhtT+Mfot88ULorywjvuI6894j+Cqk82Ri X-Received: by 10.237.55.66 with SMTP id i60mr5785761qtb.176.1509642149773; Thu, 02 Nov 2017 10:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509642149; cv=none; d=google.com; s=arc-20160816; b=W/07jNT8Bx0+C8WS7hBu2vNJ8s17LesARHjxwxs3ijteuADliUUl+jk4jnI7RP9RFn Df1P1PJ101NfTGKKb2/K4jW63Nk3XB4Lnc3AJaTex0N//usSCXpxaQw5lKItPqDvhXlV Jfag81TlUsNtMTXAA+0FA4f2p91b2LbeMZmVJ0P9Rkd2Cde76tBGZlZol0n3RUEr9LGh Bsy++8W30DPFjbbaWcmXiCWK7sUg3XavomlRILxCUC2rOYUG3c4skBd1ARhbmeemUuxE G7RBVAQowCZC7p4cNd98UkS9l0Ri3eM37uXluEIbOavH7hEQEBHD9hAV4oS5Kt+xj61g 93Jw== 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=COUmGjgKloacBgOOtEJfnGpjNgYDQsORsl966F0lKZ0=; b=Esb5fu/H2ZXmJfFrJC5eN3MtqGRPxDJTDAlnzYjsLOXguBOueaZYzOsKgSQ7A972t7 Ckmqe/460MVec8naUqHMljRdTY07B71iExSZg2/EqB9tT3i109cG/LST1e2g3ue480rB Bkd88jEqf9mFxbzjYTrBvh+iahg29JP3zT7CIK7SB8zZjAeD3OqZXs9a/KwUgReDaHGs rUeZP0z45UszjzrXos5IEGY/p6QFj3b7vreONeQUtksRP84j9YkZfmlqWLpcTUNeRjut Hjcs9Dh3mPK9jzfYpGRs0mznm3lxPEb3el/1WoSyIm2hxgGpySzy3crUxlMAJRTrhu4M qCmw== 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 i48si2548073qta.66.2017.11.02.10.02.29; Thu, 02 Nov 2017 10:02:29 -0700 (PDT) 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 2E78360D36; Thu, 2 Nov 2017 17:02:29 +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=-5.4 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 8B65D60C25; Thu, 2 Nov 2017 17:00:30 +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 17C856069C; Thu, 2 Nov 2017 17:00:16 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 7F0D3606A0 for ; Thu, 2 Nov 2017 17:00:12 +0000 (UTC) Received: from mxback7o.mail.yandex.net (mxback7o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::21]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 1A233510497D for ; Thu, 2 Nov 2017 20:00:11 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback7o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id QY6AwmrqEE-0Ba09OOv; Thu, 02 Nov 2017 20:00:11 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id EKt7cPg9I4-0As0qHPp; Thu, 02 Nov 2017 20:00:10 +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: Thu, 2 Nov 2017 20:00:07 +0300 Message-Id: <1509642008-6978-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> References: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v2 2/3] validation: crypto: add tests for AES-CTR 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 Add AES-CTR test vectors from NIST SP800-38A. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 271 (lumag:aes-ctr) ** https://github.com/Linaro/odp/pull/271 ** Patch: https://github.com/Linaro/odp/pull/271.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: b976868759b2e8ee4ff32d3749e1df5cbd844ef7 **/ test/validation/api/crypto/crypto.h | 4 + test/validation/api/crypto/odp_crypto_test_inp.c | 97 ++++++++++++++++++++++++ test/validation/api/crypto/test_vectors.h | 81 ++++++++++++++++++++ test/validation/api/crypto/test_vectors_len.h | 12 +++ 4 files changed, 194 insertions(+) diff --git a/test/validation/api/crypto/crypto.h b/test/validation/api/crypto/crypto.h index 71f862ec3..86fe2b672 100644 --- a/test/validation/api/crypto/crypto.h +++ b/test/validation/api/crypto/crypto.h @@ -24,6 +24,10 @@ void crypto_test_enc_alg_aes_gcm(void); void crypto_test_enc_alg_aes_gcm_ovr_iv(void); void crypto_test_dec_alg_aes_gcm(void); void crypto_test_dec_alg_aes_gcm_ovr_iv(void); +void crypto_test_enc_alg_aes_ctr(void); +void crypto_test_enc_alg_aes_ctr_ovr_iv(void); +void crypto_test_dec_alg_aes_ctr(void); +void crypto_test_dec_alg_aes_ctr_ovr_iv(void); void crypto_test_gen_alg_hmac_md5(void); void crypto_test_check_alg_hmac_md5(void); void crypto_test_gen_alg_hmac_sha1(void); diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c index f05780377..9e81fbd71 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -328,6 +328,9 @@ static void alg_test(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && + !(capa.ciphers.bit.aes_ctr)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_DES && !(capa.ciphers.bit.des)) rc = -1; @@ -546,6 +549,10 @@ static int check_alg_support(odp_cipher_alg_t cipher, odp_auth_alg_t auth) if (!capability.ciphers.bit.aes_cbc) return ODP_TEST_INACTIVE; break; + case ODP_CIPHER_ALG_AES_CTR: + if (!capability.ciphers.bit.aes_ctr) + return ODP_TEST_INACTIVE; + break; case ODP_CIPHER_ALG_AES_GCM: if (!capability.ciphers.bit.aes_gcm) return ODP_TEST_INACTIVE; @@ -865,6 +872,88 @@ void crypto_test_dec_alg_aes_cbc_ovr_iv(void) } } +static int check_alg_aes_ctr(void) +{ + return check_alg_support(ODP_CIPHER_ALG_AES_CTR, ODP_AUTH_ALG_NULL); +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_CTR algorithm. IV for the operation is the session IV. + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer.*/ +void crypto_test_enc_alg_aes_ctr(void) +{ + unsigned int test_vec_num = (sizeof(aes_ctr_reference) / + sizeof(aes_ctr_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) { + alg_test(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + &aes_ctr_reference[i], + false); + } +} + +/* This test verifies the correctness of encode (plaintext -> ciphertext) + * operation for AES128_CTR algorithm. IV for the operation is the operation IV. + * */ +void crypto_test_enc_alg_aes_ctr_ovr_iv(void) +{ + unsigned int test_vec_num = (sizeof(aes_ctr_reference) / + sizeof(aes_ctr_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) { + alg_test(ODP_CRYPTO_OP_ENCODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + &aes_ctr_reference[i], + true); + } +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_CTR algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +void crypto_test_dec_alg_aes_ctr(void) +{ + unsigned int test_vec_num = (sizeof(aes_ctr_reference) / + sizeof(aes_ctr_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) { + alg_test(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + &aes_ctr_reference[i], + false); + } +} + +/* This test verifies the correctness of decode (ciphertext -> plaintext) + * operation for AES128_CTR algorithm. IV for the operation is the session IV + * In addition the test verifies if the implementation can use the + * packet buffer as completion event buffer. + * */ +void crypto_test_dec_alg_aes_ctr_ovr_iv(void) +{ + unsigned int test_vec_num = (sizeof(aes_ctr_reference) / + sizeof(aes_ctr_reference[0])); + unsigned int i; + + for (i = 0; i < test_vec_num; i++) { + alg_test(ODP_CRYPTO_OP_DECODE, + ODP_CIPHER_ALG_AES_CTR, + ODP_AUTH_ALG_NULL, + &aes_ctr_reference[i], + true); + } +} + static int check_alg_hmac_md5(void) { return check_alg_support(ODP_CIPHER_ALG_NULL, ODP_AUTH_ALG_MD5_HMAC); @@ -1106,6 +1195,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_gcm), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_gcm_ovr_iv, check_alg_aes_gcm), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr, + check_alg_aes_ctr), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr, + check_alg_aes_ctr), + ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_ctr_ovr_iv, + check_alg_aes_ctr), + ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_ctr_ovr_iv, + check_alg_aes_ctr), ODP_TEST_INFO_CONDITIONAL(crypto_test_gen_alg_hmac_md5, check_alg_hmac_md5), ODP_TEST_INFO_CONDITIONAL(crypto_test_check_alg_hmac_md5, diff --git a/test/validation/api/crypto/test_vectors.h b/test/validation/api/crypto/test_vectors.h index 652968be7..63103227a 100644 --- a/test/validation/api/crypto/test_vectors.h +++ b/test/validation/api/crypto/test_vectors.h @@ -184,6 +184,87 @@ static crypto_test_reference_t aes_cbc_reference[] = { } }; +static crypto_test_reference_t aes_ctr_reference[] = { + { + .cipher_key_length = AES128_CTR_KEY_LEN, + .cipher_key = { 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}, + .iv_length = AES_CTR_IV_LEN, + .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0x87, 0x4d, 0x61, 0x91, 0xb6, 0x20, 0xe3, 0x26, + 0x1b, 0xef, 0x68, 0x64, 0x99, 0x0d, 0xb6, 0xce, + 0x98, 0x06, 0xf6, 0x6b, 0x79, 0x70, 0xfd, 0xff, + 0x86, 0x17, 0x18, 0x7b, 0xb9, 0xff, 0xfd, 0xff, + 0x5a, 0xe4, 0xdf, 0x3e, 0xdb, 0xd5, 0xd3, 0x5e, + 0x5b, 0x4f, 0x09, 0x02, 0x0d, 0xb0, 0x3e, 0xab, + 0x1e, 0x03, 0x1d, 0xda, 0x2f, 0xbe, 0x03, 0xd1, + 0x79, 0x21, 0x70, 0xa0, 0xf3, 0x00, 0x9c, 0xee } + }, + { + .cipher_key_length = AES192_CTR_KEY_LEN, + .cipher_key = { 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, + 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, + 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b}, + .iv_length = AES_CTR_IV_LEN, + .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0x1a, 0xbc, 0x93, 0x24, 0x17, 0x52, 0x1c, 0xa2, + 0x4f, 0x2b, 0x04, 0x59, 0xfe, 0x7e, 0x6e, 0x0b, + 0x09, 0x03, 0x39, 0xec, 0x0a, 0xa6, 0xfa, 0xef, + 0xd5, 0xcc, 0xc2, 0xc6, 0xf4, 0xce, 0x8e, 0x94, + 0x1e, 0x36, 0xb2, 0x6b, 0xd1, 0xeb, 0xc6, 0x70, + 0xd1, 0xbd, 0x1d, 0x66, 0x56, 0x20, 0xab, 0xf7, + 0x4f, 0x78, 0xa7, 0xf6, 0xd2, 0x98, 0x09, 0x58, + 0x5a, 0x97, 0xda, 0xec, 0x58, 0xc6, 0xb0, 0x50 } + }, + { + .cipher_key_length = AES256_CTR_KEY_LEN, + .cipher_key = { 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, + 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, + 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, + 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4}, + .iv_length = AES_CTR_IV_LEN, + .iv = { 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff }, + .length = 64, + .plaintext = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, + 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, + 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, + 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, + 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, + 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, + 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, + 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }, + .ciphertext = { 0x60, 0x1e, 0xc3, 0x13, 0x77, 0x57, 0x89, 0xa5, + 0xb7, 0xa7, 0xf5, 0x04, 0xbb, 0xf3, 0xd2, 0x28, + 0xf4, 0x43, 0xe3, 0xca, 0x4d, 0x62, 0xb5, 0x9a, + 0xca, 0x84, 0xe9, 0x90, 0xca, 0xca, 0xf5, 0xc5, + 0x2b, 0x09, 0x30, 0xda, 0xa2, 0x3d, 0xe9, 0x4c, + 0xe8, 0x70, 0x17, 0xba, 0x2d, 0x84, 0x98, 0x8d, + 0xdf, 0xc9, 0xc5, 0x8d, 0xb6, 0x7a, 0xad, 0xa6, + 0x13, 0xc2, 0xdd, 0x08, 0x45, 0x79, 0x41, 0xa6 } + }, +}; + /* AES-GCM test vectors extracted from * https://tools.ietf.org/html/draft-mcgrew-gcm-test-01#section-2 */ diff --git a/test/validation/api/crypto/test_vectors_len.h b/test/validation/api/crypto/test_vectors_len.h index b1ce719e3..0062299e6 100644 --- a/test/validation/api/crypto/test_vectors_len.h +++ b/test/validation/api/crypto/test_vectors_len.h @@ -29,6 +29,18 @@ /* AES256-CBC */ #define AES256_CBC_KEY_LEN 32 +/* AES-CBC common */ +#define AES_CTR_IV_LEN 16 + +/* AES128-CTR */ +#define AES128_CTR_KEY_LEN 16 + +/* AES192-CTR */ +#define AES192_CTR_KEY_LEN 24 + +/* AES256-CTR */ +#define AES256_CTR_KEY_LEN 32 + /* AES-GCM common */ #define AES_GCM_IV_LEN 12 #define AES_GCM_DIGEST_LEN 16 From patchwork Thu Nov 2 17:00:08 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: 117835 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp2316570edm; Thu, 2 Nov 2017 10:01:36 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RexSxGv+QxsfHpGmgH7xTXJ8lWwuzYKEtLo5zmyomI6uyLypOabtvNdQB4DR5G8XRqWAsH X-Received: by 10.55.80.3 with SMTP id e3mr5439537qkb.254.1509642096082; Thu, 02 Nov 2017 10:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509642096; cv=none; d=google.com; s=arc-20160816; b=Bef6aHnVtUSjZuOavm6pDAlgI16JVr4mLCRWoeOgIYUNPmw14lGDxQrHpilTPZLZ/y 3vXRDNbMCkGhmS7wFY8Bw5I9ZA2ovy0/PMOGNC5rWqzJWJgtZVxt8UXFqt9Ry67G11b5 LlB1dCsfb7SuKFh7R7DbGMEVIN7EiDgF3JpftmIug+GL9xvhg4UQAC8gfMpSn6aP3Kzd QZ2lWrTXsyJG8aGbwEPxZriBT1z0/c/Qki9siGY/pXGpQQvCLIEXhbL10FsDW/8Gzu+3 9YWCU7kDjqFzAnvnIKGhHM9xdZklcBzP2YhUfL9XUMnqLiTfsrFmw1S1FJ8UrpKprnml lwvg== 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=JsTyOGNda/nsAYspgAbpKrzqZ5585KIPMwIDb5wMuAg=; b=GJgdGQgF9u+HsvVf+wqttfZxhQYHbTwrM/jVNdUL8xwjhEugi70sPEDFFB7GgCysxe i3pqyYvh+nMpNzTxYoFVuqD/1eAfsXKDv2AG2dL6bjpjWGb8eP7V9H39mGbXrm9ir3Db l049Oz11avzjm+TYLNnxNRcgZxqvTkqkMwBf6/pyVQIXmSeFXRr4a48k68gcVcgRQ4PX Od7MEmBnFlFTVa8xOH8T2JZv1dWZxs0+wu6d6HUZN/D2IU/++Inz/lyvSBOwMBgbExyw TXTchYWBdEbJYWOE5rJnE+C2/85+9loeXumWOU0c6eZyNcyxiUBX4Jgg0yesrRErsK0H u6tg== 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 o7si1553514qkl.118.2017.11.02.10.01.35; Thu, 02 Nov 2017 10:01:36 -0700 (PDT) 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 AACAD60A31; Thu, 2 Nov 2017 17:01:35 +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 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 59FF360AC0; Thu, 2 Nov 2017 17:00:22 +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 A0E7B608C4; Thu, 2 Nov 2017 17:00:15 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 76D8E6069C for ; Thu, 2 Nov 2017 17:00:13 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward102j.mail.yandex.net (Yandex) with ESMTP id B08FF5604BDC for ; Thu, 2 Nov 2017 20:00:11 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YiuQlWopdH-0Bxeb9FO; Thu, 02 Nov 2017 20:00:11 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id EKt7cPg9I4-0Bsa9rNN; Thu, 02 Nov 2017 20:00:11 +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: Thu, 2 Nov 2017 20:00:08 +0300 Message-Id: <1509642008-6978-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> References: <1509642008-6978-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v2 3/3] linux-gen: crypto: add AES-CTR support 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 Add implementation for AES-CTR cryptographic mode. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 271 (lumag:aes-ctr) ** https://github.com/Linaro/odp/pull/271 ** Patch: https://github.com/Linaro/odp/pull/271.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: b976868759b2e8ee4ff32d3749e1df5cbd844ef7 **/ platform/linux-generic/odp_crypto.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 3174feee0..2fbf91f28 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -56,6 +56,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 24, .iv_len = 12}, {.key_len = 32, .iv_len = 12} }; +static const odp_crypto_cipher_capability_t cipher_capa_aes_ctr[] = { +{.key_len = 16, .iv_len = 16}, +{.key_len = 24, .iv_len = 16}, +{.key_len = 32, .iv_len = 16} }; + /* * Authentication algorithm capabilities * @@ -593,6 +598,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.trides_cbc = 1; capa->ciphers.bit.aes_cbc = 1; capa->ciphers.bit.aes_gcm = 1; + capa->ciphers.bit.aes_ctr = 1; capa->auths.bit.null = 1; capa->auths.bit.md5_hmac = 1; @@ -639,6 +645,10 @@ int odp_crypto_cipher_capability(odp_cipher_alg_t cipher, src = cipher_capa_aes_cbc; num = sizeof(cipher_capa_aes_cbc) / size; break; + case ODP_CIPHER_ALG_AES_CTR: + src = cipher_capa_aes_ctr; + num = sizeof(cipher_capa_aes_ctr) / size; + break; case ODP_CIPHER_ALG_AES_GCM: src = cipher_capa_aes_gcm; num = sizeof(cipher_capa_aes_gcm) / size; @@ -763,6 +773,16 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, else rc = -1; break; + case ODP_CIPHER_ALG_AES_CTR: + if (param->cipher_key.length == 16) + rc = process_cipher_param(session, EVP_aes_128_ctr()); + else if (param->cipher_key.length == 24) + rc = process_cipher_param(session, EVP_aes_192_ctr()); + else if (param->cipher_key.length == 32) + rc = process_cipher_param(session, EVP_aes_256_ctr()); + else + rc = -1; + break; #if ODP_DEPRECATED_API case ODP_CIPHER_ALG_AES128_GCM: /* AES-GCM requires to do both auth and