From nobody Tue Jul 5 14:54:57 2022
X-Original-To: dev-commits-ports-all@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 851981D00D4A;
Tue, 5 Jul 2022 14:54:57 +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 4Lcm1F2x5cz3sxH;
Tue, 5 Jul 2022 14:54:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1657032897;
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=S22hb6ps1ksbxwL7u53GW47UThNrVwzevK2PX78HivA=;
b=aeo8lBKp5bhfkJ5w0dUb3QDS564WW3EUBuSlvqAB/q7BJYwkBcSB5PBO4/kz7HBA+m4XSX
7JENgV2hPwlHZXfq46bU7WrHtXQ2RJHM0CRMo6KNODVU/HVjWgetqk/FPFrTP5S4CnXaay
DnNaa1w9369ZEs6X43fwMTTB/5t7XKD2EHVOc5FN+HKxwnMoZ4z5PXzKPo0zivz0lBtrnS
koGbUz/f4qx6NVwoVsfAe40eTL8hSlsv1xxCXE4yoAkjSjIqdYiYJ08q1eDF9So92c4apC
F+5jtz1k0CH0VlU5UpS77aXLrQB/7y98Mlltvl3X4P0hjisrlX33K62WwIMIuw==
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 3915B277CF;
Tue, 5 Jul 2022 14:54:57 +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 265EsvGM055610;
Tue, 5 Jul 2022 14:54:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265Esvx0055609;
Tue, 5 Jul 2022 14:54:57 GMT
(envelope-from git)
Date: Tue, 5 Jul 2022 14:54:57 GMT
Message-Id: <202207051454.265Esvx0055609@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Bernard Spil <brnrd@FreeBSD.org>
Subject: git: df0eb4e60d26 - main - security/openssl: Security update to 1.1.1q
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@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: df0eb4e60d26841149380b794a10bfe9dc510e51
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1657032897;
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=S22hb6ps1ksbxwL7u53GW47UThNrVwzevK2PX78HivA=;
b=UNjbZFIQQ+ip4sW48UrDY7tcW80A6GR1+mIr7zDEtBh6sgBZnQJrQfdVoDJSp8etl/GoB9
FKIV4/06YPlqlgk2nv/VwI84yiGv6VlMZYKeh8ynBY2iXfI9CSxucLthlA3Sg61TJa85C9
WWUBcZ7Wwn1wnFuoGXGwRO25nsLPZEMNxMd7QUErlpyIab84YJ1qSuf+6NpukEib905g2R
ywDW+yXr2qI8RqHA1XBOgB5Hosf44wQQ4CLB9Y1kyogYLZRU3SaYwg+lgupaoSgYXXjX0r
djdFcf8CYEYrYfO6/d+nJf4Nz6P+UbDZUocmi3kEUjenfoLRI0PMIjaVHPR8jA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657032897; a=rsa-sha256; cv=none;
b=F3gkctEdLhoUBbkMXJWjVJRzkMWZLKzoED7v6FJ7fy/XXKkzYQ/Hchpbhycd/uWOPbaYaH
JOgB9ocBgNR2loChU+v6N5yZI6mkLepXY/5or+yRiF0Zb44c3SG9JAx68/sffztE71sphE
QdvS6h/s6EztgPq2xTh4ewFXZRkdE3Fr4/TXrgsmu2YzpefyLYe7Vlut4Vy6cO7xqVeMT0
Bx6YCcOlDGLTdofiUpNL1oiGajyOpMHBro774V7aSKt8l8DLX2nq8aUHAZ99fsMf/EWZxj
EOHaS36Kjlf+qzZMZrGN4dT+lYZMjFBKdnQAHbep+uq2qJQNZg7uU223gY3Onw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by brnrd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=df0eb4e60d26841149380b794a10bfe9dc510e51
commit df0eb4e60d26841149380b794a10bfe9dc510e51
Author: Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-07-05 14:53:43 +0000
Commit: Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-07-05 14:53:43 +0000
security/openssl: Security update to 1.1.1q
* Fixes vuln in AES OCB
Security: a28e8b7e-fc70-11ec-856e-d4c9ef517024
MFH: 2022Q3
---
security/openssl/Makefile | 2 +-
security/openssl/distinfo | 6 +-
security/openssl/files/patch-test_v3ext.c | 96 -------------------------------
3 files changed, 4 insertions(+), 100 deletions(-)
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 98bb3b2dae26..2fa65b05c556 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,7 +1,7 @@
# Created by: Dirk Froemberg <dirk@FreeBSD.org>
PORTNAME= openssl
-PORTVERSION= 1.1.1p
+PORTVERSION= 1.1.1q
PORTEPOCH= 1
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 6bb4a692578e..3f63b2a9d46f 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655885637
-SHA256 (openssl-1.1.1p.tar.gz) = bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f
-SIZE (openssl-1.1.1p.tar.gz) = 9860217
+TIMESTAMP = 1657032778
+SHA256 (openssl-1.1.1q.tar.gz) = d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
+SIZE (openssl-1.1.1q.tar.gz) = 9864061
diff --git a/security/openssl/files/patch-test_v3ext.c b/security/openssl/files/patch-test_v3ext.c
deleted file mode 100644
index 75769d96ad49..000000000000
--- a/security/openssl/files/patch-test_v3ext.c
+++ /dev/null
@@ -1,96 +0,0 @@
-Fixes https://github.com/openssl/openssl/issues/18619
-
-Revert the test of 01fc9b6bce82f0534d6673659a0e59a71f57ee82
-
---- test/v3ext.c.orig 2022-06-21 13:39:39 UTC
-+++ test/v3ext.c
-@@ -37,89 +37,11 @@ end:
- return ret;
- }
-
--static int test_asid(void)
--{
-- ASN1_INTEGER *val1 = NULL, *val2 = NULL;
-- ASIdentifiers *asid1 = ASIdentifiers_new(), *asid2 = ASIdentifiers_new(),
-- *asid3 = ASIdentifiers_new(), *asid4 = ASIdentifiers_new();
-- int testresult = 0;
--
-- if (!TEST_ptr(asid1)
-- || !TEST_ptr(asid2)
-- || !TEST_ptr(asid3))
-- goto err;
--
-- if (!TEST_ptr(val1 = ASN1_INTEGER_new())
-- || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496)))
-- goto err;
--
-- if (!TEST_true(X509v3_asid_add_id_or_range(asid1, V3_ASID_ASNUM, val1, NULL)))
-- goto err;
--
-- val1 = NULL;
-- if (!TEST_ptr(val2 = ASN1_INTEGER_new())
-- || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
-- goto err;
--
-- if (!TEST_true(X509v3_asid_add_id_or_range(asid2, V3_ASID_ASNUM, val2, NULL)))
-- goto err;
--
-- val2 = NULL;
-- if (!TEST_ptr(val1 = ASN1_INTEGER_new())
-- || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496))
-- || !TEST_ptr(val2 = ASN1_INTEGER_new())
-- || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
-- goto err;
--
-- /*
-- * Just tests V3_ASID_ASNUM for now. Could be extended at some point to also
-- * test V3_ASID_RDI if we think it is worth it.
-- */
-- if (!TEST_true(X509v3_asid_add_id_or_range(asid3, V3_ASID_ASNUM, val1, val2)))
-- goto err;
-- val1 = val2 = NULL;
--
-- /* Actual subsets */
-- if (!TEST_true(X509v3_asid_subset(NULL, NULL))
-- || !TEST_true(X509v3_asid_subset(NULL, asid1))
-- || !TEST_true(X509v3_asid_subset(asid1, asid1))
-- || !TEST_true(X509v3_asid_subset(asid2, asid2))
-- || !TEST_true(X509v3_asid_subset(asid1, asid3))
-- || !TEST_true(X509v3_asid_subset(asid2, asid3))
-- || !TEST_true(X509v3_asid_subset(asid3, asid3))
-- || !TEST_true(X509v3_asid_subset(asid4, asid1))
-- || !TEST_true(X509v3_asid_subset(asid4, asid2))
-- || !TEST_true(X509v3_asid_subset(asid4, asid3)))
-- goto err;
--
-- /* Not subsets */
-- if (!TEST_false(X509v3_asid_subset(asid1, NULL))
-- || !TEST_false(X509v3_asid_subset(asid1, asid2))
-- || !TEST_false(X509v3_asid_subset(asid2, asid1))
-- || !TEST_false(X509v3_asid_subset(asid3, asid1))
-- || !TEST_false(X509v3_asid_subset(asid3, asid2))
-- || !TEST_false(X509v3_asid_subset(asid1, asid4))
-- || !TEST_false(X509v3_asid_subset(asid2, asid4))
-- || !TEST_false(X509v3_asid_subset(asid3, asid4)))
-- goto err;
--
-- testresult = 1;
-- err:
-- ASN1_INTEGER_free(val1);
-- ASN1_INTEGER_free(val2);
-- ASIdentifiers_free(asid1);
-- ASIdentifiers_free(asid2);
-- ASIdentifiers_free(asid3);
-- ASIdentifiers_free(asid4);
-- return testresult;
--}
--
- int setup_tests(void)
- {
- if (!TEST_ptr(infile = test_get_argument(0)))
- return 0;
-
- ADD_TEST(test_pathlen);
-- ADD_TEST(test_asid);
- return 1;
- }