From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id F15F2235 for ; Tue, 21 Nov 2017 14:26:39 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A484F20AF5; Tue, 21 Nov 2017 08:26:39 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:26:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=xCWo046NMq2JIPOwL lPJ+J/eDhKVf1l18x4sZQ4d0a4=; b=tpvZgQhVeqfYCUgctcBbmkLyMHEmI1SQ7 Ji2aNKjHq3WpYtK4OBJ/6L4MsDfnD3agcaY8QbQ+Ekx9WipUz+jtJwh4tpGUpUMG /QQDIqYwnznKA3bW247nyvGwDn9gYiH2aGI+j8/XTbwJCCe12HECgPdGDiADYEsn ZZ+e1kOAeOXjZCmjfL54RzaOKa0s8NRwQJziJuX0cE2R6+yi0BuNd/aNriaVwjXI OTUu4PDxKT14+wbjAfydhDefDfFU/JJ99Dg4UptHtPZijdJ1cjnx/QtooAwjCZ7i EDRw4yaTbFdvuxXiheiubmM8EnEXE2jBDKsEErobel1iOI6ak7evQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=xCWo046NMq2JIPOwLlPJ+J/eDhKVf1l18x4sZQ4d0a4=; b=Nmb2/jBG C1rUUJtUcdq8UI84e5zydiWVkEdJCgFAVoUzCu0TsEvQdkqq99b2R9rUk27Fgg7/ Bel3gitE8IKCC/Q0d0hlmpuHxmMZEDohDZxh4uaUIO4BicgWvv8giHAqLhreicAC f0YORDOkOLx56EXOOf2hlTD/roayVZBjLzpqw5CQXXLhYDyMPCF+BqwpGCtVBPYk 6EJi1PoBDuwTP0i5bEsQKR0xC9T/iuyu3HY0iC+b6C4KEHum0Mh7yjMNyO6annSF zTqc6yumVhBL7Gyq6nBiyDtx2vrNflPUAhBTjVOdXp9qpU339bP6lQDqr9kL1RaN 3TpJnN3TN8KIlA== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D266243B9; Tue, 21 Nov 2017 08:26:34 -0500 (EST) From: Yuanhan Liu To: Pablo de Lara Cc: Akhil Goyal , dpdk stable Date: Tue, 21 Nov 2017 21:17:37 +0800 Message-Id: <1511270333-31002-115-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'app/crypto-perf: parse AEAD data from vectors' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:26:40 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 8075b7d25a247d5a8780cb69ef041740b8723106 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Wed, 4 Oct 2017 04:46:08 +0100 Subject: [PATCH] app/crypto-perf: parse AEAD data from vectors [ upstream commit da181392529487311a13f2717342d2dc17a1e1ab ] Since DPDK 17.08, there is specific parameters for AEAD algorithm, like AES-GCM. When verifying crypto operations with test vectors, the parser was not reading AEAD data (such as IV or key). Fixes: 8a5b494a7f99 ("app/test-crypto-perf: add AEAD parameters") Signed-off-by: Pablo de Lara Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_test_vector_parsing.c | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c index 148a604..3952632 100644 --- a/app/test-crypto-perf/cperf_test_vector_parsing.c +++ b/app/test-crypto-perf/cperf_test_vector_parsing.c @@ -116,6 +116,20 @@ show_test_vector(struct cperf_test_vector *test_vector) printf("\n"); } + if (test_vector->aead_key.data) { + printf("\naead_key =\n"); + for (i = 0; i < test_vector->aead_key.length; ++i) { + if ((i % wrap == 0) && (i != 0)) + printf("\n"); + if (i == (uint32_t)(test_vector->aead_key.length - 1)) + printf("0x%02x", test_vector->aead_key.data[i]); + else + printf("0x%02x, ", + test_vector->aead_key.data[i]); + } + printf("\n"); + } + if (test_vector->cipher_iv.data) { printf("\ncipher_iv =\n"); for (i = 0; i < test_vector->cipher_iv.length; ++i) { @@ -142,6 +156,19 @@ show_test_vector(struct cperf_test_vector *test_vector) printf("\n"); } + if (test_vector->aead_iv.data) { + printf("\naead_iv =\n"); + for (i = 0; i < test_vector->aead_iv.length; ++i) { + if ((i % wrap == 0) && (i != 0)) + printf("\n"); + if (i == (uint32_t)(test_vector->aead_iv.length - 1)) + printf("0x%02x", test_vector->aead_iv.data[i]); + else + printf("0x%02x, ", test_vector->aead_iv.data[i]); + } + printf("\n"); + } + if (test_vector->ciphertext.data) { printf("\nciphertext =\n"); for (i = 0; i < test_vector->ciphertext.length; ++i) { @@ -345,6 +372,20 @@ parse_entry(char *entry, struct cperf_test_vector *vector, vector->auth_key.length = opts->auth_key_sz; } + } else if (strstr(key_token, "aead_key")) { + rte_free(vector->aead_key.data); + vector->aead_key.data = data; + if (tc_found) + vector->aead_key.length = data_length; + else { + if (opts->aead_key_sz > data_length) { + printf("Global aead_key shorter than " + "aead_key_sz\n"); + return -1; + } + vector->aead_key.length = opts->aead_key_sz; + } + } else if (strstr(key_token, "cipher_iv")) { rte_free(vector->cipher_iv.data); vector->cipher_iv.data = data; @@ -373,6 +414,20 @@ parse_entry(char *entry, struct cperf_test_vector *vector, vector->auth_iv.length = opts->auth_iv_sz; } + } else if (strstr(key_token, "aead_iv")) { + rte_free(vector->aead_iv.data); + vector->aead_iv.data = data; + if (tc_found) + vector->aead_iv.length = data_length; + else { + if (opts->aead_iv_sz > data_length) { + printf("Global aead iv shorter than " + "aead_iv_sz\n"); + return -1; + } + vector->aead_iv.length = opts->aead_iv_sz; + } + } else if (strstr(key_token, "ciphertext")) { rte_free(vector->ciphertext.data); vector->ciphertext.data = data; -- 2.7.4