From patchwork Thu Jun 29 11:35:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 26040 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7EE7C7D0D; Thu, 29 Jun 2017 21:36:52 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 53D847CC2 for ; Thu, 29 Jun 2017 21:36:13 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2017 12:36:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,282,1496127600"; d="scan'208";a="873176762" Received: from silpixa00399464.ir.intel.com (HELO silpixa00399464.ger.corp.intel.com) ([10.237.222.157]) by FMSMGA003.fm.intel.com with ESMTP; 29 Jun 2017 12:36:10 -0700 From: Pablo de Lara To: declan.doherty@intel.com, zbigniew.bodek@caviumnetworks.com, jerin.jacob@caviumnetworks.com, akhil.goyal@nxp.com, hemant.agrawal@nxp.com, fiona.trahe@intel.com, john.griffin@intel.com, deepak.k.jain@intel.com Cc: dev@dpdk.org, Pablo de Lara Date: Thu, 29 Jun 2017 12:35:21 +0100 Message-Id: <20170629113521.5560-27-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170629113521.5560-1-pablo.de.lara.guarch@intel.com> References: <20170626102300.56637-1-pablo.de.lara.guarch@intel.com> <20170629113521.5560-1-pablo.de.lara.guarch@intel.com> Subject: [dpdk-dev] [PATCH v3 26/26] cryptodev: remove AAD from authentication structure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Now that AAD is only used in AEAD algorithms, there is no need to keep AAD in the authentication structure. Signed-off-by: Pablo de Lara Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_ops.c | 2 -- doc/guides/prog_guide/cryptodev_lib.rst | 6 ------ doc/guides/rel_notes/release_17_08.rst | 3 +++ drivers/crypto/openssl/rte_openssl_pmd.c | 1 - lib/librte_cryptodev/rte_crypto_sym.h | 26 -------------------------- test/test/test_cryptodev.c | 4 ---- test/test/test_cryptodev_perf.c | 1 - 7 files changed, 3 insertions(+), 40 deletions(-) diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c index a63fd83..8407503 100644 --- a/app/test-crypto-perf/cperf_ops.c +++ b/app/test-crypto-perf/cperf_ops.c @@ -425,7 +425,6 @@ cperf_create_session(uint8_t dev_id, test_vector->auth_iv.length; } else { auth_xform.auth.digest_length = 0; - auth_xform.auth.add_auth_data_length = 0; auth_xform.auth.key.length = 0; auth_xform.auth.key.data = NULL; auth_xform.auth.iv.length = 0; @@ -478,7 +477,6 @@ cperf_create_session(uint8_t dev_id, test_vector->auth_key.data; } else { auth_xform.auth.digest_length = 0; - auth_xform.auth.add_auth_data_length = 0; auth_xform.auth.key.length = 0; auth_xform.auth.key.data = NULL; auth_xform.auth.iv.length = 0; diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst index 5048839..f250c00 100644 --- a/doc/guides/prog_guide/cryptodev_lib.rst +++ b/doc/guides/prog_guide/cryptodev_lib.rst @@ -567,12 +567,6 @@ chain. uint8_t *data; phys_addr_t phys_addr; } digest; /**< Digest parameters */ - - struct { - uint8_t *data; - phys_addr_t phys_addr; - } aad; - /**< Additional authentication parameters */ } auth; }; }; diff --git a/doc/guides/rel_notes/release_17_08.rst b/doc/guides/rel_notes/release_17_08.rst index 2c6bef5..d29b203 100644 --- a/doc/guides/rel_notes/release_17_08.rst +++ b/doc/guides/rel_notes/release_17_08.rst @@ -176,6 +176,9 @@ API Changes * Changed field size of digest length in ``rte_crypto_auth_xform``, from uint32_t to uint16_t. * Added AEAD structure in ``rte_crypto_sym_op``. + * Removed AAD length from ``rte_crypto_auth_xform``. + * Removed AAD pointer and physical address from auth structure + in ``rte_crypto_sym_op``. ABI Changes diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 7f5c6aa..73e7ff1 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -413,7 +413,6 @@ openssl_set_session_auth_parameters(struct openssl_session *sess, return -EINVAL; } - sess->auth.aad_length = xform->auth.add_auth_data_length; sess->auth.digest_length = xform->auth.digest_length; return 0; diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/librte_cryptodev/rte_crypto_sym.h index dab042b..742dc34 100644 --- a/lib/librte_cryptodev/rte_crypto_sym.h +++ b/lib/librte_cryptodev/rte_crypto_sym.h @@ -326,13 +326,6 @@ struct rte_crypto_auth_xform { * the result shall be truncated. */ - uint16_t add_auth_data_length; - /**< The length of the additional authenticated data (AAD) in bytes. - * The maximum permitted value is 65535 (2^16 - 1) bytes, unless - * otherwise specified below. - * - */ - struct { uint16_t offset; /**< Starting point for Initialisation Vector or Counter, @@ -670,25 +663,6 @@ struct rte_crypto_sym_op { phys_addr_t phys_addr; /**< Physical address of digest */ } digest; /**< Digest parameters */ - - struct { - uint8_t *data; - /**< Pointer to Additional Authenticated - * Data (AAD) needed for authenticated cipher - * mechanisms (CCM and GCM). - * - * The length of the data pointed to by this - * field is set up for the session in the @ref - * rte_crypto_auth_xform structure as part of - * the @ref rte_cryptodev_sym_session_create - * function call. - * This length must not exceed 65535 (2^16-1) - * bytes. - * - */ - phys_addr_t phys_addr; /**< physical address */ - } aad; - /**< Additional authentication parameters */ } auth; }; }; diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c index 21c6270..db0999e 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -5530,7 +5530,6 @@ static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params, ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_MD5_HMAC; ut_params->auth_xform.auth.digest_length = MD5_DIGEST_LEN; - ut_params->auth_xform.auth.add_auth_data_length = 0; ut_params->auth_xform.auth.key.length = test_case->key.len; ut_params->auth_xform.auth.key.data = key; @@ -6303,7 +6302,6 @@ static int create_gmac_session(uint8_t dev_id, ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC; ut_params->auth_xform.auth.op = auth_op; ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len; - ut_params->auth_xform.auth.add_auth_data_length = 0; ut_params->auth_xform.auth.key.length = tdata->key.len; ut_params->auth_xform.auth.key.data = auth_key; ut_params->auth_xform.auth.iv.offset = IV_OFFSET; @@ -6683,7 +6681,6 @@ create_auth_session(struct crypto_unittest_params *ut_params, ut_params->auth_xform.auth.key.length = reference->auth_key.len; ut_params->auth_xform.auth.key.data = auth_key; ut_params->auth_xform.auth.digest_length = reference->digest.len; - ut_params->auth_xform.auth.add_auth_data_length = reference->aad.len; /* Create Crypto session*/ ut_params->sess = rte_cryptodev_sym_session_create(dev_id, @@ -6721,7 +6718,6 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params, ut_params->auth_xform.auth.iv.length = reference->iv.len; } else { ut_params->auth_xform.next = &ut_params->cipher_xform; - ut_params->auth_xform.auth.add_auth_data_length = reference->aad.len; /* Setup Cipher Parameters */ ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER; diff --git a/test/test/test_cryptodev_perf.c b/test/test/test_cryptodev_perf.c index 5b2468d..7ae1ae9 100644 --- a/test/test/test_cryptodev_perf.c +++ b/test/test/test_cryptodev_perf.c @@ -2936,7 +2936,6 @@ test_perf_set_crypto_op_aes(struct rte_crypto_op *op, struct rte_mbuf *m, if (chain == CIPHER_ONLY) { op->sym->auth.digest.data = NULL; op->sym->auth.digest.phys_addr = 0; - op->sym->auth.aad.data = NULL; op->sym->auth.data.offset = 0; op->sym->auth.data.length = 0; } else {