From nobody Sat Jun 25 11:05:18 2022 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 B079286C7AA; Sat, 25 Jun 2022 11:05:18 +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 4LVWNt4Qncz3jHP; Sat, 25 Jun 2022 11:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656155118; 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=yS4t5n6svGt5Mmoxy90AzPB/sZSqi+F3KDAJZBvISqA=; b=iyzPkElpqij6YalEu/AwzOMge90gdzkcDu1L83MOWrJFvBhSOiPZ8KtAqo+dR0GjnV0jpq AtKbITqVxwsOqf5wovSDOXsJ+3GuBLIuqulJNRCF5X/dxXGpZWLjtp99VMS4aIAuwfpjNo agw+87FghkwLW0xZ0wo/1g951VNr33z11MFQ1HnPot605cCOCAkMfVeYeHNnuliVrZ3wtY wdSQ+I1unMajthyPj4joTzODqQEXawK5Z+LHy1NRL8RJb6bHXpyjoiDpg0KRQAti5K9sCr MDI3SWzQ5FalBT7QLXWhvHGLv9SGNpIlPsvmsr9YOTew6ECrIe8pousG7cet0A== 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 76BA92353A; Sat, 25 Jun 2022 11:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25PB5Iqc050220; Sat, 25 Jun 2022 11:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PB5Iua050219; Sat, 25 Jun 2022 11:05:18 GMT (envelope-from git) Date: Sat, 25 Jun 2022 11:05:18 GMT Message-Id: <202206251105.25PB5Iua050219@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: 617228983fd2 - 2022Q2 - security/openssl-quictls: Security patch for CVE-2022-2068 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 617228983fd2d49639186b02f72fdd15c1fec3ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656155118; 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=yS4t5n6svGt5Mmoxy90AzPB/sZSqi+F3KDAJZBvISqA=; b=DISojdh/coH2sRZ8asv4RJi9P6MW4LxEDO7VhkdhLslytVtDQW9FyZ71+JX0Db8lE/JS7N ZAHPptXWmkzr8v5Y226lBjtWhdAGZ/78KLUhxOW/FWUl3RL/SV+OOwOcMdoQwlhPj+fDNA wUinCM3W3BUPsrun8zjtEafXjfN5ZRnZaEiq8lLiHv6Vq8EhIXvOHNDi01tKeZZIQR6n0U qsheyLpOyYy/4XtW9O+VAUxHRR+IIUS9cxPRjPTdz3nrFzinXYMhhxDP3Uibb7H+d/Gjia rrONGiho3iu55l9HW+uQNISq4GfbUWkWJ6pXTVHloL/AD/+nf2WxhFEJdBfHsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656155118; a=rsa-sha256; cv=none; b=Lms6MWdE4LSNJyzRw0RdjKg9q6l+H1RuB0bqKQToyYLj+H41isONP5lgyJzg/Wcm3Ubgc8 Nlmq0BFZtrFpLfd+fEaPwBg3gl2Jw0Oj4Pc2GP9jVmNWQ9P5yBkSMA212ACHm8kab0nQ/o TIw450hea7i/mCqd0XzPeJzQZ4ZDTKfrhJS56ygFHIGewfauJfkc+DuUL4z5trGBk3/eeD aMEwKLcpG2ONLwm2jb0BtW8g0c0H6LXbiL/Oy1ciA6zmtvEBh6D2BrnDNqpG1BZnU++o9n lvS1efzjKpjp0f2hXFTmxjT82E38GsVvclAlYtbZR7CaKIVwIRmBpJrvKoEtnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=617228983fd2d49639186b02f72fdd15c1fec3ed commit 617228983fd2d49639186b02f72fdd15c1fec3ed Author: Bernard Spil AuthorDate: 2022-06-25 11:03:35 +0000 Commit: Bernard Spil CommitDate: 2022-06-25 11:05:12 +0000 security/openssl-quictls: Security patch for CVE-2022-2068 Security: 4eeb93bf-f204-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit 21e8fd3ad74fbb8c52d375aec9bc77e4c1cb53d4) --- security/openssl-quictls/Makefile | 1 + security/openssl-quictls/files/patch-CVE-2022-2068 | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 2ca92fb4b599..77b5247f56ba 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -2,6 +2,7 @@ PORTNAME= openssl PORTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= security devel PKGNAMESUFFIX= -quictls diff --git a/security/openssl-quictls/files/patch-CVE-2022-2068 b/security/openssl-quictls/files/patch-CVE-2022-2068 new file mode 100644 index 000000000000..367fd562181b --- /dev/null +++ b/security/openssl-quictls/files/patch-CVE-2022-2068 @@ -0,0 +1,23 @@ +From 8a3579a7b7067a983e69a4eda839ac408c120739 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Mon, 13 Jun 2022 17:10:15 +0200 +Subject: [PATCH] c_rehash: Drop the issuer_name_hash= prefix from the CRL hash + +Reviewed-by: Richard Levitte +Reviewed-by: Matt Caswell +--- + tools/c_rehash.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/c_rehash.in b/tools/c_rehash.in +index 2f735d68c9c8..343cdc1e7575 100644 +--- tools/c_rehash.in.orig ++++ tools/c_rehash.in +@@ -222,6 +222,7 @@ sub link_hash { + "-fingerprint", "-noout", + "-in", $fname); + chomp $hash; ++ $hash =~ s/^.*=// if !$is_cert; + chomp $fprint; + return if !$hash; + $fprint =~ s/^.*=//;