From nobody Wed Jan 31 19:44:52 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQCDP0LQVz588P4; Wed, 31 Jan 2024 19:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQCDN6mjXz4crG; Wed, 31 Jan 2024 19:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+kY4DkoGsN/B730naLc5iEySBrjF8eV3LSqtqaq7GLo=; b=hAvpUm5Xs/rXhZ3TMR6DKtVDnsEeKkcP+YrJEFBT1HIcylYyITfGy2eg69E0XXFkx/tqZ/ EJCTslPMKLAQdu+0e8rGBMbfVAvjI9F7/YgHkMeqlnzgnw0BI0ScAqIGFp/9V5LBetaMXw nmkbtwfXpPnDLp6lYYdEL0AKkMiewQfVpRuY6NY6QEQaMkb5QTezj+zT4kIqCFKP5aYrzA CAeYytjDHLfEIC49ltUXIDNLLHDW+4r7kBb6Q2gEaknzLIBcN/JT0QalCyFllb92GEwOlp w0AsG5QNehXE7J1YVNOM3+1bPOAqfaFt+52q0uhLmpm8p4VRHDcSVmnUYUMNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+kY4DkoGsN/B730naLc5iEySBrjF8eV3LSqtqaq7GLo=; b=ESmW3tVPcsxvJsmDLu3yPYvWpqOreFI6PLSPJa5s2Z1zguEcqVKLk1rziz3cEQz2zKRam+ fpHbxglLOdRwouPG6nTXn/RAv3lHigyEG3ociWDvXLynmYJHOjqCldghsAGX+4bpzZlMSc R9p0fsdE20tnERUZNPK8rua5Nov0jZEaVBzLT5rqgjUtIzaEQYDfKu4f+uxATEqdZfTzks F9WOW3NP7QplB20+VjLc6I6TP/0MWn5VLStyfXEfYWcE1Z09g0auEBP/qM8pQcBv+SrP7B Iimk8wwMDw/qVv1Romj4AQXoNQBHAw323GW3jGVGSWLNLgKiwEgWh6gRJWAUqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706730292; a=rsa-sha256; cv=none; b=f85tdo06yHPW5/96/Mk9/PPe/y1vOxV14zArJ5aDxxC+2BuSloNC2nsWWiZhq4CzLv828U hZ+CebDv2qvOSZaDOPaMOMwgdQ3MK+VBPHhH8d+HYyYn0SgHODrLDjdQA6RHO3/pAH0eeY udylUGVO6O78hV1ZJQO4ZgeZISPEfjWGb5t4fDFby0Punf0X+blk4gilhtnkWm6HUASapJ iL1X2PI9p2t3aftkXX8fA58UGo14mTBoZCqtLHU1ZSctzSsdSMiH9HyAHaVraO8NEjGdbe QNzvcQLGv7S2TX2Ay8tfc2M6QiKA4unoVnRCu1xVcjxO9trjTeTBiM0eWl6vFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQCDN5W4fzXYd; Wed, 31 Jan 2024 19:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40VJiqC9080809; Wed, 31 Jan 2024 19:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VJiqPx080806; Wed, 31 Jan 2024 19:44:52 GMT (envelope-from git) Date: Wed, 31 Jan 2024 19:44:52 GMT Message-Id: <202401311944.40VJiqPx080806@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: d4b502bd9892 - 2024Q1 - security/openssl: Security fix for POLY1305 on ppc List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: d4b502bd9892c992fcd14086f8da54274273dd68 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4b502bd9892c992fcd14086f8da54274273dd68 commit d4b502bd9892c992fcd14086f8da54274273dd68 Author: Bernard Spil AuthorDate: 2024-01-11 12:29:29 +0000 Commit: Bernard Spil CommitDate: 2024-01-31 19:44:24 +0000 security/openssl: Security fix for POLY1305 on ppc Security: 8337251b-b07b-11ee-b0d7-84a93843eb75 MFH: 2024Q1 (cherry picked from commit 0f0d8db8f5190b518a27425f319473ca2a6c30b2) --- security/openssl/Makefile | 2 +- security/openssl/files/patch-CVE-2023-6129 | 109 +++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 3faff9631310..d30e4eaad9a3 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssl PORTVERSION= 3.0.12 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-CVE-2023-6129 b/security/openssl/files/patch-CVE-2023-6129 new file mode 100644 index 000000000000..9e42dbb683a5 --- /dev/null +++ b/security/openssl/files/patch-CVE-2023-6129 @@ -0,0 +1,109 @@ +From 050d26383d4e264966fb83428e72d5d48f402d35 Mon Sep 17 00:00:00 2001 +From: Rohan McLure +Date: Thu, 4 Jan 2024 10:25:50 +0100 +Subject: [PATCH] poly1305-ppc.pl: Fix vector register clobbering + +Fixes CVE-2023-6129 + +The POLY1305 MAC (message authentication code) implementation in OpenSSL for +PowerPC CPUs saves the the contents of vector registers in different order +than they are restored. Thus the contents of some of these vector registers +is corrupted when returning to the caller. The vulnerable code is used only +on newer PowerPC processors supporting the PowerISA 2.07 instructions. + +Reviewed-by: Matt Caswell +Reviewed-by: Richard Levitte +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/23200) + +(cherry picked from commit 8d847a3ffd4f0b17ee33962cf69c36224925b34f) +--- + crypto/poly1305/asm/poly1305-ppc.pl | 42 ++++++++++++++--------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/crypto/poly1305/asm/poly1305-ppc.pl b/crypto/poly1305/asm/poly1305-ppc.pl +index 9f86134d923fb..2e601bb9c24be 100755 +--- crypto/poly1305/asm/poly1305-ppc.pl.orig ++++ crypto/poly1305/asm/poly1305-ppc.pl +@@ -744,7 +744,7 @@ + my $LOCALS= 6*$SIZE_T; + my $VSXFRAME = $LOCALS + 6*$SIZE_T; + $VSXFRAME += 128; # local variables +- $VSXFRAME += 13*16; # v20-v31 offload ++ $VSXFRAME += 12*16; # v20-v31 offload + + my $BIG_ENDIAN = ($flavour !~ /le/) ? 4 : 0; + +@@ -919,12 +919,12 @@ + addi r11,r11,32 + stvx v22,r10,$sp + addi r10,r10,32 +- stvx v23,r10,$sp +- addi r10,r10,32 +- stvx v24,r11,$sp ++ stvx v23,r11,$sp + addi r11,r11,32 +- stvx v25,r10,$sp ++ stvx v24,r10,$sp + addi r10,r10,32 ++ stvx v25,r11,$sp ++ addi r11,r11,32 + stvx v26,r10,$sp + addi r10,r10,32 + stvx v27,r11,$sp +@@ -1153,12 +1153,12 @@ + addi r11,r11,32 + stvx v22,r10,$sp + addi r10,r10,32 +- stvx v23,r10,$sp +- addi r10,r10,32 +- stvx v24,r11,$sp ++ stvx v23,r11,$sp + addi r11,r11,32 +- stvx v25,r10,$sp ++ stvx v24,r10,$sp + addi r10,r10,32 ++ stvx v25,r11,$sp ++ addi r11,r11,32 + stvx v26,r10,$sp + addi r10,r10,32 + stvx v27,r11,$sp +@@ -1899,26 +1899,26 @@ + mtspr 256,r12 # restore vrsave + lvx v20,r10,$sp + addi r10,r10,32 +- lvx v21,r10,$sp +- addi r10,r10,32 +- lvx v22,r11,$sp ++ lvx v21,r11,$sp + addi r11,r11,32 +- lvx v23,r10,$sp ++ lvx v22,r10,$sp + addi r10,r10,32 +- lvx v24,r11,$sp ++ lvx v23,r11,$sp + addi r11,r11,32 +- lvx v25,r10,$sp ++ lvx v24,r10,$sp + addi r10,r10,32 +- lvx v26,r11,$sp ++ lvx v25,r11,$sp + addi r11,r11,32 +- lvx v27,r10,$sp ++ lvx v26,r10,$sp + addi r10,r10,32 +- lvx v28,r11,$sp ++ lvx v27,r11,$sp + addi r11,r11,32 +- lvx v29,r10,$sp ++ lvx v28,r10,$sp + addi r10,r10,32 +- lvx v30,r11,$sp +- lvx v31,r10,$sp ++ lvx v29,r11,$sp ++ addi r11,r11,32 ++ lvx v30,r10,$sp ++ lvx v31,r11,$sp + $POP r27,`$VSXFRAME-$SIZE_T*5`($sp) + $POP r28,`$VSXFRAME-$SIZE_T*4`($sp) + $POP r29,`$VSXFRAME-$SIZE_T*3`($sp)