git: b9906c580190 - 2022Q3 - security/openssl-devel: Security update to 3.0.5

The branch 2022Q3 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b9906c580190636e97dd38c66bc13263c9b9a23b

commit b9906c580190636e97dd38c66bc13263c9b9a23b
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-07-05 17:34:59 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
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 <dirk@FreeBSD.org>
 
 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;
- }