From nobody Wed Jan 31 19:20:27 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 4TQBhC6lyTz586dM; Wed, 31 Jan 2024 19:20:27 +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 4TQBhC6FMDz4Y0V; Wed, 31 Jan 2024 19:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706728827; 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=v216wl+BAp488lsRJQEM3Rjco86m7w+iwF9aHMj3Pd0=; b=lSGTSFkNRuBFFPB6B3DTb2ZtHfG7bVjSj6OraBXgnnVsLJ7NjPxYllyauR6Rh97li8Gz3y ZykUjU/w1hYLFB7GTVoNjoW/a+2CJVbVSHPlKvFPAP9AnCG4fkETSEn1u/uFas3iZ+8XSP /MM87blYJbSeiDbMLpblb9iHe41sk0rPd9FrpNGwADxkF/6ueYrL5ZHarK42o6rwlQTxuw sxMt+2FdxU8Pnoa95cPsCa6rGKAdUp2aiq/snVw/6xB/2r56LwACjHTFMCTMCH9yVkcW0E BrerBmr1qWmCEwJqBIZsnSuOs3qQ5woQ+2NHlOtmMDsMuonRBaA/gcSYY+D8uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706728827; 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=v216wl+BAp488lsRJQEM3Rjco86m7w+iwF9aHMj3Pd0=; b=M6JTCyQufgK9G9+zSoSusIkfGoZ7ahaakPuOln+emDnFXFdLOVCrYVxus6ukeGnSuARJpM tVhsl+tPRTd8dTHkztCxRE8elsoJG0U/ACpANf90QvQ7lL937GssieW3g6G3I1f6RAvNpM v9POwQMdR3zw6QnSP8udFd5hTYvVXfD7P3ypkQ1566q1hZ1iPq128tt7G+hkS6CypkggTN ejFUENpwuZpTyfx2T63iYQOYe8V9T6ofTcSnJEZCW9tWWgtniZ8LJvF+gGR7bUTMIcBUx4 92aOzvtXq/Vn/IelsxalPIZnLor9sEaBVqilHIJB37EAt28Xx/SN5+u8/Kwb9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706728827; a=rsa-sha256; cv=none; b=eDNIQ9LsJYBAeHApVqQCUi6Z8VDiXOmqu2sZatVKLsXyreP4T5jGivUTmEsY1VfnHuRUXt rnHF0DMnj+1dy6cQdCo8eZ3OKUkmP3BO7t8FrgR96RhMeSMlXRAOYyyCZz5mVcRymfMmI0 t6bRABfbNbHuzjcHXlQBtVNsPr+vPZWYKenyvtmJQOQBKKK0Yo2xAoHbutJOz9AkuMI3eq w9yrN3mSLmmn4gftLg6sjg4qpEpBGH+zoPUIK7Ciu0uU7TYUBKWXjS4hrfsenAiK8Rtc9Y hXVh+aHd/jIO+sZFuC8UIxLPWQvbOJz66vTbpuSjpmB1Rpm7P3uQ2ebV0Ip71w== 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 4TQBhC5J2FzWvg; Wed, 31 Jan 2024 19:20:27 +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 40VJKRTw040563; Wed, 31 Jan 2024 19:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VJKRVU040560; Wed, 31 Jan 2024 19:20:27 GMT (envelope-from git) Date: Wed, 31 Jan 2024 19:20:27 GMT Message-Id: <202401311920.40VJKRVU040560@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: b3c79c1b875b - main - security/openssl32: Security update to 3.2.1 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: b3c79c1b875b6e185ace1f342bd33b33630a0aff Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3c79c1b875b6e185ace1f342bd33b33630a0aff commit b3c79c1b875b6e185ace1f342bd33b33630a0aff Author: Bernard Spil AuthorDate: 2024-01-31 19:20:05 +0000 Commit: Bernard Spil CommitDate: 2024-01-31 19:20:05 +0000 security/openssl32: Security update to 3.2.1 * Note that this is a security rollup of four previously reported CVEs Security: 10dee731-c069-11ee-9190-84a93843eb75 Security: 8337251b-b07b-11ee-b0d7-84a93843eb75 Security: a5956603-7e4f-11ee-9df6-84a93843eb75 MFH: 2024Q1 --- security/openssl32/Makefile | 3 +- security/openssl32/distinfo | 6 +- security/openssl32/files/patch-CVE-2023-6129 | 109 --------------------------- 3 files changed, 4 insertions(+), 114 deletions(-) diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index aabf7567438b..6c69351e00df 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -1,6 +1,5 @@ PORTNAME= openssl -DISTVERSION= 3.2.0 -PORTREVISION= 1 +DISTVERSION= 3.2.1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ diff --git a/security/openssl32/distinfo b/security/openssl32/distinfo index 73610bcd15da..255495588e99 100644 --- a/security/openssl32/distinfo +++ b/security/openssl32/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1700923402 -SHA256 (openssl-3.2.0.tar.gz) = 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e -SIZE (openssl-3.2.0.tar.gz) = 17698352 +TIMESTAMP = 1706727853 +SHA256 (openssl-3.2.1.tar.gz) = 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 +SIZE (openssl-3.2.1.tar.gz) = 17733249 diff --git a/security/openssl32/files/patch-CVE-2023-6129 b/security/openssl32/files/patch-CVE-2023-6129 deleted file mode 100644 index ff1ca585564d..000000000000 --- a/security/openssl32/files/patch-CVE-2023-6129 +++ /dev/null @@ -1,109 +0,0 @@ -From 5b139f95c9a47a55a0c54100f3837b1eee942b04 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)