From nobody Wed Jan 31 19:46:50 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 4TQCGf6PQJz588vW; Wed, 31 Jan 2024 19:46:50 +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 4TQCGf5vq7z4d7w; Wed, 31 Jan 2024 19:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730410; 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=h3Jb0NW+bqfyCB1jwvhK/LZlW9FQSez+XrYexkFW0xQ=; b=u+zWgbqRpaAp7yUOpvibMLfGtfCnpUxOUjOBRgYKHLzWzm/WHHIZRli1jtBVJx7Bf+jRb+ F0SCc0jAT7HM/plCBin5CSsv/xycKV76MZHvySGz2FBZPdlYkjANlc5sTv5WUalkUJHLRq TqrrjVttPaPVGC5EPg7llVtBEeosQKu4zHQZExRu9NFoARGD5oCcTfs6/lJQfRC1X7a2D0 rEnhpGyuKmt/ryeDwSsWDzDyUQsVDoQM9HM2BfxY+FkfbZvMsZpgIJuPTOt8wxB3K9dHde qZrMSl4qyAQtryJFWB0nHiUjN66sutH7m2PB+rP2jlVFWKvvkDdJSFop+nvJAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730410; 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=h3Jb0NW+bqfyCB1jwvhK/LZlW9FQSez+XrYexkFW0xQ=; b=iOt4XK7O156sMOOSw9wLosNnqXlU+dl4FGpmtzVjYIuYEFExLtmXvpr+So/2EBHYRvhNFN GSsPlv8b609sIin8xwzisalqGsY12bhWe8Z0CX5loPtAOMG/kUCG/76ZqAaHn9wNwon8wM QlR9cTwbtH82kQwRM7miHJ7//hQBr3nc7LBaYDdxTZ101hSSBfZiGJ7BDcPX0O+xJfmwHv ACNTj+bLgH3MUPSPM3O84PB+c/2LvjCLiokn1DEqpZQiA6t04Fnz8Pz2J3OKG6YxRgVq37 ThKX20Ic0RcMPiLyKhvXlGPy44TzvNSL1Zb446alBLiORI5jqe6wA/DcapkJog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706730410; a=rsa-sha256; cv=none; b=I/b77yVDJOYapcThOLsk3S89sOLSBK7bi4+5lIANWhHtZuEbibPr8KZf2hXVI/t8F2vLNK hnT5mkJN46gmDLkvKVfdTN+K4zKYYxtcTJUP6AA1VDZUEHOxZ/mmyJQppohIqlKzuAS+DR glDRJsJ7WROZp3YLwvqLsGvW/ose7iNyxEZznpL4eTbWl3t5Q3168boseHXTJvnC3oxg/8 oyK1Ydiu3zScgI2smxv2N6nFmC0wC7FwN3KWTVRT3KCcu+iH7W/7mr85kkoamyfFhOZoyC Lf1SPu+sOs9GUg9EIueZCDcTxipWCsizP+IClzcDSZvQMzkBOUYwyTt+JsVw9A== 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 4TQCGf4YCjzXjx; Wed, 31 Jan 2024 19:46:50 +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 40VJkol0081283; Wed, 31 Jan 2024 19:46:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VJkoDD081280; Wed, 31 Jan 2024 19:46:50 GMT (envelope-from git) Date: Wed, 31 Jan 2024 19:46:50 GMT Message-Id: <202401311946.40VJkoDD081280@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: face0a2ce35b - 2024Q1 - security/openssl31: 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: face0a2ce35b511c08deb89f6e54ceec7303333c Auto-Submitted: auto-generated The branch 2024Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=face0a2ce35b511c08deb89f6e54ceec7303333c commit face0a2ce35b511c08deb89f6e54ceec7303333c Author: Bernard Spil AuthorDate: 2024-01-11 12:44:21 +0000 Commit: Bernard Spil CommitDate: 2024-01-31 19:46:13 +0000 security/openssl31: Security fix for POLY1305 on ppc Security: 8337251b-b07b-11ee-b0d7-84a93843eb75 MFH: 2024Q1 (cherry picked from commit 98785202608c4f19c0143f1eb82c64c35b463cd5) --- security/openssl31/Makefile | 2 +- security/openssl31/files/patch-CVE-2023-6129 | 109 +++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletion(-) diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index fc4432765c41..fb13ef0ce680 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssl PORTVERSION= 3.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ diff --git a/security/openssl31/files/patch-CVE-2023-6129 b/security/openssl31/files/patch-CVE-2023-6129 new file mode 100644 index 000000000000..ed1b41586234 --- /dev/null +++ b/security/openssl31/files/patch-CVE-2023-6129 @@ -0,0 +1,109 @@ +From f3fc5808fe9ff74042d639839610d03b8fdcc015 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)