From nobody Wed Jun 22 09:01:07 2022 X-Original-To: dev-commits-ports-main@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 6F9B185D08C; Wed, 22 Jun 2022 09:01:07 +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 4LScmz2DX6z4cXt; Wed, 22 Jun 2022 09:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655888467; 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=QvZs6yYLnwKwmgo+JHJNxGYRBJA6QehjerFkV5jUqwg=; b=UYVpa7J3bDy1ZZMDG5mztQWQKmaEmj1ucfNXJ6rKXTcFf+cSh3iDgktC5hIE5fyJYUOAoT m4DR3Oj7eHYmaL/m3U3OwsiscM7beiut9rdOzvtJKDk132uHCy2lhsfpRpEFuR65BqkP9p zLxkLxX0MvIKiHv9sbsV/oF6Swerzrj5swK3EmTLw64j/li88x/yHPQI/znOuqNKxMsip2 ZUhIDzPmgxbfbt5hPwssvQCKHmJp+uwwqrDALCK/JCo8seE4vFxcXSrtGFDqOmSVKzcra5 uwR2m5TMTzsu2iRtDAJlZkI0GwzeVNYgQrt90QM4F0izXL1ExStlZMYep3aFVA== 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 24C2C22DF0; Wed, 22 Jun 2022 09:01:07 +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 25M917N7003848; Wed, 22 Jun 2022 09:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25M917BA003847; Wed, 22 Jun 2022 09:01:07 GMT (envelope-from git) Date: Wed, 22 Jun 2022 09:01:07 GMT Message-Id: <202206220901.25M917BA003847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: f8942926a8cb - main - security/openssl: Security update to 1.1.1p List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f8942926a8cb9a03b0ffab32565479d97fa5be05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655888467; 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=QvZs6yYLnwKwmgo+JHJNxGYRBJA6QehjerFkV5jUqwg=; b=PZ2Jj+7e04u2mRsmxDEfbp4ILqPHJzVTgYsPKzDmaI/cWEZW7yxSJT+9o142kWZ/XZtulL ToOpCtrkA8W3or1nAEq2Fbf2tr07qovRoneq8Q+irdA1e4oiwXZWhPcvSFmXnz3RqskZXc 3TLW+Rc1Sv5SuXODk/K9nQo1OJLSqGJ1S0VqptnQTfl1BiC//7SdUkQEdi6ftVgWi89R/N CGHZrLou5IHbbhg67IqicnMDQ2v9PalN85kzWrvJamgUj+gJQ3YHCvXu0NDRXoPp2RF0ZE MTJ7hTY7aTAI7el3IveqNsGOLnAyzNYGr96ZhYkUJ9zIVFdbuwHTgeZsYDSp8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655888467; a=rsa-sha256; cv=none; b=yNOlA+/EQ9u1JdGX2TlAS92bSf2R9+lk5gkQpDXqIInS3Z3RA+rj/lQVCKJNwpRyFhwpe4 INa8gHldi1IMHA0UwqCHMMRfXC7y701U6Aa57kfo1+eX2BedkzjL6I63d97Nkf9bJWR37T A+y9hiCJhwmA6KtuNhajCYnpAnxjcOHAlYS/EAbdomCZA0ECkDsVhf6UlX3BI2brHDeadA Jz3C6SJcAG/AOhkSfj4NDHxMeyctazQjKjp81btpGTnbZsczjbgPS2mOgynnTGTh0LagoB RqG5ArZYfUyAxO25gBwomrs5OymaP9JE7mYYOceR3tMKlZCTjybAbT8S9yJJnw== 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=f8942926a8cb9a03b0ffab32565479d97fa5be05 commit f8942926a8cb9a03b0ffab32565479d97fa5be05 Author: Bernard Spil AuthorDate: 2022-06-22 08:56:18 +0000 Commit: Bernard Spil CommitDate: 2022-06-22 08:56:18 +0000 security/openssl: Security update to 1.1.1p Security: 4eeb93bf-f204-11ec-8fbd-d4c9ef517024 --- security/openssl/Makefile | 3 +- security/openssl/distinfo | 6 +- security/openssl/files/patch-test_v3ext.c | 96 +++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 5 deletions(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 776698ef305b..98bb3b2dae26 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,8 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -PORTVERSION= 1.1.1o -PORTREVISION= 1 +PORTVERSION= 1.1.1p PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 2ea1c2918bbd..6bb4a692578e 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651649441 -SHA256 (openssl-1.1.1o.tar.gz) = 9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f -SIZE (openssl-1.1.1o.tar.gz) = 9856386 +TIMESTAMP = 1655885637 +SHA256 (openssl-1.1.1p.tar.gz) = bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f +SIZE (openssl-1.1.1p.tar.gz) = 9860217 diff --git a/security/openssl/files/patch-test_v3ext.c b/security/openssl/files/patch-test_v3ext.c new file mode 100644 index 000000000000..75769d96ad49 --- /dev/null +++ b/security/openssl/files/patch-test_v3ext.c @@ -0,0 +1,96 @@ +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; + }