Index: head/security/wolfssl/files/patch-src-ssl.c =================================================================== --- head/security/wolfssl/files/patch-src-ssl.c (revision 567823) +++ head/security/wolfssl/files/patch-src-ssl.c (nonexistent) @@ -1,31 +0,0 @@ -From 0aead8cb868003a5dff2e81d6a7ffd7579652610 Mon Sep 17 00:00:00 2001 -From: Fabian Keil -Date: Sun, 17 Jan 2021 11:21:59 +0100 -Subject: [PATCH] wolfSSL_CertManagerFree(): free refMutex - -Fixes memory leaks like: - ==323== 96 bytes in 1 blocks are definitely lost in loss record 3 of 4 - ==323== at 0x4C291E1: calloc (in /usr/local/lib/valgrind/vgpreload_memcheck-amd64-freebsd.so) - ==323== by 0x585495F: pthread_mutex_init (in /lib/libthr.so.3) - ==323== by 0x4E7B5E8: wc_InitMutex (wc_port.c:1071) - ==323== by 0x4F09540: wolfSSL_CertManagerNew_ex (ssl.c:3596) - ==323== by 0x4EC6A81: InitSSL_Ctx (internal.c:1752) - ==323== by 0x4F0441E: wolfSSL_CTX_new_ex (ssl.c:394) - ==323== by 0x4F04658: wolfSSL_CTX_new (ssl.c:436) - ==323== by 0x400AA2: main (wolfssl-ctx-leak.c:9) - -This is a partial cherry-pick of upstream commit -9598c037168b73ce2f by Tesfa Mael. ---- src/ssl.c.orig 2020-12-23 02:15:20 UTC -+++ src/ssl.c -@@ -3663,7 +3663,9 @@ void wolfSSL_CertManagerFree(WOLFSSL_CERT_MANAGER* cm) - FreeTrustedPeerTable(cm->tpTable, TP_TABLE_SIZE, cm->heap); - wc_FreeMutex(&cm->tpLock); - #endif -- -+ if (wc_FreeMutex(&cm->refMutex) != 0) { -+ WOLFSSL_MSG("Couldn't free refMutex mutex"); -+ } - XFREE(cm, cm->heap, DYNAMIC_TYPE_CERT_MANAGER); - } - } Property changes on: head/security/wolfssl/files/patch-src-ssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/wolfssl/Makefile =================================================================== --- head/security/wolfssl/Makefile (revision 567823) +++ head/security/wolfssl/Makefile (revision 567824) @@ -1,57 +1,56 @@ # $FreeBSD$ PORTNAME= wolfssl -PORTVERSION= 4.6.0 -PORTREVISION= 1 +PORTVERSION= 4.7.0 CATEGORIES= security devel MASTER_SITES= https://www.wolfssl.com/ \ LOCAL/fox MAINTAINER= fox@FreeBSD.org COMMENT= Embedded SSL C-Library LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= libtool zip USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-certgen \ --enable-des3 \ --enable-dh \ --enable-dsa \ --enable-dtls \ --enable-ecc \ --enable-ipv6 \ --enable-keygen \ --enable-opensslall \ --enable-opensslextra \ --enable-ripemd \ --enable-sessioncerts \ --enable-sha512 \ --enable-shared \ --enable-sni \ --enable-ssh \ --enable-static \ --enable-tls13 \ --enable-tls13-draft18 TEST_TARGET= check CFLAGS+= -DWOLFSSL_ALT_NAMES OPTIONS_DEFINE= DEBUG DOCS DEBUG_CONFIGURE_ON= --enable-debug post-configure: @${REINPLACE_CMD} \ -e 's|$${prefix}/cyassl/include|$${prefix}/include/cyassl|' \ -e 's|$${prefix}/cyassl/lib|$${prefix}/lib/cyassl|' \ -e '/^pkgconfigdir/s|(libdir)|&data|' \ ${WRKSRC}/Makefile post-install-DEBUG-off: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libwolfssl.so .include Index: head/security/wolfssl/distinfo =================================================================== --- head/security/wolfssl/distinfo (revision 567823) +++ head/security/wolfssl/distinfo (revision 567824) @@ -1,5 +1,3 @@ -TIMESTAMP = 1609170566 -SHA256 (wolfssl-4.6.0.zip) = f44ad0fc260acde4e42e60167b218034b4c8bf73718410f2f3b431a6c41edea8 -SIZE (wolfssl-4.6.0.zip) = 9071773 -SHA256 (e9b1ceae7e1daac6206d399e30c04bd51e3f8c7f.patch) = d012891c56b9d82d1dde9d956affc49c596d4ebf2d71f4ee0cc3ff1c50aa6fbd -SIZE (e9b1ceae7e1daac6206d399e30c04bd51e3f8c7f.patch) = 1043 +TIMESTAMP = 1615175830 +SHA256 (wolfssl-4.7.0.zip) = 59edfb6b70c17c82f2ef6126198549adf6cbccee8f013cfca88323590f8cbd43 +SIZE (wolfssl-4.7.0.zip) = 9121149 Index: head/security/wolfssl/pkg-plist =================================================================== --- head/security/wolfssl/pkg-plist (revision 567823) +++ head/security/wolfssl/pkg-plist (revision 567824) @@ -1,239 +1,239 @@ bin/wolfssl-config include/cyassl/callbacks.h include/cyassl/certs_test.h include/cyassl/crl.h include/cyassl/ctaocrypt/aes.h include/cyassl/ctaocrypt/arc4.h include/cyassl/ctaocrypt/asn.h include/cyassl/ctaocrypt/asn_public.h include/cyassl/ctaocrypt/blake2-impl.h include/cyassl/ctaocrypt/blake2-int.h include/cyassl/ctaocrypt/blake2.h include/cyassl/ctaocrypt/camellia.h include/cyassl/ctaocrypt/chacha.h include/cyassl/ctaocrypt/coding.h include/cyassl/ctaocrypt/compress.h include/cyassl/ctaocrypt/des3.h include/cyassl/ctaocrypt/dh.h include/cyassl/ctaocrypt/dsa.h include/cyassl/ctaocrypt/ecc.h include/cyassl/ctaocrypt/error-crypt.h include/cyassl/ctaocrypt/fips_test.h include/cyassl/ctaocrypt/hc128.h include/cyassl/ctaocrypt/hmac.h include/cyassl/ctaocrypt/integer.h include/cyassl/ctaocrypt/logging.h include/cyassl/ctaocrypt/md2.h include/cyassl/ctaocrypt/md4.h include/cyassl/ctaocrypt/md5.h include/cyassl/ctaocrypt/memory.h include/cyassl/ctaocrypt/misc.h include/cyassl/ctaocrypt/mpi_class.h include/cyassl/ctaocrypt/mpi_superclass.h include/cyassl/ctaocrypt/pkcs7.h include/cyassl/ctaocrypt/poly1305.h include/cyassl/ctaocrypt/pwdbased.h include/cyassl/ctaocrypt/rabbit.h include/cyassl/ctaocrypt/random.h include/cyassl/ctaocrypt/ripemd.h include/cyassl/ctaocrypt/rsa.h include/cyassl/ctaocrypt/settings.h include/cyassl/ctaocrypt/settings_comp.h include/cyassl/ctaocrypt/sha.h include/cyassl/ctaocrypt/sha256.h include/cyassl/ctaocrypt/sha512.h include/cyassl/ctaocrypt/tfm.h include/cyassl/ctaocrypt/types.h include/cyassl/ctaocrypt/visibility.h include/cyassl/ctaocrypt/wc_port.h include/cyassl/error-ssl.h include/cyassl/ocsp.h include/cyassl/openssl/asn1.h include/cyassl/openssl/bio.h include/cyassl/openssl/bn.h include/cyassl/openssl/conf.h include/cyassl/openssl/crypto.h include/cyassl/openssl/des.h include/cyassl/openssl/dh.h include/cyassl/openssl/dsa.h include/cyassl/openssl/ec.h include/cyassl/openssl/ec25519.h include/cyassl/openssl/ec448.h include/cyassl/openssl/ecdh.h include/cyassl/openssl/ecdsa.h include/cyassl/openssl/ed25519.h include/cyassl/openssl/ed448.h include/cyassl/openssl/engine.h include/cyassl/openssl/err.h include/cyassl/openssl/evp.h include/cyassl/openssl/hmac.h include/cyassl/openssl/lhash.h include/cyassl/openssl/md4.h include/cyassl/openssl/md5.h include/cyassl/openssl/ocsp.h include/cyassl/openssl/opensslconf.h include/cyassl/openssl/opensslv.h include/cyassl/openssl/ossl_typ.h include/cyassl/openssl/pem.h include/cyassl/openssl/pkcs12.h include/cyassl/openssl/rand.h include/cyassl/openssl/ripemd.h include/cyassl/openssl/rsa.h include/cyassl/openssl/sha.h include/cyassl/openssl/ssl.h include/cyassl/openssl/ssl23.h include/cyassl/openssl/stack.h include/cyassl/openssl/ui.h include/cyassl/openssl/x509.h include/cyassl/openssl/x509v3.h include/cyassl/options.h include/cyassl/sniffer.h include/cyassl/sniffer_error.h include/cyassl/ssl.h include/cyassl/test.h include/cyassl/version.h include/wolfssl/callbacks.h include/wolfssl/certs_test.h include/wolfssl/crl.h include/wolfssl/error-ssl.h include/wolfssl/ocsp.h include/wolfssl/openssl/aes.h include/wolfssl/openssl/asn1.h include/wolfssl/openssl/asn1t.h include/wolfssl/openssl/bio.h include/wolfssl/openssl/bn.h include/wolfssl/openssl/buffer.h include/wolfssl/openssl/cms.h include/wolfssl/openssl/conf.h include/wolfssl/openssl/crypto.h include/wolfssl/openssl/des.h include/wolfssl/openssl/dh.h include/wolfssl/openssl/dsa.h include/wolfssl/openssl/ec.h include/wolfssl/openssl/ec25519.h include/wolfssl/openssl/ec448.h include/wolfssl/openssl/ecdh.h include/wolfssl/openssl/ecdsa.h include/wolfssl/openssl/ed25519.h include/wolfssl/openssl/ed448.h include/wolfssl/openssl/engine.h include/wolfssl/openssl/err.h include/wolfssl/openssl/evp.h include/wolfssl/openssl/hmac.h include/wolfssl/openssl/lhash.h include/wolfssl/openssl/md4.h include/wolfssl/openssl/md5.h include/wolfssl/openssl/obj_mac.h include/wolfssl/openssl/objects.h include/wolfssl/openssl/ocsp.h include/wolfssl/openssl/opensslconf.h include/wolfssl/openssl/opensslv.h include/wolfssl/openssl/ossl_typ.h include/wolfssl/openssl/pem.h include/wolfssl/openssl/pkcs12.h include/wolfssl/openssl/pkcs7.h include/wolfssl/openssl/rand.h include/wolfssl/openssl/rc4.h include/wolfssl/openssl/ripemd.h include/wolfssl/openssl/rsa.h include/wolfssl/openssl/sha.h include/wolfssl/openssl/sha3.h include/wolfssl/openssl/srp.h include/wolfssl/openssl/ssl.h include/wolfssl/openssl/ssl23.h include/wolfssl/openssl/stack.h include/wolfssl/openssl/tls1.h include/wolfssl/openssl/txt_db.h include/wolfssl/openssl/ui.h include/wolfssl/openssl/x509.h include/wolfssl/openssl/x509_vfy.h include/wolfssl/openssl/x509v3.h include/wolfssl/options.h include/wolfssl/sniffer.h include/wolfssl/sniffer_error.h include/wolfssl/ssl.h include/wolfssl/test.h include/wolfssl/version.h include/wolfssl/wolfcrypt/aes.h include/wolfssl/wolfcrypt/arc4.h include/wolfssl/wolfcrypt/asn.h include/wolfssl/wolfcrypt/asn_public.h include/wolfssl/wolfcrypt/blake2-impl.h include/wolfssl/wolfcrypt/blake2-int.h include/wolfssl/wolfcrypt/blake2.h include/wolfssl/wolfcrypt/camellia.h include/wolfssl/wolfcrypt/chacha.h include/wolfssl/wolfcrypt/chacha20_poly1305.h include/wolfssl/wolfcrypt/cmac.h include/wolfssl/wolfcrypt/coding.h include/wolfssl/wolfcrypt/compress.h include/wolfssl/wolfcrypt/cpuid.h include/wolfssl/wolfcrypt/cryptocb.h include/wolfssl/wolfcrypt/curve25519.h include/wolfssl/wolfcrypt/curve448.h include/wolfssl/wolfcrypt/des3.h include/wolfssl/wolfcrypt/dh.h include/wolfssl/wolfcrypt/dsa.h include/wolfssl/wolfcrypt/ecc.h include/wolfssl/wolfcrypt/ed25519.h include/wolfssl/wolfcrypt/ed448.h include/wolfssl/wolfcrypt/error-crypt.h include/wolfssl/wolfcrypt/fe_448.h include/wolfssl/wolfcrypt/fe_operations.h include/wolfssl/wolfcrypt/fips_test.h include/wolfssl/wolfcrypt/ge_448.h include/wolfssl/wolfcrypt/ge_operations.h include/wolfssl/wolfcrypt/hash.h include/wolfssl/wolfcrypt/hc128.h include/wolfssl/wolfcrypt/hmac.h include/wolfssl/wolfcrypt/idea.h include/wolfssl/wolfcrypt/integer.h include/wolfssl/wolfcrypt/logging.h include/wolfssl/wolfcrypt/md2.h include/wolfssl/wolfcrypt/md4.h include/wolfssl/wolfcrypt/md5.h include/wolfssl/wolfcrypt/mem_track.h include/wolfssl/wolfcrypt/memory.h include/wolfssl/wolfcrypt/misc.h include/wolfssl/wolfcrypt/mpi_class.h include/wolfssl/wolfcrypt/mpi_superclass.h include/wolfssl/wolfcrypt/pkcs12.h include/wolfssl/wolfcrypt/pkcs7.h include/wolfssl/wolfcrypt/poly1305.h include/wolfssl/wolfcrypt/pwdbased.h include/wolfssl/wolfcrypt/rabbit.h include/wolfssl/wolfcrypt/random.h include/wolfssl/wolfcrypt/rc2.h include/wolfssl/wolfcrypt/ripemd.h include/wolfssl/wolfcrypt/rsa.h include/wolfssl/wolfcrypt/settings.h include/wolfssl/wolfcrypt/sha.h include/wolfssl/wolfcrypt/sha256.h include/wolfssl/wolfcrypt/sha3.h include/wolfssl/wolfcrypt/sha512.h include/wolfssl/wolfcrypt/signature.h include/wolfssl/wolfcrypt/srp.h include/wolfssl/wolfcrypt/tfm.h include/wolfssl/wolfcrypt/types.h include/wolfssl/wolfcrypt/visibility.h include/wolfssl/wolfcrypt/wc_encrypt.h include/wolfssl/wolfcrypt/wc_port.h include/wolfssl/wolfcrypt/wolfevent.h include/wolfssl/wolfcrypt/wolfmath.h include/wolfssl/wolfio.h lib/libwolfssl.a lib/libwolfssl.so lib/libwolfssl.so.24 -lib/libwolfssl.so.24.3.0 +lib/libwolfssl.so.24.4.0 libdata/pkgconfig/wolfssl.pc %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/example/client.c %%PORTDOCS%%%%DOCSDIR%%/example/echoclient.c %%PORTDOCS%%%%DOCSDIR%%/example/echoserver.c %%PORTDOCS%%%%DOCSDIR%%/example/sctp-client-dtls.c %%PORTDOCS%%%%DOCSDIR%%/example/sctp-client.c %%PORTDOCS%%%%DOCSDIR%%/example/sctp-server-dtls.c %%PORTDOCS%%%%DOCSDIR%%/example/sctp-server.c %%PORTDOCS%%%%DOCSDIR%%/example/server.c %%PORTDOCS%%%%DOCSDIR%%/example/tls_bench.c %%PORTDOCS%%%%DOCSDIR%%/taoCert.txt