From patchwork Tue Nov 7 14:00:10 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: 118168 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4012921qgn; Tue, 7 Nov 2017 06:01:31 -0800 (PST) X-Google-Smtp-Source: ABhQp+SCQ37ZHhg61yFmQ9bvL/R0uN093bajjyCB112kqoCDYcRJfws83fJccawUNCAzDQoNG1/R X-Received: by 10.36.61.76 with SMTP id n73mr2172087itn.101.1510063291709; Tue, 07 Nov 2017 06:01:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510063291; cv=none; d=google.com; s=arc-20160816; b=WyX2mQ38KUCHzZ/KNPRHemzB4iC1kmHTTEpvKHhxLuoVVEJrqGJjKmnGFO6jWcCjxA yPby+NV13uSklYw829P5VbrJlJao5MB2ly0Xxgz+JFEpEoYvBsYKa7a9LXyQBgrfCSuJ /HjBRIr3CCqm1IubGqBH2XlcU/f//isNaJ5V+67+bQV1Z1wMs0wlMynitSPdJr8JHTYi WyISYiFT8D2ifivA9WGCaeekXtTLG+sOtLe56LMMAgDQ5Y7Gr7P320a3Iu4rJF19RuEr 3Chs940SmZH2cZzi/pwgF7/duCeayy+mMAPk0TtVxImedgO+6BqqESabHvK+RHH+Oprx VkhA== 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=Hv4//qBad9Yvbanpr+nZV5ylNrU3hUxRVl4tlE/G9Y8=; b=RRNzhsJ3DAHXhg1umzcnJ8fuzlNqMyxSkLbFJTnYD0pvmaxvZz8bvsuhSheRYhwF1u uDyd1lsfE4phofKlJRWM1ButvRphxujqJTCBUTKRfPsZyhW1ACknpjHu6lflYQJzBPmj XEWhaYJRkpHKZqKbRxNXjf98u4xrLCDGzvUAGtQ+wQqjWJ63YNv8LSamEMuko/rvVQI3 ihWJC57PAT05H0i2VtZNCJk4egs2GyTCfJRitYginodEmWuKZWjHrmvF5EV5Asn5omaM 6oI2IJBDIFJRN0raPAhnRR6nuN6aEWlMRIvJ5nlIHT8suQBSf5J5OaARonpvlgU2GLRq pv0A== 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 b15si1409112iti.114.2017.11.07.06.01.30; Tue, 07 Nov 2017 06:01:31 -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 78ECF60CCE; Tue, 7 Nov 2017 14:01:30 +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 5686960C1E; Tue, 7 Nov 2017 14:00:29 +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 8F1D06069F; Tue, 7 Nov 2017 14:00:18 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 22B7C60386 for ; Tue, 7 Nov 2017 14:00:17 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward103p.mail.yandex.net (Yandex) with ESMTP id A9DDF218378E for ; Tue, 7 Nov 2017 17:00:15 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id gsW35KsZZ2-0Em8O8Xi; Tue, 07 Nov 2017 17:00:14 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mAkgTAX8AR-0DeiKL5p; Tue, 07 Nov 2017 17:00:13 +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: Tue, 7 Nov 2017 17:00:10 +0300 Message-Id: <1510063212-30218-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> References: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v3 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: 17e6f7bd8c2da61bad27d90c4b530c0f5a80fb0d **/ 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..ed1fd6784 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -80,6 +80,9 @@ typedef enum { /** AES with cipher block chaining */ ODP_CIPHER_ALG_AES_CBC, + /** AES with counter mode */ + ODP_CIPHER_ALG_AES_CTR, + /** AES in Galois/Counter Mode * * @note Must be paired with cipher ODP_AUTH_ALG_AES_GCM @@ -90,7 +93,7 @@ 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), } odp_cipher_alg_t; @@ -160,6 +163,9 @@ typedef union odp_crypto_cipher_algos_t { /** ODP_CIPHER_ALG_AES_CBC */ uint32_t aes_cbc : 1; + /** ODP_CIPHER_ALG_AES_CTR */ + uint32_t aes_ctr : 1; + /** ODP_CIPHER_ALG_AES_GCM */ uint32_t aes_gcm : 1; From patchwork Tue Nov 7 14:00:11 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: 118169 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4014536qgn; Tue, 7 Nov 2017 06:02:30 -0800 (PST) X-Google-Smtp-Source: ABhQp+SxUQkMfrcz60+LGLUrgZ78xelstWL6YaA2ZNGzDAA16Gi+ZEF+2ipzlrK520jJnAMcliob X-Received: by 10.36.86.137 with SMTP id o131mr2295124itb.7.1510063350663; Tue, 07 Nov 2017 06:02:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510063350; cv=none; d=google.com; s=arc-20160816; b=jrg6PwsQ2IsGgqTHwx0tEq9TW5fWy+FYTjXdeh56iC/juiU3E4XJWnaN8oNohnX3nM 6SQDWWKdpnIrc68kV+1Fs/Lc0F+qTlSuHMZoTio15C31IwoC/EuvMBg94SJtdClZlmvw DZk5CB7xeI82lLVLawzq9Y4yrzVSz5DUOKj1n7LJK9BzHowM2WeArg1rJejLHlvjqTSF SghI/vHm+4TM5onuAwkh8wYLbXfGBREOZl1ANpBfJPtvME2+7RUHnOSVl8kc7fS+3ojx 0Fzp5VLPiQbd0oTKcPzlkj1DDP1BzUnkaHxALgku6JdE576XD7Uocq2WM8+bi8Z21ZbA g4yA== 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=SGYCfzuwu/f6BL2Lanr02qOWpPHgS6RwNgRRv4THH6g=; b=0y5SrlC1kIM5inoOractCoOLdTYyyWDnjReNNNTKiPRQ1SOjrLSLfqO3Dd5B60/bUz uDubo3OeKQZaYnxn1/hUVlxV0NeyYf63bhY9599/QfhMQnKKNz4UyJ7z+i4e6zGBt/qK 41hTGUxVTqsWSg0ONA1k0l7oVNX1h1qHeHeTLT2Zsj5mJVaLeyiha0KmI2UKvkEBgmBq 1cEcpBVRfQmZTIIGVqt1C/YNATSQo+P7dcrmqiiWvwjYvMJOsCCUcxf7ZI6WP8KybXNY Zdcz+3y7DUYlLiXUMyehTKEVDtwajYfk0bbWQosfC/nktyS/r8pNJgoZVQRRaE2EE220 zMMg== 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 v132si1058877iod.270.2017.11.07.06.02.30; Tue, 07 Nov 2017 06:02:30 -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 2A3DB60C26; Tue, 7 Nov 2017 14:02:30 +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 AD8946013B; Tue, 7 Nov 2017 14:00:36 +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 3B21560605; Tue, 7 Nov 2017 14:00:24 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 1FD3A6013B for ; Tue, 7 Nov 2017 14:00:18 +0000 (UTC) Received: from mxback6o.mail.yandex.net (mxback6o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::20]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 9FF754301626 for ; Tue, 7 Nov 2017 17:00:16 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback6o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id q1n5BnhhUz-0Gaacgcj; Tue, 07 Nov 2017 17:00:16 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mAkgTAX8AR-0FeGgwRf; Tue, 07 Nov 2017 17:00:15 +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: Tue, 7 Nov 2017 17:00:11 +0300 Message-Id: <1510063212-30218-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> References: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v3 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: 17e6f7bd8c2da61bad27d90c4b530c0f5a80fb0d **/ 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..ba1058f35 100644 --- a/test/validation/api/crypto/crypto.h +++ b/test/validation/api/crypto/crypto.h @@ -20,6 +20,10 @@ void crypto_test_enc_alg_aes_cbc(void); void crypto_test_enc_alg_aes_cbc_ovr_iv(void); void crypto_test_dec_alg_aes_cbc(void); void crypto_test_dec_alg_aes_cbc_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_enc_alg_aes_gcm(void); void crypto_test_enc_alg_aes_gcm_ovr_iv(void); void crypto_test_dec_alg_aes_gcm(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..1f7523de2 100644 --- a/test/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/validation/api/crypto/odp_crypto_test_inp.c @@ -325,6 +325,9 @@ static void alg_test(odp_crypto_op_t op, if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && !(capa.ciphers.bit.aes_cbc)) rc = -1; + if (cipher_alg == ODP_CIPHER_ALG_AES_CTR && + !(capa.ciphers.bit.aes_ctr)) + rc = -1; if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && !(capa.ciphers.bit.aes_gcm)) 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); @@ -1098,6 +1187,14 @@ odp_testinfo_t crypto_suite[] = { check_alg_aes_cbc), ODP_TEST_INFO_CONDITIONAL(crypto_test_dec_alg_aes_cbc_ovr_iv, check_alg_aes_cbc), + 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_enc_alg_aes_gcm, check_alg_aes_gcm), ODP_TEST_INFO_CONDITIONAL(crypto_test_enc_alg_aes_gcm_ovr_iv, 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 Tue Nov 7 14:00:12 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: 118170 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4017215qgn; Tue, 7 Nov 2017 06:04:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMYMNF04FWn1VrvY7yMIp4HvhWcU7fyRZiBrKjDmAQdIOr5p4xSrZecA8wFWB609K17tOGVF X-Received: by 10.55.158.148 with SMTP id h142mr5011068qke.209.1510063461949; Tue, 07 Nov 2017 06:04:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510063461; cv=none; d=google.com; s=arc-20160816; b=Ra34lXPvLgPkgIkSlbCbcd6qs80jQen3w8UuiOmxdvzEQ4dti1knrWXZxHUkDbtc3N f5aT2VfhYN/BzigGOnt2ufVMMov4pCBTJykptni6uUqcMicvYu9ZAVzCb83yi3kz5/6C LOVlo3I6HlYJYNW2W7LMDIk12tVXXvdfMag3X7BIRTZG787K5lrO89xkh5eNkkkRbkLX Jy+E93leiTvF8HqLlcg7SIfbHszIU4/b7ZOCwfLEGjH3W/5j/TZ6QZpvXWCtczH7LaB/ 3FrEykZVwbyEnZx35cCIEERteHRBFzmCriJwr5rG6KIteUiopMkeByTCU9TAUbuxXNts Qzhg== 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=LeJPnG7vvjE8nzbo/lPJqd0kmyQg09g7EQea7nQ59EY=; b=KpycEHPoezFURb0/5rXRHaT5t+Hl4pLi+8f7SpNtriu2a5ObPGZ8EfC9siCrFmYxoy k/GrQ3TchrjC/37TBALe1vbaV82VNG05MpIFwbhsm3HzlipE83ekKCEcGfTky7KktQGd fwiy57omv+DjtimaBVXdPiXhaRmhOQA9KuOjnhtqidabi9uWEuwDArXQXB3uLlKEoFMn GRTTdCfXLyW2AvL7E3GsCp3Xug38ZjezjwT90p8NqeuyZF0Mj8eIn9lsSsVZk20AeyOi UKByavfZFxYHWgeb/Fi6Ai3BzWG0C0qZBvob4jEUMBn4oK1sCEsBOgBfR/FzLLWp4nMN 1Deg== 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 u63si1176319qka.307.2017.11.07.06.04.21; Tue, 07 Nov 2017 06:04:21 -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 44DF160C88; Tue, 7 Nov 2017 14:04:21 +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 33F3860C6A; Tue, 7 Nov 2017 14:00:56 +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 C628E60386; Tue, 7 Nov 2017 14:00:25 +0000 (UTC) Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by lists.linaro.org (Postfix) with ESMTPS id 8AF6A60592 for ; Tue, 7 Nov 2017 14:00:18 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 09E4934C4F65 for ; Tue, 7 Nov 2017 17:00:17 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id bhlkY2TafU-0GCaSxIf; Tue, 07 Nov 2017 17:00:16 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id mAkgTAX8AR-0GeucXNW; Tue, 07 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: Tue, 7 Nov 2017 17:00:12 +0300 Message-Id: <1510063212-30218-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> References: <1510063212-30218-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 271 Subject: [lng-odp] [PATCH API-NEXT v3 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: 17e6f7bd8c2da61bad27d90c4b530c0f5a80fb0d **/ 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..9341e2c78 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -51,6 +51,11 @@ static const odp_crypto_cipher_capability_t cipher_capa_aes_cbc[] = { {.key_len = 24, .iv_len = 16}, {.key_len = 32, .iv_len = 16} }; +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} }; + static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { {.key_len = 16, .iv_len = 12}, {.key_len = 24, .iv_len = 12}, @@ -592,6 +597,7 @@ int odp_crypto_capability(odp_crypto_capability_t *capa) capa->ciphers.bit.des = 1; capa->ciphers.bit.trides_cbc = 1; capa->ciphers.bit.aes_cbc = 1; + capa->ciphers.bit.aes_ctr = 1; capa->ciphers.bit.aes_gcm = 1; capa->auths.bit.null = 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