From patchwork Mon Dec 18 15:00:21 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: 122236 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2950156qgn; Mon, 18 Dec 2017 07:08:12 -0800 (PST) X-Google-Smtp-Source: ACJfBot5r7CU5Uf4rReyzBQyi9sXHIdV7xFneL9JMBFzkje0Kb++1BGw+n984IdiuDzCTvb8tDlg X-Received: by 10.55.127.193 with SMTP id a184mr26088qkd.119.1513609692000; Mon, 18 Dec 2017 07:08:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513609691; cv=none; d=google.com; s=arc-20160816; b=SvQFAcPUCD7OYUtXzWF7K9lXwwoieAx1UlOv5hfInRzXunDdC+Cjqip8ZgN34jWLAO 29D0YK6SKrZ+6p0t3r8xtveGFI0p3yEsJ9CgbP0FUL9oam15uQ21Tqkfv84YcYsIfmTz Im/9fhyvx+NGAFd1UGVa3eL1xtJNqMofI3auM/2ivn8sxS0+bivXU4uq9hB0wY7H22t4 /0N6+HlExAXvbxLFT2ziMMDqu5Rkk8L8IOf39TLbxaAFc3/RlDTfgmvLPbzKzHKGHcYI qfSFimE5fdpC4fwLXDiamDfiIXpaufzapY/9OjnRNjX1PlpFV9fjT0FZgmpSdGtGUren w9Ww== 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=RNOZioGQptsn1Mouue3hAyWvTMwiKtthRp/Wrg/qdLo=; b=VrBzDXXPhhYaGwdhzoLm36hMahshUawRFBJkXHvswdUU8gb91YogoG5d6Bc9mclvdu l2XiRNJ+e29Bj3WbLwyZlTrDv41D0j2V/+DLoip/3qmIw+IMJ1kGNg8U+1yZzmjite2e W/p/+8otbiRDmfYBSIlC8e8IlSvJV0xUxwHGOldhNNgcdhHkXTdcuGAmaeOydglrbl3c 6YoloW8lF5GgJ3WD0vFXT24oa7QO4sQV1mVaOFlC3uMql+Hq/lxNdJ6S/5aPXs3whFSj Z7TfHKgz6HQeyo24SPpveuLYg7IpdkqAxyekVuIDmBpYMmQ+PSI9KDxKeJLLD9e6SFVm sHeQ== 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 z5si1514053qkb.109.2017.12.18.07.08.11; Mon, 18 Dec 2017 07:08:11 -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 9FD136151E; Mon, 18 Dec 2017 15:08:11 +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_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 B93F0609A2; Mon, 18 Dec 2017 15:01:45 +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 D1F656085F; Mon, 18 Dec 2017 15:01:29 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 8DBD6608A7 for ; Mon, 18 Dec 2017 15:00:32 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 1E1445A02D11 for ; Mon, 18 Dec 2017 18:00:31 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YCoJRtjBtl-0VDaCObk; Mon, 18 Dec 2017 18:00:31 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wGOKnC8159-0UuiYQtu; Mon, 18 Dec 2017 18:00:30 +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: Mon, 18 Dec 2017 18:00:21 +0300 Message-Id: <1513609222-7581-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513609222-7581-1-git-send-email-odpbot@yandex.ru> References: <1513609222-7581-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 342 Subject: [lng-odp] [PATCH v7 3/4] linux-gen: crypto: move session type to odp_crypto module 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 There is no point in having odp_crypto_generic_session_t definition in global include file. Move it to odp_crypto module. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 342 (lumag:openssl-ctx) ** https://github.com/Linaro/odp/pull/342 ** Patch: https://github.com/Linaro/odp/pull/342.patch ** Base sha: 6b5cdc77eb9759a2349b10372a964648559bc92c ** Merge commit sha: a4f9f27409a74cc7c659d7f9970dde3d61fb9c57 **/ .../linux-generic/include/odp_crypto_internal.h | 50 ---------------------- platform/linux-generic/odp_crypto.c | 41 +++++++++++++++++- 2 files changed, 40 insertions(+), 51 deletions(-) diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h index c3b70b231..bdbbf7379 100644 --- a/platform/linux-generic/include/odp_crypto_internal.h +++ b/platform/linux-generic/include/odp_crypto_internal.h @@ -11,50 +11,8 @@ extern "C" { #endif -#include - -#define MAX_IV_LEN 64 #define OP_RESULT_MAGIC 0x91919191 -/** Forward declaration of session structure */ -typedef struct odp_crypto_generic_session odp_crypto_generic_session_t; - -/** - * Algorithm handler function prototype - */ -typedef -odp_crypto_alg_err_t (*crypto_func_t)(odp_crypto_op_param_t *param, - odp_crypto_generic_session_t *session); - -/** - * Per crypto session data structure - */ -struct odp_crypto_generic_session { - struct odp_crypto_generic_session *next; - - /* Session creation parameters */ - odp_crypto_session_param_t p; - - odp_bool_t do_cipher_first; - - struct { - /* Copy of session IV data */ - uint8_t iv_data[MAX_IV_LEN]; - uint8_t key_data[EVP_MAX_KEY_LENGTH]; - - const EVP_CIPHER *evp_cipher; - crypto_func_t func; - } cipher; - - struct { - uint8_t key[EVP_MAX_KEY_LENGTH]; - uint32_t key_length; - uint32_t bytes; - const EVP_MD *evp_md; - crypto_func_t func; - } auth; -}; - /** * Per packet operation result */ @@ -63,14 +21,6 @@ typedef struct odp_crypto_generic_op_result { odp_crypto_op_result_t result; } odp_crypto_generic_op_result_t; -/** - * Per session creation operation result - */ -typedef struct odp_crypto_generic_session_result { - odp_crypto_ses_create_err_t rc; - odp_crypto_session_t session; -} odp_crypto_generic_session_result_t; - #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 4c708931a..9b5d94034 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -75,6 +75,45 @@ static const odp_crypto_auth_capability_t auth_capa_sha512_hmac[] = { static const odp_crypto_auth_capability_t auth_capa_aes_gcm[] = { {.digest_len = 16, .key_len = 0, .aad_len = {.min = 8, .max = 12, .inc = 4} } }; +/** Forward declaration of session structure */ +typedef struct odp_crypto_generic_session_t odp_crypto_generic_session_t; + +/** + * Algorithm handler function prototype + */ +typedef +odp_crypto_alg_err_t (*crypto_func_t)(odp_crypto_op_param_t *param, + odp_crypto_generic_session_t *session); + +/** + * Per crypto session data structure + */ +struct odp_crypto_generic_session_t { + odp_crypto_generic_session_t *next; + + /* Session creation parameters */ + odp_crypto_session_param_t p; + + odp_bool_t do_cipher_first; + + struct { + /* Copy of session IV data */ + uint8_t iv_data[EVP_MAX_IV_LENGTH]; + uint8_t key_data[EVP_MAX_KEY_LENGTH]; + + const EVP_CIPHER *evp_cipher; + crypto_func_t func; + } cipher; + + struct { + uint8_t key[EVP_MAX_KEY_LENGTH]; + uint32_t key_length; + uint32_t bytes; + const EVP_MD *evp_md; + crypto_func_t func; + } auth; +}; + typedef struct odp_crypto_global_s odp_crypto_global_t; struct odp_crypto_global_s { @@ -705,7 +744,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, /* Copy parameters */ session->p = *param; - if (session->p.iv.length > MAX_IV_LEN) { + if (session->p.iv.length > EVP_MAX_IV_LENGTH) { ODP_DBG("Maximum IV length exceeded\n"); free_session(session); return -1;