From nobody Thu Jan 11 12:44:59 2024 X-Original-To: dev-commits-ports-main@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 4T9ks76HBwz55f6M; Thu, 11 Jan 2024 12:44:59 +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 4T9ks75nZMz479J; Thu, 11 Jan 2024 12:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977099; 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=dUhpF1RdinwkI74cUlJySHFCokdPU9Ukjy/IBM/CBnI=; b=lsOFfkgkHWZ3cOOP+Olpnu9Ol+0m1J+CyXQ/SGUq8N138/mZ1qChwZAcmOTszUOQu4XRC8 ZY7nSScQffJfbF+BM6Te1EXSHfELzvc3OePRGr1T3ryFbJIAmWuyVZjUGbhBarsdtK3dgf PiORq8r6MfTQWvUBrDmcZ7cBymJ+uC7o8ZYS5Z6GRiWeNwa5vstqttw7tnGYSYhYYg0cy+ VD/O/3L2c0Ok8utJJXc6cA7HbKdKWhQRT/Kalcp5eWd153Qm9JvagC8Q1Llkci+L+vM5YY i4E/kiSbVwGiVwQNByNyy52FDfB/LNfk/ZZ5RY9mSKyniypyLqu9aBqFZ3qveA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704977099; 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=dUhpF1RdinwkI74cUlJySHFCokdPU9Ukjy/IBM/CBnI=; b=wE3SVWKq/EXsyu8HP9gVdO6Rn3x72h6+YdJ2DFGz04UDCymKZF58Vin8f+f7s6nQ+JHYWR IflYzaxYhHbeCV1q1tyi/zxdkiPieC6JEX+2aXShOdoFJg/tlnR4MpvnQ+hs1nOBfIBD7z 1yJ1meiXzggK6rGrF57jCwz/WU5D2jvqjVIeCUDRC4PrWD/KMGiXYQlLmxNiw9fsdyj1gV twPefQdiKW6RhCQdeuAJ/jCRR863ri3p0XqPtMF93dsTOJrfzCnEycL9ni24rxp9mZ6z+x qrDbg5eyVAB9FnWucqUMUnhnwRl53spHdCHNUwhXw4Vo/3Do4PvgUaFnsx9U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704977099; a=rsa-sha256; cv=none; b=ZR6d81hApDVFwQELP0ObmWI8bV7O3+lgtGvxgd4VGfviUry/WYgSJkqkDUKy+Ks1e7hAvG s2vLUHpCi1BPd99vWLhbtWyoMb9N9qpOpcxHeSUopqpF4H/WbtEwxLycGX62YviMvru82N fJbcedu4Lv9JDZCpKtuSUkFFc8TsGWyeCIrxmb/X+eLKtq6d+9ws49C9TPRsd2aDE1n09+ tLhBQZk8xLl0SySFGSDJzjR9gElhRVj7gZMyQVmERhaUAuGaL/rgezLgQ/z5Ownqb5EDI8 SFiPO5xW64PLW+0mvZT/GzwQ/sPkZLxzX9Zt7ga6hXnXtT55vDTwRvdqOafBzw== 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 4T9ks74lHfzK4n; Thu, 11 Jan 2024 12:44:59 +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 40BCixJL035085; Thu, 11 Jan 2024 12:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCixnF035082; Thu, 11 Jan 2024 12:44:59 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:44:59 GMT Message-Id: <202401111244.40BCixnF035082@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 98785202608c - main - security/openssl31: Security fix for POLY1305 on ppc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 98785202608c4f19c0143f1eb82c64c35b463cd5 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=98785202608c4f19c0143f1eb82c64c35b463cd5 commit 98785202608c4f19c0143f1eb82c64c35b463cd5 Author: Bernard Spil AuthorDate: 2024-01-11 12:44:21 +0000 Commit: Bernard Spil CommitDate: 2024-01-11 12:44:21 +0000 security/openssl31: Security fix for POLY1305 on ppc Security: 8337251b-b07b-11ee-b0d7-84a93843eb75 MFH: 2024Q1 --- 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)