diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 98bb3b2dae26..2fa65b05c556 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,170 +1,170 @@ # Created by: Dirk Froemberg PORTNAME= openssl -PORTVERSION= 1.1.1p +PORTVERSION= 1.1.1q PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ MAINTAINER= brnrd@FreeBSD.org COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl-devel openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config CONFIGURE_ENV= PERL="${PERL}" CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ --prefix=${PREFIX} USES= cpe perl5 USE_PERL5= build TEST_TARGET= test LDFLAGS_i386= -Wl,-znotext MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}" MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 SM2 SM3 OPTIONS_GROUP_OPTIMIZE= ASM SSE2 THREADS OPTIONS_DEFINE_i386= I386 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2 OPTIONS_DEFINE= ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB OPTIONS_DEFAULT=ASM ASYNC CT GOST DES EC KTLS MAN3 MD4 NEXTPROTONEG RC2 \ RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2 OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:} \ ${${OSVERSION} > 1300000:?CRYPTODEV:} OPTIONS_GROUP_OPTIMIZE_amd64= EC .if ${MACHINE_ARCH} == "amd64" OPTIONS_GROUP_OPTIMIZE+= EC .elif ${MACHINE_ARCH} == "mips64el" OPTIONS_GROUP_OPTIMIZE+= EC .endif OPTIONS_SUB= yes ARIA_DESC= ARIA (South Korean standard) ASM_DESC= Assembler code ASYNC_DESC= Asynchronous mode CIPHERS_DESC= Block Cipher Support CRYPTODEV_DESC= /dev/crypto support CT_DESC= Certificate Transparency Support DES_DESC= (Triple) Data Encryption Standard EC_DESC= Optimize NIST elliptic curves GOST_DESC= GOST (Russian standard) HASHES_DESC= Hash Function Support I386_DESC= i386 (instead of i486+) IDEA_DESC= International Data Encryption Algorithm KTLS_DESC= Kernel TLS offload MAN3_DESC= Install API manpages (section 3, 7) MD2_DESC= MD2 (obsolete) MD4_DESC= MD4 (unsafe) MDC2_DESC= MDC-2 (patented, requires DES) NEXTPROTONEG_DESC= Next Protocol Negotiation (SPDY) OPTIMIZE_DESC= Optimizations PROTOCOLS_DESC= Protocol Support RC2_DESC= RC2 (unsafe) RC4_DESC= RC4 (unsafe) RC5_DESC= RC5 (patented) RMD160_DESC= RIPEMD-160 RFC3779_DESC= RFC3779 support (BGP) SCTP_DESC= SCTP (Stream Control Transmission) SHARED_DESC= Build shared libraries SM2_DESC= SM2 Elliptic Curve DH (Chinese standard) SM3_DESC= SM3 256bit (Chinese standard) SM4_DESC= SM4 128bit (Chinese standard) SSE2_DESC= Runtime SSE2 detection SSL3_DESC= SSLv3 (unsafe) TLS1_DESC= TLSv1.0 (requires TLS1_1, TLS1_2) TLS1_1_DESC= TLSv1.1 (requires TLS1_2) TLS1_2_DESC= TLSv1.2 WEAK-SSL-CIPHERS_DESC= Weak cipher support (unsafe) # Upstream default disabled options .for _option in ktls md2 rc5 sctp ssl3 zlib weak-ssl-ciphers ${_option:tu}_CONFIGURE_ON= enable-${_option} .endfor # Upstream default enabled options .for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg rc2 rc4 \ rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2 ${_option:tu}_CONFIGURE_OFF= no-${_option} .endfor MDC2_IMPLIES= DES TLS1_IMPLIES= TLS1_1 TLS1_1_IMPLIES= TLS1_2 EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128 I386_CONFIGURE_ON= 386 KTLS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ktls MAN3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-util_process__docs.pl SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER} SHARED_USE= ldconfig=yes SSL3_CONFIGURE_ON+= enable-ssl3-method ZLIB_CONFIGURE_ON= zlib-dynamic .include .if ${PREFIX} == /usr IGNORE= the OpenSSL port can not be installed over the base version .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 && !${PORT_OPTIONS:MCRYPTODEV} CONFIGURE_ARGS+= no-devcryptoeng .endif OPENSSLDIR?= ${PREFIX}/openssl PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} .include "version.mk" .if ${PORT_OPTIONS:MASM} BROKEN_sparc64= option ASM generates illegal instructions .endif post-patch: ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \ -e 's| install_html_docs$$||' \ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ ${WRKSRC}/Configurations/unix-Makefile.tmpl ${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Configurations/shared-info.pl post-configure: ${REINPLACE_CMD} \ -e 's|SHLIB_VERSION_NUMBER=1.1|SHLIB_VERSION_NUMBER=${OPENSSL_SHLIBVER}|' \ ${WRKSRC}/Makefile ${REINPLACE_CMD} \ -e 's|SHLIB_VERSION_NUMBER "1.1"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ ${WRKSRC}/include/openssl/opensslv.h post-install-SHARED-on: .for i in libcrypto libssl ${INSTALL_LIB} ${WRKSRC}/$i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib ${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so .endfor .for i in capi padlock ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-1.1/${i}.so .endfor post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl post-install-MAN3-on: ( cd ${STAGEDIR}/${PREFIX} ; ${FIND} man/man3 man/man7 -not -type d ) | \ ${SED} 's/$$/.gz/' >>${TMPPLIST} .include diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 6bb4a692578e..3f63b2a9d46f 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655885637 -SHA256 (openssl-1.1.1p.tar.gz) = bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f -SIZE (openssl-1.1.1p.tar.gz) = 9860217 +TIMESTAMP = 1657032778 +SHA256 (openssl-1.1.1q.tar.gz) = d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca +SIZE (openssl-1.1.1q.tar.gz) = 9864061 diff --git a/security/openssl/files/patch-test_v3ext.c b/security/openssl/files/patch-test_v3ext.c deleted file mode 100644 index 75769d96ad49..000000000000 --- a/security/openssl/files/patch-test_v3ext.c +++ /dev/null @@ -1,96 +0,0 @@ -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; - }