From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8F69342ECF for ; Thu, 20 Jul 2023 17:24:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C5CC42D53; Thu, 20 Jul 2023 17:24:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 06D48400D6 for ; Thu, 20 Jul 2023 17:24:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MMRpwI5+XZz8yxRKSoIGDracGSVlmJgA8MBq9oqVA0U=; b=K/NvepnC3Lu82ulLpbi/Pd8kGcLqKpmb+2A3CNZ68XdTlp7Wsf6LlVQPyWm5ll9rXtvzU3 gvBFFA4OA9qGJVlLHI3g+QVw9CPBDvU+TBlT9U3RvrGvzPW7kSC8tNIK5WlNPCZljNCGU5 igEhxWQYvFpBSZixndg+Pqn/onL62rc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-59-pZC4fJpLOQC4eq4-SQLZ6A-1; Thu, 20 Jul 2023 11:22:26 -0400 X-MC-Unique: pZC4fJpLOQC4eq4-SQLZ6A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 323A78870DD; Thu, 20 Jul 2023 15:22:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34F1D492C13; Thu, 20 Jul 2023 15:22:06 +0000 (UTC) From: Kevin Traynor To: Didier Pallard Cc: Kai Ji , dpdk stable Subject: patch 'crypto/openssl: skip workaround at compilation time' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:35 +0100 Message-ID: <20230720151942.262154-84-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1cf0bf459c918583e236edbffdf00a5c5b582267 Thanks. Kevin --- >From 1cf0bf459c918583e236edbffdf00a5c5b582267 Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Tue, 18 Apr 2023 16:56:19 +0200 Subject: [PATCH] crypto/openssl: skip workaround at compilation time [ upstream commit 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 ] This workaround was needed before version 1.0.1f. Do not build it for versions >= 1.1. Fixes: d61f70b4c918 ("crypto/libcrypto: add driver for OpenSSL library") Signed-off-by: Didier Pallard Acked-by: Kai Ji --- drivers/crypto/openssl/rte_openssl_pmd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 5977bc746c..514e93229f 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1062,6 +1062,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx) { - int len = 0, unused = 0; + int len = 0; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + int unused = 0; uint8_t empty[] = {}; +#endif if (EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv) <= 0) @@ -1077,7 +1080,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, goto process_auth_encryption_gcm_err; +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* Workaround open ssl bug in version less then 1.0.1f */ if (EVP_EncryptUpdate(ctx, empty, &unused, empty, 0) <= 0) goto process_auth_encryption_gcm_err; +#endif if (EVP_EncryptFinal_ex(ctx, dst, &len) <= 0) @@ -1141,6 +1146,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, uint8_t *dst, uint8_t *tag, EVP_CIPHER_CTX *ctx) { - int len = 0, unused = 0; + int len = 0; +#if OPENSSL_VERSION_NUMBER < 0x10100000L + int unused = 0; uint8_t empty[] = {}; +#endif if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, 16, tag) <= 0) @@ -1159,7 +1167,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, goto process_auth_decryption_gcm_err; +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* Workaround open ssl bug in version less then 1.0.1f */ if (EVP_DecryptUpdate(ctx, empty, &unused, empty, 0) <= 0) goto process_auth_decryption_gcm_err; +#endif if (EVP_DecryptFinal_ex(ctx, dst, &len) <= 0) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:05.080247760 +0100 +++ 0084-crypto-openssl-skip-workaround-at-compilation-time.patch 2023-07-20 16:17:54.932751615 +0100 @@ -1 +1 @@ -From 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 Mon Sep 17 00:00:00 2001 +From 1cf0bf459c918583e236edbffdf00a5c5b582267 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5b94ac1965620e945a3b8fcff84fab4fcb2ef801 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 9b83811d67..4569c5e62f 100644 +index 5977bc746c..514e93229f 100644 @@ -22 +23 @@ -@@ -1197,6 +1197,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1062,6 +1062,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -33 +34 @@ -@@ -1212,7 +1215,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1077,7 +1080,9 @@ process_openssl_auth_encryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -43 +44 @@ -@@ -1276,6 +1281,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1141,6 +1146,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, @@ -54 +55 @@ -@@ -1294,7 +1302,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset, +@@ -1159,7 +1167,9 @@ process_openssl_auth_decryption_gcm(struct rte_mbuf *mbuf_src, int offset,