From nobody Sat Jun 25 10:41:00 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 7C4D68697B6; Sat, 25 Jun 2022 10:41:00 +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 4LVVrr35xQz3QL8; Sat, 25 Jun 2022 10:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656153660; 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=WO/3TvBz0sK2kTFF7scWTuQe3Z2GLLb6KuSC4PKF4WM=; b=EOpeWt5k97TfztljQZfX8MhMjeitGsFX/182tSoBSEQsbT4qTTSGCXwNq9f8wiT83MaUy5 72y8HTBdULohu8EpytAG8UrOwwT8M7SEsRQPhAI9ZLfVaBuP9unikmoSgnzqeRBag5yFjT jaGgJs6oPgT7TmVuHR+Ybng0eIBVMzKhhipEa9dbJ7sii5mLbtGSkr6p2VvHyXoCI0chHQ seb+B6FCDkCrcgulO8/5zzJbFdW44goHH0s3o1zWY+lE/ij3RmWqaG2cwbuuU73LNiTeCB JzJ0USU8TMuIYHbQX84Pm77W+cWibae1BOQOreatyzeBj6f7H7Suao0w3E1HIQ== 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 4AD7822AD6; Sat, 25 Jun 2022 10:41:00 +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 25PAf0DI018413; Sat, 25 Jun 2022 10:41:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PAf0xg018412; Sat, 25 Jun 2022 10:41:00 GMT (envelope-from git) Date: Sat, 25 Jun 2022 10:41:00 GMT Message-Id: <202206251041.25PAf0xg018412@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: 4c6583c335e5 - 2022Q2 - security/openssl-devel: Security update to 3.0.4 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: 4c6583c335e521c6d7aac6c32052bc7c1d815591 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656153660; 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=WO/3TvBz0sK2kTFF7scWTuQe3Z2GLLb6KuSC4PKF4WM=; b=gaSYli4oPeCd10erwSIOs/eW0AmKcNJPK82+pQSNzVeEvgmqr3FQqyJ/Y7OoChwm1bPugH 2yfgeDXZL6IoPqVv0zpFm9ZkY1EV9Kqwyq7u015MGwVxyg9D66qIqaiudbGqMnzkTf86To UvfEUY5L8WVQ3XCWZxQKyQXZoOga5TY3lVUBhCVUOSog37QEzDA//kYQ4TDgnNxIuWk4PG abFubkFBO+KUXUXyW5cMwMRdhWoW7ljBpFIfP85wiFEmQjApmCLodlP1e5zqsZNwRSCuT/ qobGABPfGKnrU2SCD+UJwdad08GT4lSCRfqvf/KfhEwriWrq1Z8gEGxnATj3Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656153660; a=rsa-sha256; cv=none; b=eqFBEc1woyAmq9/6HvuC5IBadZTueWqQ/grjvnMbTJifWpDMFl7np5ZJPcrt6b4p7XhDfq irdSsSp2BteP2/wqLjnmPoO4dTYNb2MR7b/1rM1wtUJQpxBmORbR0mu/6Da5QQ+SimaLt6 JrBspC1B9d9154EfbApRsIiS1tUe3IbNtcCZix1bPM2mBek8xMWoANhLqzxumjBspl73ca 88lhHxclokU0IGm+3UggEjj3zBumSmlzBYhesJkztMDV3Pt9NpzY/BUMrmKlcVmRHON0UI gT8RsLmBm88Y8CyqhBzTPzNVWsp8V7UTcvkgvY8RTRu0n9J9n046EKNCU1t2Pw== 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=4c6583c335e521c6d7aac6c32052bc7c1d815591 commit 4c6583c335e521c6d7aac6c32052bc7c1d815591 Author: Bernard Spil AuthorDate: 2022-06-25 10:27:48 +0000 Commit: Bernard Spil CommitDate: 2022-06-25 10:40:10 +0000 security/openssl-devel: Security update to 3.0.4 Security: 4eeb93bf-f204-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit e494a18290054f0ad5942e8d8ccc09001ab61b16) --- security/openssl-devel/Makefile | 2 +- security/openssl-devel/distinfo | 6 +- security/openssl-devel/files/patch-test_v3ext.c | 93 +++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 4 deletions(-) diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 233cf8036043..d171fee535dd 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -DISTVERSION= 3.0.3 +DISTVERSION= 3.0.4 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 346955ebaffe..0baa0e70bffe 100644 --- a/security/openssl-devel/distinfo +++ b/security/openssl-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651647836 -SHA256 (openssl-3.0.3.tar.gz) = ee0078adcef1de5f003c62c80cc96527721609c6f3bb42b7795df31f8b558c0b -SIZE (openssl-3.0.3.tar.gz) = 15058905 +TIMESTAMP = 1655888572 +SHA256 (openssl-3.0.4.tar.gz) = 2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f +SIZE (openssl-3.0.4.tar.gz) = 15069605 diff --git a/security/openssl-devel/files/patch-test_v3ext.c b/security/openssl-devel/files/patch-test_v3ext.c new file mode 100644 index 000000000000..b5bfce28e410 --- /dev/null +++ b/security/openssl-devel/files/patch-test_v3ext.c @@ -0,0 +1,93 @@ +--- 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; + }