From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
To: declan.doherty@intel.com
Cc: dev@dpdk.org, Pablo de Lara <pablo.de.lara.guarch@intel.com>,
stable@dpdk.org
Subject: [dpdk-stable] [PATCH 2/9] test/crypto: fix wrong AAD setting
Date: Wed, 21 Jun 2017 07:41:47 +0100 [thread overview]
Message-ID: <20170621064154.25124-3-pablo.de.lara.guarch@intel.com> (raw)
In-Reply-To: <20170621064154.25124-1-pablo.de.lara.guarch@intel.com>
AAD should not point at IV for AES algorithms.
For AES-GCM, AAD will point at additional data in the mbuf.
For the other algorithms (such as AES CBC), AAD is not used.
Fixes: ffbe3be0d4b5 ("app/test: add libcrypto")
CC: stable@dpdk.org
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
test/test/test_cryptodev_perf.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/test/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c
index d60028d..3568b01 100644
--- a/test/test/test_cryptodev_perf.c
+++ b/test/test/test_cryptodev_perf.c
@@ -2634,6 +2634,11 @@ static uint8_t aes_iv[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
+static uint8_t aes_gcm_aad[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
static uint8_t triple_des_key[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2895,7 +2900,7 @@ test_perf_create_armv8_session(uint8_t dev_id, enum chain_mode chain,
#define AES_BLOCK_SIZE 16
#define AES_CIPHER_IV_LENGTH 16
-
+#define AES_GCM_AAD_LENGTH 16
#define TRIPLE_DES_BLOCK_SIZE 8
#define TRIPLE_DES_CIPHER_IV_LENGTH 8
@@ -2939,8 +2944,6 @@ test_perf_set_crypto_op_aes(struct rte_crypto_op *op, struct rte_mbuf *m,
op->sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
AES_CIPHER_IV_LENGTH + data_len);
op->sym->auth.digest.length = digest_len;
- op->sym->auth.aad.data = aes_iv;
- op->sym->auth.aad.length = AES_CIPHER_IV_LENGTH;
op->sym->auth.data.offset = AES_CIPHER_IV_LENGTH;
op->sym->auth.data.length = data_len;
}
@@ -2977,8 +2980,8 @@ test_perf_set_crypto_op_aes_gcm(struct rte_crypto_op *op, struct rte_mbuf *m,
op->sym->auth.digest.phys_addr =
rte_pktmbuf_mtophys_offset(m, data_len);
op->sym->auth.digest.length = digest_len;
- op->sym->auth.aad.data = aes_iv;
- op->sym->auth.aad.length = AES_CIPHER_IV_LENGTH;
+ op->sym->auth.aad.data = aes_gcm_aad;
+ op->sym->auth.aad.length = AES_GCM_AAD_LENGTH;
/* Cipher Parameters */
op->sym->cipher.iv.data = aes_iv;
--
2.9.4
next prev parent reply other threads:[~2017-06-21 14:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170621064154.25124-1-pablo.de.lara.guarch@intel.com>
2017-06-21 6:41 ` [dpdk-stable] [PATCH 1/9] crypto/aesni_mb: remove assert check Pablo de Lara
2017-06-21 6:41 ` Pablo de Lara [this message]
2017-06-21 17:39 ` [dpdk-stable] [dpdk-dev] [PATCH 2/9] test/crypto: fix wrong AAD setting Trahe, Fiona
2017-06-22 10:40 ` De Lara Guarch, Pablo
2017-06-21 6:41 ` [dpdk-stable] [PATCH 6/9] examples/l2fwd-crypto: fix application help Pablo de Lara
2017-06-21 16:43 ` [dpdk-stable] [dpdk-dev] " Trahe, Fiona
2017-06-21 6:41 ` [dpdk-stable] [PATCH 7/9] examples/l2fwd-crypto: fix auth info display Pablo de Lara
2017-06-21 16:44 ` [dpdk-stable] [dpdk-dev] " Trahe, Fiona
2017-06-21 6:41 ` [dpdk-stable] [PATCH 8/9] app/crypto-perf: fix error message Pablo de Lara
2017-06-21 16:39 ` [dpdk-stable] [dpdk-dev] " Trahe, Fiona
2017-06-21 6:41 ` [dpdk-stable] [PATCH 9/9] doc: fix typo in l2fwd-crypto usage Pablo de Lara
2017-06-21 17:44 ` [dpdk-stable] [dpdk-dev] " Trahe, Fiona
[not found] ` <20170622120235.46063-1-pablo.de.lara.guarch@intel.com>
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 1/9] crypto/aesni_mb: remove assert check Pablo de Lara
2017-06-23 12:50 ` Declan Doherty
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 2/9] test/crypto: fix wrong AAD setting Pablo de Lara
2017-06-23 9:56 ` Trahe, Fiona
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 6/9] examples/l2fwd-crypto: fix application help Pablo de Lara
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 7/9] examples/l2fwd-crypto: fix auth info display Pablo de Lara
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 8/9] app/crypto-perf: fix error message Pablo de Lara
2017-06-22 12:02 ` [dpdk-stable] [PATCH v2 9/9] doc: fix typo in l2fwd-crypto usage Pablo de Lara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170621064154.25124-3-pablo.de.lara.guarch@intel.com \
--to=pablo.de.lara.guarch@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).