From patchwork Tue Jan 9 01:00:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 123803 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3406111qgn; Mon, 8 Jan 2018 17:04:24 -0800 (PST) X-Google-Smtp-Source: ACJfBovwe8cATrrWL+s+masCnjvmWxBdJDXqIqTPhnWmBQE4iGot3O/hhDadXiOgBocqoyJgzbIl X-Received: by 10.200.23.18 with SMTP id w18mr19847286qtj.131.1515459864660; Mon, 08 Jan 2018 17:04:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515459864; cv=none; d=google.com; s=arc-20160816; b=ZyHTqeuhjKlW2v/xdnFPvntErsmMX8gMjD00PjrWS3VE01AuU8asJAyK3TxbPMZv3a Zdza2OYjY/OSHtUVdvn5z/STzGDYXN7YDilVP5B7NvgdVVzLNUVp0MRNubGqqA3396Qt sCJpLZzygDHDPWlWhKLI5LLReuEA2e3SSVH2DAcKPFpgdsG560MI78PbDogIYyNg4DNY 9DDWZqMPUG99BUgbSRw13TR7alXUFHsIxsL6T1uejYVxZhpezyHzRXH5Y5aKOtNohW7Y Rra4eOzNLvxlZf5OuTxSHuwQkkm4dpnj4jZ+BZOAB5TkHSLK+XkTB9OLfuIj2X8k8l0i eUvQ== 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=LZAz6so49DH4rpIZm+uyiu1r15qxnMQgFLSonKLHGjs=; b=jSkzAmZIhFtNMP0w+ROnG4AnL6V1DDXdg5wpRBFpywSmq5JU30HGhBG/cGMYpJcenx m7FJCpOpGBK4njAtvnjoMi61x8msd2EAhx+7Gh/sM4OGmFVNwnsAuhLhglatqD6yZNuk aIHSOX39ay0bneqFpp7BrCN9m0UqSWhN6rHpyqNtYt3aMFsNAnGKlNZmoTVmT39sM+XC 47owqPeA3bMRU4erEZbtJpIDxI9xkgZUHQCApk0NFT40Ivz0r9z8+OgLYbozg6Rco0T7 65lPWPaERGXS79+67pySx0HsvXVOeMMg/YvqlMYBbpP8CvSPAsu2/N9mL4TOmAhsT71G PzVA== 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 h184si235489qkc.340.2018.01.08.17.04.24; Mon, 08 Jan 2018 17:04:24 -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 4EA486174F; Tue, 9 Jan 2018 01:04:24 +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,URIBL_BLOCKED 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 493D761755; Tue, 9 Jan 2018 01:00:51 +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 B269B6151B; Tue, 9 Jan 2018 01:00:31 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 1A2356151B for ; Tue, 9 Jan 2018 01:00:25 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward106o.mail.yandex.net (Yandex) with ESMTP id D6BB1781326 for ; Tue, 9 Jan 2018 04:00:22 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id m2lMhUxyLU-0MZqZ1ux; Tue, 09 Jan 2018 04:00:22 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id giv4jfpZGA-0M5KmTwU; Tue, 09 Jan 2018 04:00:22 +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, 9 Jan 2018 04:00:17 +0300 Message-Id: <1515459617-23415-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515459617-23415-1-git-send-email-odpbot@yandex.ru> References: <1515459617-23415-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 342 Subject: [lng-odp] [PATCH v14 4/4] linux-gen: crypto: simplify local ctx init 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 Replace several bitfields with single bitfield. Use callbacks to initialize context data. 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: 49ebafae0edebbc750742d8874ad0a7588286dea ** Merge commit sha: 558f84453cf3b6b85daf9fe8a2786fc7797f4931 **/ platform/linux-generic/odp_crypto.c | 222 ++++++++++++++++++++---------------- 1 file changed, 124 insertions(+), 98 deletions(-) diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 486d62aad..0017b2d31 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -98,6 +98,7 @@ typedef odp_crypto_alg_err_t (*crypto_func_t)(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, odp_crypto_generic_session_t *session); +typedef void (*crypto_init_func_t)(odp_crypto_generic_session_t *session); /** * Per crypto session data structure @@ -117,6 +118,7 @@ struct odp_crypto_generic_session_t { const EVP_CIPHER *evp_cipher; crypto_func_t func; + crypto_init_func_t init; } cipher; struct { @@ -128,6 +130,7 @@ struct odp_crypto_generic_session_t { const EVP_CIPHER *evp_cipher; }; crypto_func_t func; + crypto_init_func_t init; } auth; unsigned idx; @@ -140,13 +143,9 @@ struct odp_crypto_global_s { odp_crypto_generic_session_t *free; odp_crypto_generic_session_t sessions[MAX_SESSIONS]; - /* These bitfields are cleared at alloc_session() + /* This bitfield is cleared at alloc_session() * together with the rest of data */ - bitset_t hmac_valid[ODP_THREAD_COUNT_MAX] - [(MAX_SESSIONS + ATOM_BITSET_SIZE - 1) / ATOM_BITSET_SIZE]; - bitset_t cipher_valid[ODP_THREAD_COUNT_MAX] - [(MAX_SESSIONS + ATOM_BITSET_SIZE - 1) / ATOM_BITSET_SIZE]; - bitset_t mac_cipher_valid[ODP_THREAD_COUNT_MAX] + bitset_t ctx_valid[ODP_THREAD_COUNT_MAX] [(MAX_SESSIONS + ATOM_BITSET_SIZE - 1) / ATOM_BITSET_SIZE]; odp_ticketlock_t openssl_lock[0]; @@ -158,30 +157,26 @@ typedef struct crypto_local_t { HMAC_CTX *hmac_ctx[MAX_SESSIONS]; EVP_CIPHER_CTX *cipher_ctx[MAX_SESSIONS]; EVP_CIPHER_CTX *mac_cipher_ctx[MAX_SESSIONS]; - bitset_t *hmac_valid; - bitset_t *cipher_valid; - bitset_t *mac_cipher_valid; + bitset_t *ctx_valid; } crypto_local_t; static __thread crypto_local_t local; typedef enum { KIND_HMAC, KIND_CIPHER, KIND_MAC_CIPHER } crypto_kind_t; -static inline int crypto_should_init(odp_crypto_generic_session_t *session, - crypto_kind_t kind) +static inline void crypto_init(odp_crypto_generic_session_t *session) { - bitset_t *ptr = kind == KIND_HMAC ? local.hmac_valid : - kind == KIND_CIPHER ? local.cipher_valid : - local.mac_cipher_valid; + bitset_t *ptr = local.ctx_valid; bitset_t *cv = ptr + (session->idx / ATOM_BITSET_SIZE); bitset_t cur = atom_bitset_load(cv, __ATOMIC_ACQUIRE); if (bitset_is_set(cur, session->idx % ATOM_BITSET_SIZE)) - return false; + return; - atom_bitset_set(cv, session->idx % ATOM_BITSET_SIZE, __ATOMIC_RELEASE); + session->cipher.init(session); + session->auth.init(session); - return true; + atom_bitset_set(cv, session->idx % ATOM_BITSET_SIZE, __ATOMIC_RELEASE); } static @@ -203,17 +198,7 @@ odp_crypto_generic_session_t *alloc_session(void) for (i = 0; i < ODP_THREAD_COUNT_MAX; i++) { bitset_t *cv; - cv = global->hmac_valid[i] + - (session->idx / ATOM_BITSET_SIZE); - atom_bitset_clr(cv, session->idx % ATOM_BITSET_SIZE, - __ATOMIC_ACQ_REL); - - cv = global->cipher_valid[i] + - (session->idx / ATOM_BITSET_SIZE); - atom_bitset_clr(cv, session->idx % ATOM_BITSET_SIZE, - __ATOMIC_ACQ_REL); - - cv = global->mac_cipher_valid[i] + + cv = global->ctx_valid[i] + (session->idx / ATOM_BITSET_SIZE); atom_bitset_clr(cv, session->idx % ATOM_BITSET_SIZE, __ATOMIC_ACQ_REL); @@ -239,6 +224,12 @@ null_crypto_routine(odp_packet_t pkt ODP_UNUSED, return ODP_CRYPTO_ALG_ERR_NONE; } +static void +null_crypto_init_routine(odp_crypto_generic_session_t *session ODP_UNUSED) +{ + return; +} + /* Mimic new OpenSSL 1.1.y API */ #if OPENSSL_VERSION_NUMBER < 0x10100000L static HMAC_CTX *HMAC_CTX_new(void) @@ -256,6 +247,18 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) } #endif +static void +auth_init(odp_crypto_generic_session_t *session) +{ + HMAC_CTX *ctx = local.hmac_ctx[session->idx]; + + HMAC_Init_ex(ctx, + session->auth.key, + session->auth.key_length, + session->auth.evp_md, + NULL); +} + static void packet_hmac(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -268,20 +271,8 @@ void packet_hmac(odp_packet_t pkt, ODP_ASSERT(offset + len <= odp_packet_len(pkt)); - if (crypto_should_init(session, KIND_HMAC)) { - HMAC_Init_ex(ctx, - session->auth.key, - session->auth.key_length, - session->auth.evp_md, - NULL); - } else { - /* Reinitialize HMAC calculation without resetting the key */ - HMAC_Init_ex(ctx, - NULL, - 0, - NULL, - NULL); - } + /* Reinitialize HMAC calculation without resetting the key */ + HMAC_Init_ex(ctx, NULL, 0, NULL, NULL); /* Hash it */ while (len > 0) { @@ -486,6 +477,16 @@ int internal_decrypt(EVP_CIPHER_CTX *ctx, return ret; } +static void +cipher_encrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -502,12 +503,6 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - if (crypto_should_init(session, KIND_CIPHER)) { - EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); ret = internal_encrypt(ctx, pkt, param); @@ -516,6 +511,16 @@ odp_crypto_alg_err_t cipher_encrypt(odp_packet_t pkt, ODP_CRYPTO_ALG_ERR_NONE; } +static void +cipher_decrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -532,12 +537,6 @@ odp_crypto_alg_err_t cipher_decrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - if (crypto_should_init(session, KIND_CIPHER)) { - EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); ret = internal_decrypt(ctx, pkt, param); @@ -565,14 +564,29 @@ static int process_cipher_param(odp_crypto_generic_session_t *session, session->p.cipher_key.length); /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->cipher.func = cipher_encrypt; - else + session->cipher.init = cipher_encrypt_init; + } else { session->cipher.func = cipher_decrypt; + session->cipher.init = cipher_decrypt_init; + } return 0; } +static void +aes_gcm_encrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -593,14 +607,6 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - if (crypto_should_init(session, KIND_CIPHER)) { - EVP_EncryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); /* Authenticate header data (if any) without encrypting them */ @@ -619,6 +625,18 @@ odp_crypto_alg_err_t aes_gcm_encrypt(odp_packet_t pkt, ODP_CRYPTO_ALG_ERR_NONE; } +static void +aes_gcm_decrypt_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, + session->cipher.key_data, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -639,14 +657,6 @@ odp_crypto_alg_err_t aes_gcm_decrypt(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - if (crypto_should_init(session, KIND_CIPHER)) { - EVP_DecryptInit_ex(ctx, session->cipher.evp_cipher, NULL, - session->cipher.key_data, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); odp_packet_copy_to_mem(pkt, param->hash_result_offset, @@ -679,14 +689,29 @@ static int process_aes_gcm_param(odp_crypto_generic_session_t *session, session->cipher.evp_cipher = cipher; /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->cipher.func = aes_gcm_encrypt; - else + session->cipher.init = aes_gcm_encrypt_init; + } else { session->cipher.func = aes_gcm_decrypt; + session->cipher.init = aes_gcm_decrypt_init; + } return 0; } +static void +aes_gmac_gen_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -704,14 +729,6 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Encrypt it */ - if (crypto_should_init(session, KIND_MAC_CIPHER)) { - EVP_EncryptInit_ex(ctx, session->auth.evp_cipher, NULL, - session->auth.key, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); ret = internal_aad(ctx, pkt, param); @@ -725,6 +742,18 @@ odp_crypto_alg_err_t aes_gmac_gen(odp_packet_t pkt, ODP_CRYPTO_ALG_ERR_NONE; } +static void +aes_gmac_check_init(odp_crypto_generic_session_t *session) +{ + EVP_CIPHER_CTX *ctx = local.mac_cipher_ctx[session->idx]; + + EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, + session->auth.key, NULL); + EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, + session->p.iv.length, NULL); + EVP_CIPHER_CTX_set_padding(ctx, 0); +} + static odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, const odp_crypto_packet_op_param_t *param, @@ -742,14 +771,6 @@ odp_crypto_alg_err_t aes_gmac_check(odp_packet_t pkt, else return ODP_CRYPTO_ALG_ERR_IV_INVALID; - /* Decrypt it */ - if (crypto_should_init(session, KIND_MAC_CIPHER)) { - EVP_DecryptInit_ex(ctx, session->auth.evp_cipher, NULL, - session->auth.key, NULL); - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, - session->p.iv.length, NULL); - EVP_CIPHER_CTX_set_padding(ctx, 0); - } EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, iv_ptr); odp_packet_copy_to_mem(pkt, param->hash_result_offset, @@ -779,10 +800,13 @@ static int process_aes_gmac_param(odp_crypto_generic_session_t *session, session->auth.evp_cipher = cipher; /* Set function */ - if (ODP_CRYPTO_OP_ENCODE == session->p.op) + if (ODP_CRYPTO_OP_ENCODE == session->p.op) { session->auth.func = aes_gmac_gen; - else + session->auth.init = aes_gmac_gen_init; + } else { session->auth.func = aes_gmac_check; + session->auth.init = aes_gmac_check_init; + } return 0; } @@ -796,6 +820,7 @@ static int process_auth_param(odp_crypto_generic_session_t *session, session->auth.func = auth_gen; else session->auth.func = auth_check; + session->auth.init = auth_init; session->auth.evp_md = evp_md; @@ -978,6 +1003,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, switch (param->cipher_alg) { case ODP_CIPHER_ALG_NULL: session->cipher.func = null_crypto_routine; + session->cipher.init = null_crypto_init_routine; rc = 0; break; case ODP_CIPHER_ALG_3DES_CBC: @@ -1053,6 +1079,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, switch (param->auth_alg) { case ODP_AUTH_ALG_NULL: session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; rc = 0; break; #if ODP_DEPRECATED_API @@ -1092,6 +1119,7 @@ odp_crypto_session_create(odp_crypto_session_param_t *param, * cipher at the same time */ if (param->cipher_alg == ODP_CIPHER_ALG_AES_GCM || aes_gcm) { session->auth.func = null_crypto_routine; + session->auth.init = null_crypto_init_routine; rc = 0; } else { rc = -1; @@ -1293,12 +1321,8 @@ int _odp_crypto_init_local(void) /* Clear local valid bits */ id = odp_thread_id(); - local.hmac_valid = global->hmac_valid[id]; - local.cipher_valid = global->cipher_valid[id]; - local.mac_cipher_valid = global->mac_cipher_valid[id]; - memset(local.hmac_valid, 0, sizeof(global->hmac_valid[0])); - memset(local.cipher_valid, 0, sizeof(global->cipher_valid[0])); - memset(local.mac_cipher_valid, 0, sizeof(global->mac_cipher_valid[0])); + local.ctx_valid = global->ctx_valid[id]; + memset(local.ctx_valid, 0, sizeof(global->ctx_valid[0])); return 0; } @@ -1488,6 +1512,8 @@ int odp_crypto_int(odp_packet_t pkt_in, pkt_in = ODP_PACKET_INVALID; } + crypto_init(session); + /* Invoke the functions */ if (session->do_cipher_first) { rc_cipher = session->cipher.func(out_pkt, param, session);