diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2022-06-25 10:27:48 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2022-06-25 10:40:10 +0000 |
| commit | 4c6583c335e521c6d7aac6c32052bc7c1d815591 (patch) | |
| tree | f2d684b1e74322ecef75ea24c90eb4719ab67a2b | |
| parent | 0e06657ad406eb220a356e8f49cb5cccd025225e (diff) | |
| download | ports-4c6583c335e521c6d7aac6c32052bc7c1d815591.tar.gz ports-4c6583c335e521c6d7aac6c32052bc7c1d815591.zip | |
security/openssl-devel: Security update to 3.0.4
Security: 4eeb93bf-f204-11ec-8fbd-d4c9ef517024
MFH: 2022Q2
(cherry picked from commit e494a18290054f0ad5942e8d8ccc09001ab61b16)
| -rw-r--r-- | security/openssl-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/openssl-devel/distinfo | 6 | ||||
| -rw-r--r-- | 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 <dirk@FreeBSD.org> 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; + } |