From nobody Tue Jul 5 17:47:39 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 8AAA61D1B0EB; Tue, 5 Jul 2022 17:47:39 +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 4LcqrW22Gwz4rSj; Tue, 5 Jul 2022 17:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657043259; 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=kMw50rk/necri6RJp6c8QC4vPq0fCwzxiM+0FrswMoQ=; b=uLPCcXh/vtUdLfJPLsT7mlEgUlGjCD8uyu2ffof3UPdZ19E9V8vFfPs7EQXVCNdXNcBlex Z9YQAPitmQUjOJwuaKKZEDMieeAGPIdPN1gku92FOFo/NhGFK7rLneFP2HHlaF4xcOe60Z qejnpMUUAWdMy6urWvzFvOklAoHf+goqd/2nHP8IXEh6TLxKTIaJeZgjkRSx+JSAugiiP+ 1yXUKwuMZTG5yXniyq3pb4RHYiX8eQNh9fZ05bNfr8sFmafF9gHyNs+R5SS30+gpzLoVyS 6IlBejasRXx0UYT5AA9AfYkNlF7j8wmvDRTppv7U7IHoCS3OCZZFRg+hCSw/Lg== 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 1C1771EDD; Tue, 5 Jul 2022 17:47:39 +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 265Hldgh087411; Tue, 5 Jul 2022 17:47:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265Hldwi087410; Tue, 5 Jul 2022 17:47:39 GMT (envelope-from git) Date: Tue, 5 Jul 2022 17:47:39 GMT Message-Id: <202207051747.265Hldwi087410@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: b9906c580190 - 2022Q3 - security/openssl-devel: Security update to 3.0.5 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: b9906c580190636e97dd38c66bc13263c9b9a23b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657043259; 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=kMw50rk/necri6RJp6c8QC4vPq0fCwzxiM+0FrswMoQ=; b=oElpY39AusfaKlUYolG+HfhCx4JhN9fLM1y7IJtbYjQLMSlrLZHE4za/1AHL/xRII3UwoB gE4NcyZ2gTaxAjLo/WBNlx2YL3WKavxw2iBVP7ZyIpCY5olDpmHAbrI85m20EhU8XxwTgn Oh02BLfR1HqX/kQQPVN7dnKxghwZHDFxa3hwpZSUYYQidRDj+zPsXXzd1NWdoqXBiq3wbp cti9UGDyl82hWj0gD1mJr6avWTth2DAhfeqjvbZLJ+QgFP8lwD2YXyDAvHyLBI+ID2aH/3 Btjxs3v9PsLy+htvKyBKDZrT5RcPlDu130C3aQFH5D7bkRidVz5nVe0fyqxckQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657043259; a=rsa-sha256; cv=none; b=KpHLj7C1q5DDfvQdPkWqsonXixfDMtrou2rsIng3K8iIJ/qLUE2IGMmacAPnWLxastriqf 55F9KvwIlTgEEqhS09sss+14+s9TqPUROdQpQsohM3WgQOK0y4uRnuGeUMsJi7j9kOVbsv M7ykFTUMHERscB2ZR3rd3XJ3S/1tP4NJ+qvxtc8/3K/IPTmPjQtPlIg+NPcjcJw9DVTYGk tNcqO08pjOoIqCGafJ4LnsenqzGXgao9Ql/JEAedENs6xYSFqYpAnYZF5FIyjZHk3fSy7a AOQFTTz/8xNOynrdg0rQ09ioYJTwhGMpJhd4Iy0JMD3bI0/buULJjOJxib9HBA== 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=b9906c580190636e97dd38c66bc13263c9b9a23b commit b9906c580190636e97dd38c66bc13263c9b9a23b Author: Bernard Spil AuthorDate: 2022-07-05 17:34:59 +0000 Commit: Bernard Spil CommitDate: 2022-07-05 17:47:30 +0000 security/openssl-devel: Security update to 3.0.5 Security: f0e45968-faff-11ec-856e-d4c9ef517024 Security: a28e8b7e-fc70-11ec-856e-d4c9ef517024 MFH: 2022Q3 (cherry picked from commit da0a391839d651fffec6daaade795e57cb023909) --- security/openssl-devel/Makefile | 2 +- security/openssl-devel/distinfo | 6 +- security/openssl-devel/files/patch-test_v3ext.c | 93 ------------------------- 3 files changed, 4 insertions(+), 97 deletions(-) diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 96e54c21ede3..52dafb6d7635 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -DISTVERSION= 3.0.4 +DISTVERSION= 3.0.5 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ diff --git a/security/openssl-devel/distinfo b/security/openssl-devel/distinfo index 0baa0e70bffe..f80a8d3156d9 100644 --- a/security/openssl-devel/distinfo +++ b/security/openssl-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655888572 -SHA256 (openssl-3.0.4.tar.gz) = 2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f -SIZE (openssl-3.0.4.tar.gz) = 15069605 +TIMESTAMP = 1657032912 +SHA256 (openssl-3.0.5.tar.gz) = aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a +SIZE (openssl-3.0.5.tar.gz) = 15074407 diff --git a/security/openssl-devel/files/patch-test_v3ext.c b/security/openssl-devel/files/patch-test_v3ext.c deleted file mode 100644 index b5bfce28e410..000000000000 --- a/security/openssl-devel/files/patch-test_v3ext.c +++ /dev/null @@ -1,93 +0,0 @@ ---- test/v3ext.c.orig 2022-06-21 13:30:58 UTC -+++ test/v3ext.c -@@ -37,83 +37,6 @@ 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; --} -- - OPT_TEST_DECLARE_USAGE("cert.pem\n") - - int setup_tests(void) -@@ -127,6 +50,5 @@ int setup_tests(void) - return 0; - - ADD_TEST(test_pathlen); -- ADD_TEST(test_asid); - return 1; - }