From nobody Tue Jul 05 17:47:37 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 858761D1B137; Tue, 5 Jul 2022 17:47:38 +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 4LcqrV169Wz4rbW; Tue, 5 Jul 2022 17:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657043258; 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=NS4eZxqy3RvNq4XHgKEIEJe0VHZZFZc3QLmgISiPhV4=; b=m5j068ECuHxICdPIVC9vPFqcCltacuehXujUmEOkjPEX6JuyX/xoESmfQEIWuM8RWagxNx 4+bpD/l2R5XFs3//YH/DbuNqVx2yM9ynfNnuLZgr92j4cIY0xXhwNOgVqoz9zf4uGb8HrM XEMxurf7dM3P3AlZv+2euo9rsiE5/cEbI8q5rB4TCY65J7p4JL6xc4xp25nOabv4tlyWja ETjYMonOBO8WUZ3tH5eUYAAuQPZexIJtqPGiSGgPH+7kOQnYd8ZYZlDlDz83h69UfOaZWo kYlbJ+UZIbMq8lycvKs6kXKLLD64BN/ZxVddwEYdZTERYhK84mS9dbtQGf+gOQ== 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 067DF20B8; Tue, 5 Jul 2022 17:47:38 +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 265HlbP1087383; Tue, 5 Jul 2022 17:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265Hlblq087382; Tue, 5 Jul 2022 17:47:37 GMT (envelope-from git) Date: Tue, 5 Jul 2022 17:47:37 GMT Message-Id: <202207051747.265Hlblq087382@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: ec1442bd93d1 - 2022Q3 - security/openssl: Security update to 1.1.1q List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: ec1442bd93d14757e378994ae4c6efca0184bab0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657043258; 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=NS4eZxqy3RvNq4XHgKEIEJe0VHZZFZc3QLmgISiPhV4=; b=ZNHO8Tn1+U/U7q7s0s8MXwbZEhZ9/U6rOpHuUWp1o/jCeq/FZGbJucim2gZuQINHyVNoOS nvdxb/cadVK1rvfmZ/vRAtu5E+zmwOHv10mZ0xahoVofqrm6QlJ2PsEPAVdLsHA/KLWZ1m QS4rH+WEfBSb1YUML+DmR75xmH3aeVxwZYrQvIXXV0mY2hE5NqJpAQSxJok0NyhtmTL24c 8skdF9df+WfvQ2/K8hqO8oB41FMBYW3/FVkLjUaOzWnT8/1p+cauYYK02KIJn+TTqO9EAn 9luv2T2bSCLeVA8xRt2KsQ7yRR4TTSCVI7eTc5P4Nbd+X1U6Vi08hiLLwI7gsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657043258; a=rsa-sha256; cv=none; b=ShfHxcV3NQJ4v8nwPOLGMluHin7FU5rtUXbAi5O4n0/Ufc7zMP7xo8AtRV26C+M8+1AJmf 7T7wONznIB3F7Cidp2V4AC5BmxRuMptsmYh+UsBv1qrcHgDe35Q0e6CqviLKDzZ65iG0fw nUPOJ5SJZko+QhUiHmosnLEwjl7hj99H8Nd6kaea2i2fGiuoplKlLGGo5+HdsP5HjmsC42 HSWM4ImO7ooU2WeIbziQNCWOri9lwEDplULfeWP6gglpKmbi+4HhHldA732yrbDIvURa4I GuVgintD13JakpzL9HptZ6A9pExSjFZ/LAc85N3I2Np7JlMA2oKGEWbrDMRbLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec1442bd93d14757e378994ae4c6efca0184bab0 commit ec1442bd93d14757e378994ae4c6efca0184bab0 Author: Bernard Spil AuthorDate: 2022-07-05 14:53:43 +0000 Commit: Bernard Spil CommitDate: 2022-07-05 17:47:06 +0000 security/openssl: Security update to 1.1.1q * Fixes vuln in AES OCB Security: a28e8b7e-fc70-11ec-856e-d4c9ef517024 MFH: 2022Q3 (cherry picked from commit df0eb4e60d26841149380b794a10bfe9dc510e51) --- 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 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; - }