Date: Tue, 3 Sep 2019 05:58:44 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r351732 - in projects/clang900-import: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip cddl/contrib/opensolaris/c... Message-ID: <201909030558.x835wiQh062946@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Sep 3 05:58:43 2019 New Revision: 351732 URL: https://svnweb.freebsd.org/changeset/base/351732 Log: Merge ^/head r351317 through r351731. Added: projects/clang900-import/contrib/wpa/src/ap/airtime_policy.c - copied unchanged from r351731, head/contrib/wpa/src/ap/airtime_policy.c projects/clang900-import/contrib/wpa/src/ap/airtime_policy.h - copied unchanged from r351731, head/contrib/wpa/src/ap/airtime_policy.h projects/clang900-import/contrib/wpa/src/ap/wpa_auth_kay.c - copied unchanged from r351731, head/contrib/wpa/src/ap/wpa_auth_kay.c projects/clang900-import/contrib/wpa/src/ap/wpa_auth_kay.h - copied unchanged from r351731, head/contrib/wpa/src/ap/wpa_auth_kay.h projects/clang900-import/contrib/wpa/src/common/dragonfly.c - copied unchanged from r351731, head/contrib/wpa/src/common/dragonfly.c projects/clang900-import/contrib/wpa/src/common/dragonfly.h - copied unchanged from r351731, head/contrib/wpa/src/common/dragonfly.h projects/clang900-import/contrib/wpa/src/drivers/driver_atheros.c - copied unchanged from r351731, head/contrib/wpa/src/drivers/driver_atheros.c projects/clang900-import/contrib/wpa/src/drivers/driver_hostap.c - copied unchanged from r351731, head/contrib/wpa/src/drivers/driver_hostap.c projects/clang900-import/contrib/wpa/src/drivers/nl80211_copy.h - copied unchanged from r351731, head/contrib/wpa/src/drivers/nl80211_copy.h projects/clang900-import/contrib/wpa/src/eap_common/eap_teap_common.c - copied unchanged from r351731, head/contrib/wpa/src/eap_common/eap_teap_common.c projects/clang900-import/contrib/wpa/src/eap_common/eap_teap_common.h - copied unchanged from r351731, head/contrib/wpa/src/eap_common/eap_teap_common.h projects/clang900-import/contrib/wpa/src/eap_peer/eap_teap.c - copied unchanged from r351731, head/contrib/wpa/src/eap_peer/eap_teap.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_teap_pac.c - copied unchanged from r351731, head/contrib/wpa/src/eap_peer/eap_teap_pac.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_teap_pac.h - copied unchanged from r351731, head/contrib/wpa/src/eap_peer/eap_teap_pac.h projects/clang900-import/contrib/wpa/src/eap_server/eap_server_teap.c - copied unchanged from r351731, head/contrib/wpa/src/eap_server/eap_server_teap.c projects/clang900-import/sbin/ping/tests/ - copied from r351731, head/sbin/ping/tests/ projects/clang900-import/sbin/ping6/tests/ - copied from r351731, head/sbin/ping6/tests/ projects/clang900-import/share/man/man3/Q_FRAWMASK.3 - copied unchanged from r351731, head/share/man/man3/Q_FRAWMASK.3 projects/clang900-import/share/man/man3/Q_IFRAWMASK.3 - copied unchanged from r351731, head/share/man/man3/Q_IFRAWMASK.3 projects/clang900-import/share/man/man3/Q_INI.3 - copied unchanged from r351731, head/share/man/man3/Q_INI.3 projects/clang900-import/share/man/man3/Q_IRAWMASK.3 - copied unchanged from r351731, head/share/man/man3/Q_IRAWMASK.3 projects/clang900-import/share/man/man3/Q_QABS.3 - copied unchanged from r351731, head/share/man/man3/Q_QABS.3 projects/clang900-import/share/man/man3/Q_QADDI.3 - copied unchanged from r351731, head/share/man/man3/Q_QADDI.3 projects/clang900-import/share/man/man3/Q_QADDQ.3 - copied unchanged from r351731, head/share/man/man3/Q_QADDQ.3 projects/clang900-import/share/man/man3/Q_SIGNED.3 - copied unchanged from r351731, head/share/man/man3/Q_SIGNED.3 projects/clang900-import/share/man/man3/Q_SIGNSHFT.3 - copied unchanged from r351731, head/share/man/man3/Q_SIGNSHFT.3 projects/clang900-import/share/man/man3/qmath.3 - copied unchanged from r351731, head/share/man/man3/qmath.3 projects/clang900-import/share/man/man4/ntb_hw_amd.4 - copied unchanged from r351731, head/share/man/man4/ntb_hw_amd.4 projects/clang900-import/share/man/man4/nvdimm.4 - copied unchanged from r351731, head/share/man/man4/nvdimm.4 projects/clang900-import/sys/amd64/include/pcpu_aux.h - copied unchanged from r351731, head/sys/amd64/include/pcpu_aux.h projects/clang900-import/sys/arm/include/pcpu_aux.h - copied unchanged from r351731, head/sys/arm/include/pcpu_aux.h projects/clang900-import/sys/arm64/include/pcpu_aux.h - copied unchanged from r351731, head/sys/arm64/include/pcpu_aux.h projects/clang900-import/sys/dev/nvme/nvme_ahci.c - copied unchanged from r351731, head/sys/dev/nvme/nvme_ahci.c projects/clang900-import/sys/dev/nvme/nvme_pci.c - copied unchanged from r351731, head/sys/dev/nvme/nvme_pci.c projects/clang900-import/sys/dts/arm/overlays/sun8i-h3-ths.dtso - copied unchanged from r351731, head/sys/dts/arm/overlays/sun8i-h3-ths.dtso projects/clang900-import/sys/i386/include/pcpu_aux.h - copied unchanged from r351731, head/sys/i386/include/pcpu_aux.h projects/clang900-import/sys/kern/uipc_ktls.c - copied unchanged from r351731, head/sys/kern/uipc_ktls.c projects/clang900-import/sys/mips/include/pcpu_aux.h - copied unchanged from r351731, head/sys/mips/include/pcpu_aux.h projects/clang900-import/sys/modules/ktls_ocf/ - copied from r351731, head/sys/modules/ktls_ocf/ projects/clang900-import/sys/opencrypto/ktls_ocf.c - copied unchanged from r351731, head/sys/opencrypto/ktls_ocf.c projects/clang900-import/sys/powerpc/include/pcpu_aux.h - copied unchanged from r351731, head/sys/powerpc/include/pcpu_aux.h projects/clang900-import/sys/riscv/include/pcpu_aux.h - copied unchanged from r351731, head/sys/riscv/include/pcpu_aux.h projects/clang900-import/sys/sparc64/include/pcpu_aux.h - copied unchanged from r351731, head/sys/sparc64/include/pcpu_aux.h projects/clang900-import/sys/sys/ktls.h - copied unchanged from r351731, head/sys/sys/ktls.h projects/clang900-import/sys/sys/qmath.h - copied unchanged from r351731, head/sys/sys/qmath.h projects/clang900-import/tests/sys/netpfil/common/forward.sh - copied unchanged from r351731, head/tests/sys/netpfil/common/forward.sh projects/clang900-import/tests/sys/sys/qmath_test.c - copied unchanged from r351731, head/tests/sys/sys/qmath_test.c projects/clang900-import/tools/tools/switch_tls/ - copied from r351731, head/tools/tools/switch_tls/ projects/clang900-import/usr.sbin/mixer/tests/ - copied from r351731, head/usr.sbin/mixer/tests/ Deleted: projects/clang900-import/lib/libc/mips/gen/longjmp.c projects/clang900-import/sys/dev/netmap/netmap_pt.c projects/clang900-import/sys/libkern/zlib.c projects/clang900-import/sys/sys/zlib.h projects/clang900-import/sys/sys/zutil.h projects/clang900-import/usr.sbin/makefs/msdos/denode.h projects/clang900-import/usr.sbin/makefs/msdos/fat.h projects/clang900-import/usr.sbin/makefs/msdos/msdosfsmount.h Modified: projects/clang900-import/ObsoleteFiles.inc projects/clang900-import/RELNOTES projects/clang900-import/UPDATING projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe projects/clang900-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c projects/clang900-import/contrib/libc++/include/cstdio projects/clang900-import/contrib/libstdc++/include/c_std/std_cstdio.h projects/clang900-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp projects/clang900-import/contrib/netbsd-tests/lib/libc/ssp/h_gets.c projects/clang900-import/contrib/sendmail/src/conf.c projects/clang900-import/contrib/sendmail/src/readcf.c projects/clang900-import/contrib/wpa/hostapd/ChangeLog projects/clang900-import/contrib/wpa/hostapd/config_file.c projects/clang900-import/contrib/wpa/hostapd/ctrl_iface.c projects/clang900-import/contrib/wpa/hostapd/defconfig projects/clang900-import/contrib/wpa/hostapd/eap_register.c projects/clang900-import/contrib/wpa/hostapd/hostapd.conf projects/clang900-import/contrib/wpa/hostapd/hostapd_cli.c projects/clang900-import/contrib/wpa/hostapd/main.c projects/clang900-import/contrib/wpa/hs20/client/osu_client.c projects/clang900-import/contrib/wpa/src/ap/accounting.c projects/clang900-import/contrib/wpa/src/ap/acs.c projects/clang900-import/contrib/wpa/src/ap/ap_config.c projects/clang900-import/contrib/wpa/src/ap/ap_config.h projects/clang900-import/contrib/wpa/src/ap/ap_drv_ops.c projects/clang900-import/contrib/wpa/src/ap/ap_drv_ops.h projects/clang900-import/contrib/wpa/src/ap/authsrv.c projects/clang900-import/contrib/wpa/src/ap/beacon.c projects/clang900-import/contrib/wpa/src/ap/ctrl_iface_ap.c projects/clang900-import/contrib/wpa/src/ap/dfs.c projects/clang900-import/contrib/wpa/src/ap/dpp_hostapd.c projects/clang900-import/contrib/wpa/src/ap/dpp_hostapd.h projects/clang900-import/contrib/wpa/src/ap/drv_callbacks.c projects/clang900-import/contrib/wpa/src/ap/gas_serv.c projects/clang900-import/contrib/wpa/src/ap/gas_serv.h projects/clang900-import/contrib/wpa/src/ap/hostapd.c projects/clang900-import/contrib/wpa/src/ap/hostapd.h projects/clang900-import/contrib/wpa/src/ap/hw_features.c projects/clang900-import/contrib/wpa/src/ap/ieee802_11.c projects/clang900-import/contrib/wpa/src/ap/ieee802_11.h projects/clang900-import/contrib/wpa/src/ap/ieee802_11_he.c projects/clang900-import/contrib/wpa/src/ap/ieee802_11_vht.c projects/clang900-import/contrib/wpa/src/ap/ieee802_1x.c projects/clang900-import/contrib/wpa/src/ap/ieee802_1x.h projects/clang900-import/contrib/wpa/src/ap/neighbor_db.c projects/clang900-import/contrib/wpa/src/ap/sta_info.c projects/clang900-import/contrib/wpa/src/ap/sta_info.h projects/clang900-import/contrib/wpa/src/ap/wmm.c projects/clang900-import/contrib/wpa/src/ap/wpa_auth.c projects/clang900-import/contrib/wpa/src/ap/wpa_auth.h projects/clang900-import/contrib/wpa/src/ap/wpa_auth_ft.c projects/clang900-import/contrib/wpa/src/ap/wpa_auth_glue.c projects/clang900-import/contrib/wpa/src/ap/wpa_auth_ie.c projects/clang900-import/contrib/wpa/src/common/dpp.c projects/clang900-import/contrib/wpa/src/common/dpp.h projects/clang900-import/contrib/wpa/src/common/hw_features_common.c projects/clang900-import/contrib/wpa/src/common/hw_features_common.h projects/clang900-import/contrib/wpa/src/common/ieee802_11_common.c projects/clang900-import/contrib/wpa/src/common/ieee802_11_common.h projects/clang900-import/contrib/wpa/src/common/ieee802_11_defs.h projects/clang900-import/contrib/wpa/src/common/qca-vendor.h projects/clang900-import/contrib/wpa/src/common/sae.c projects/clang900-import/contrib/wpa/src/common/sae.h projects/clang900-import/contrib/wpa/src/common/version.h projects/clang900-import/contrib/wpa/src/common/wpa_common.c projects/clang900-import/contrib/wpa/src/common/wpa_ctrl.h projects/clang900-import/contrib/wpa/src/crypto/aes_i.h projects/clang900-import/contrib/wpa/src/crypto/crypto.h projects/clang900-import/contrib/wpa/src/crypto/crypto_openssl.c projects/clang900-import/contrib/wpa/src/crypto/crypto_wolfssl.c projects/clang900-import/contrib/wpa/src/crypto/sha1-internal.c projects/clang900-import/contrib/wpa/src/crypto/sha1-prf.c projects/clang900-import/contrib/wpa/src/crypto/sha1-tlsprf.c projects/clang900-import/contrib/wpa/src/crypto/sha1-tprf.c projects/clang900-import/contrib/wpa/src/crypto/sha1.c projects/clang900-import/contrib/wpa/src/crypto/sha256-kdf.c projects/clang900-import/contrib/wpa/src/crypto/sha256-prf.c projects/clang900-import/contrib/wpa/src/crypto/sha256-tlsprf.c projects/clang900-import/contrib/wpa/src/crypto/sha256.h projects/clang900-import/contrib/wpa/src/crypto/sha384-kdf.c projects/clang900-import/contrib/wpa/src/crypto/sha384-prf.c projects/clang900-import/contrib/wpa/src/crypto/sha512-kdf.c projects/clang900-import/contrib/wpa/src/crypto/sha512-prf.c projects/clang900-import/contrib/wpa/src/crypto/tls.h projects/clang900-import/contrib/wpa/src/crypto/tls_openssl.c projects/clang900-import/contrib/wpa/src/crypto/tls_wolfssl.c projects/clang900-import/contrib/wpa/src/drivers/driver.h projects/clang900-import/contrib/wpa/src/drivers/driver_bsd.c projects/clang900-import/contrib/wpa/src/drivers/driver_common.c projects/clang900-import/contrib/wpa/src/drivers/driver_macsec_linux.c projects/clang900-import/contrib/wpa/src/drivers/driver_macsec_qca.c projects/clang900-import/contrib/wpa/src/drivers/driver_ndis.c projects/clang900-import/contrib/wpa/src/drivers/driver_nl80211.h projects/clang900-import/contrib/wpa/src/drivers/driver_nl80211_capa.c projects/clang900-import/contrib/wpa/src/drivers/driver_nl80211_event.c projects/clang900-import/contrib/wpa/src/drivers/driver_privsep.c projects/clang900-import/contrib/wpa/src/eap_common/eap_defs.h projects/clang900-import/contrib/wpa/src/eap_common/eap_pwd_common.c projects/clang900-import/contrib/wpa/src/eap_common/eap_sim_common.c projects/clang900-import/contrib/wpa/src/eap_common/eap_sim_common.h projects/clang900-import/contrib/wpa/src/eap_peer/eap.c projects/clang900-import/contrib/wpa/src/eap_peer/eap.h projects/clang900-import/contrib/wpa/src/eap_peer/eap_aka.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_config.h projects/clang900-import/contrib/wpa/src/eap_peer/eap_eke.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_leap.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_methods.h projects/clang900-import/contrib/wpa/src/eap_peer/eap_peap.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_pwd.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_sim.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_tls.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_tls_common.c projects/clang900-import/contrib/wpa/src/eap_peer/eap_tls_common.h projects/clang900-import/contrib/wpa/src/eap_server/eap.h projects/clang900-import/contrib/wpa/src/eap_server/eap_i.h projects/clang900-import/contrib/wpa/src/eap_server/eap_methods.h projects/clang900-import/contrib/wpa/src/eap_server/eap_server.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_aka.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_pax.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_peap.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_pwd.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_sim.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_tls.c projects/clang900-import/contrib/wpa/src/eap_server/eap_server_tls_common.c projects/clang900-import/contrib/wpa/src/eap_server/eap_tls_common.h projects/clang900-import/contrib/wpa/src/eapol_auth/eapol_auth_sm.c projects/clang900-import/contrib/wpa/src/eapol_auth/eapol_auth_sm.h projects/clang900-import/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/clang900-import/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/clang900-import/contrib/wpa/src/p2p/p2p.c projects/clang900-import/contrib/wpa/src/p2p/p2p_go_neg.c projects/clang900-import/contrib/wpa/src/p2p/p2p_i.h projects/clang900-import/contrib/wpa/src/pae/ieee802_1x_kay.c projects/clang900-import/contrib/wpa/src/radius/radius_server.c projects/clang900-import/contrib/wpa/src/radius/radius_server.h projects/clang900-import/contrib/wpa/src/rsn_supp/wpa.c projects/clang900-import/contrib/wpa/src/rsn_supp/wpa.h projects/clang900-import/contrib/wpa/src/rsn_supp/wpa_ft.c projects/clang900-import/contrib/wpa/src/rsn_supp/wpa_i.h projects/clang900-import/contrib/wpa/src/tls/asn1.c projects/clang900-import/contrib/wpa/src/tls/libtommath.c projects/clang900-import/contrib/wpa/src/tls/x509v3.c projects/clang900-import/contrib/wpa/src/utils/common.c projects/clang900-import/contrib/wpa/src/utils/common.h projects/clang900-import/contrib/wpa/src/utils/trace.c projects/clang900-import/contrib/wpa/src/utils/wpa_debug.c projects/clang900-import/contrib/wpa/src/wps/wps.h projects/clang900-import/contrib/wpa/wpa_supplicant/Android.mk projects/clang900-import/contrib/wpa/wpa_supplicant/ChangeLog projects/clang900-import/contrib/wpa/wpa_supplicant/README-DPP projects/clang900-import/contrib/wpa/wpa_supplicant/ap.c projects/clang900-import/contrib/wpa/wpa_supplicant/ap.h projects/clang900-import/contrib/wpa/wpa_supplicant/bss.c projects/clang900-import/contrib/wpa/wpa_supplicant/config.c projects/clang900-import/contrib/wpa/wpa_supplicant/config.h projects/clang900-import/contrib/wpa/wpa_supplicant/config_file.c projects/clang900-import/contrib/wpa/wpa_supplicant/config_ssid.h projects/clang900-import/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/clang900-import/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c projects/clang900-import/contrib/wpa/wpa_supplicant/defconfig projects/clang900-import/contrib/wpa/wpa_supplicant/dpp_supplicant.c projects/clang900-import/contrib/wpa/wpa_supplicant/dpp_supplicant.h projects/clang900-import/contrib/wpa/wpa_supplicant/driver_i.h projects/clang900-import/contrib/wpa/wpa_supplicant/eap_register.c projects/clang900-import/contrib/wpa/wpa_supplicant/eapol_test.c projects/clang900-import/contrib/wpa/wpa_supplicant/events.c projects/clang900-import/contrib/wpa/wpa_supplicant/ibss_rsn.c projects/clang900-import/contrib/wpa/wpa_supplicant/interworking.c projects/clang900-import/contrib/wpa/wpa_supplicant/mesh.c projects/clang900-import/contrib/wpa/wpa_supplicant/mesh_mpm.c projects/clang900-import/contrib/wpa/wpa_supplicant/notify.c projects/clang900-import/contrib/wpa/wpa_supplicant/notify.h projects/clang900-import/contrib/wpa/wpa_supplicant/op_classes.c projects/clang900-import/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/clang900-import/contrib/wpa/wpa_supplicant/preauth_test.c projects/clang900-import/contrib/wpa/wpa_supplicant/rrm.c projects/clang900-import/contrib/wpa/wpa_supplicant/sme.c projects/clang900-import/contrib/wpa/wpa_supplicant/wnm_sta.c projects/clang900-import/contrib/wpa/wpa_supplicant/wpa_cli.c projects/clang900-import/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/clang900-import/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/clang900-import/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/clang900-import/contrib/wpa/wpa_supplicant/wpas_glue.c projects/clang900-import/etc/mtree/BSD.tests.dist projects/clang900-import/gnu/lib/libssp/Makefile projects/clang900-import/include/stdio.h projects/clang900-import/lib/libc/gen/sysctlbyname.c projects/clang900-import/lib/libc/mips/Symbol.map projects/clang900-import/lib/libc/mips/gen/_setjmp.S projects/clang900-import/lib/libc/mips/gen/makecontext.c projects/clang900-import/lib/libc/mips/gen/setjmp.S projects/clang900-import/lib/libc/mips/gen/sigsetjmp.S projects/clang900-import/lib/libc/stdio/fgets.3 projects/clang900-import/lib/libc/stdio/gets.c projects/clang900-import/lib/libc/stdio/stdio.3 projects/clang900-import/lib/libc/string/memchr.c projects/clang900-import/lib/libc/sys/Symbol.map projects/clang900-import/lib/libc/tests/gen/getmntinfo_test.c projects/clang900-import/lib/libc/tests/stdlib/Makefile projects/clang900-import/lib/libfetch/Makefile projects/clang900-import/lib/libfetch/fetch.3 projects/clang900-import/lib/libfetch/http.c projects/clang900-import/lib/libmemstat/memstat_uma.c projects/clang900-import/lib/libproc/proc_regs.c projects/clang900-import/lib/libthr/thread/thr_cancel.c projects/clang900-import/lib/libthr/thread/thr_init.c projects/clang900-import/lib/libthr/thread/thr_private.h projects/clang900-import/lib/libthread_db/arch/mips/libpthread_md.c projects/clang900-import/lib/libutil/login_class.c projects/clang900-import/lib/msun/man/math.3 projects/clang900-import/lib/msun/tests/Makefile projects/clang900-import/libexec/rtld-elf/rtld_malloc.c projects/clang900-import/sbin/fsck_msdosfs/boot.c projects/clang900-import/sbin/fsck_msdosfs/fat.c projects/clang900-import/sbin/ifconfig/ifconfig.8 projects/clang900-import/sbin/ifconfig/ifconfig.c projects/clang900-import/sbin/newfs_msdos/mkfs_msdos.c projects/clang900-import/sbin/ping/Makefile projects/clang900-import/sbin/ping/ping.8 projects/clang900-import/sbin/ping/ping.c projects/clang900-import/sbin/ping/utils.h projects/clang900-import/sbin/ping6/Makefile projects/clang900-import/sbin/ping6/ping6.8 projects/clang900-import/sbin/ping6/ping6.c projects/clang900-import/share/man/man3/Makefile projects/clang900-import/share/man/man4/Makefile projects/clang900-import/share/man/man4/ads111x.4 projects/clang900-import/share/man/man4/ahci.4 projects/clang900-import/share/man/man4/dtrace_lockstat.4 projects/clang900-import/share/man/man4/ntb.4 projects/clang900-import/share/man/man4/ntb_transport.4 projects/clang900-import/share/man/man4/null.4 projects/clang900-import/share/man/man4/nvme.4 projects/clang900-import/share/man/man4/rtwn_usb.4 projects/clang900-import/share/man/man4/tcp.4 projects/clang900-import/share/man/man7/development.7 projects/clang900-import/share/man/man7/ffs.7 projects/clang900-import/share/man/man7/ports.7 projects/clang900-import/share/man/man9/Makefile projects/clang900-import/share/man/man9/zone.9 projects/clang900-import/share/misc/committers-ports.dot projects/clang900-import/share/mk/bsd.sys.mk projects/clang900-import/stand/efi/libefi/efi_console.c projects/clang900-import/stand/efi/libefi/efipart.c projects/clang900-import/stand/i386/boot2/Makefile projects/clang900-import/stand/libsa/mips/_setjmp.S projects/clang900-import/stand/powerpc/ofw/cas.c projects/clang900-import/sys/amd64/amd64/cpu_switch.S projects/clang900-import/sys/amd64/amd64/machdep.c projects/clang900-import/sys/amd64/amd64/mp_machdep.c projects/clang900-import/sys/amd64/amd64/pmap.c projects/clang900-import/sys/amd64/amd64/vm_machdep.c projects/clang900-import/sys/amd64/include/counter.h projects/clang900-import/sys/amd64/include/gdb_machdep.h projects/clang900-import/sys/amd64/include/md_var.h projects/clang900-import/sys/amd64/include/pcpu.h projects/clang900-import/sys/amd64/vmm/amd/svm.c projects/clang900-import/sys/amd64/vmm/io/vlapic.c projects/clang900-import/sys/amd64/vmm/io/vlapic.h projects/clang900-import/sys/amd64/vmm/io/vlapic_priv.h projects/clang900-import/sys/amd64/vmm/vmm_host.h projects/clang900-import/sys/arm/arm/mp_machdep.c projects/clang900-import/sys/arm/arm/physmem.c projects/clang900-import/sys/arm/conf/ALPINE projects/clang900-import/sys/arm/conf/ARMADA38X projects/clang900-import/sys/arm/conf/ARMADAXP projects/clang900-import/sys/arm/conf/DB-78XXX projects/clang900-import/sys/arm/conf/DB-88F5XXX projects/clang900-import/sys/arm/conf/DB-88F6XXX projects/clang900-import/sys/arm/conf/RT1310 projects/clang900-import/sys/arm/conf/SHEEVAPLUG projects/clang900-import/sys/arm/conf/SOCFPGA projects/clang900-import/sys/arm/conf/TS7800 projects/clang900-import/sys/arm/conf/VYBRID projects/clang900-import/sys/arm/include/counter.h projects/clang900-import/sys/arm/samsung/exynos/exynos5_combiner.c projects/clang900-import/sys/arm/samsung/exynos/exynos5_pad.c projects/clang900-import/sys/arm64/arm64/identcpu.c projects/clang900-import/sys/arm64/arm64/mp_machdep.c projects/clang900-import/sys/arm64/include/counter.h projects/clang900-import/sys/arm64/include/cpu.h projects/clang900-import/sys/arm64/rockchip/if_dwc_rk.c projects/clang900-import/sys/arm64/rockchip/rk_gpio.c projects/clang900-import/sys/arm64/rockchip/rk_grf.c projects/clang900-import/sys/arm64/rockchip/rk_pinctrl.c projects/clang900-import/sys/cam/ata/ata_xpt.c projects/clang900-import/sys/cam/mmc/mmc_xpt.c projects/clang900-import/sys/cam/nvme/nvme_xpt.c projects/clang900-import/sys/cam/scsi/scsi_cd.c projects/clang900-import/sys/cam/scsi/scsi_cd.h projects/clang900-import/sys/cam/scsi/scsi_enc_ses.c projects/clang900-import/sys/cam/scsi/scsi_xpt.c projects/clang900-import/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/clang900-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/clang900-import/sys/compat/freebsd32/freebsd32_misc.c projects/clang900-import/sys/compat/freebsd32/freebsd32_proto.h projects/clang900-import/sys/compat/freebsd32/freebsd32_syscall.h projects/clang900-import/sys/compat/freebsd32/freebsd32_syscalls.c projects/clang900-import/sys/compat/freebsd32/freebsd32_sysent.c projects/clang900-import/sys/compat/freebsd32/freebsd32_systrace_args.c projects/clang900-import/sys/compat/freebsd32/syscalls.master projects/clang900-import/sys/compat/linux/linux_mib.c projects/clang900-import/sys/compat/linux/linux_mib.h projects/clang900-import/sys/compat/linuxkpi/common/include/linux/io.h projects/clang900-import/sys/compat/linuxkpi/common/include/linux/sysfs.h projects/clang900-import/sys/conf/NOTES projects/clang900-import/sys/conf/files projects/clang900-import/sys/conf/files.amd64 projects/clang900-import/sys/conf/files.i386 projects/clang900-import/sys/conf/kern.mk projects/clang900-import/sys/conf/kern.pre.mk projects/clang900-import/sys/conf/kmod.mk projects/clang900-import/sys/conf/makeLINT.mk projects/clang900-import/sys/conf/options projects/clang900-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c projects/clang900-import/sys/contrib/ipfilter/netinet/fil.c projects/clang900-import/sys/contrib/ipfilter/netinet/ip_nat.c projects/clang900-import/sys/contrib/ncsw/Peripherals/FM/HC/hc.c projects/clang900-import/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c projects/clang900-import/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c projects/clang900-import/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h projects/clang900-import/sys/contrib/ncsw/user/env/xx.c projects/clang900-import/sys/contrib/zlib/deflate.c projects/clang900-import/sys/crypto/blowfish/bf_skey.c projects/clang900-import/sys/crypto/blowfish/blowfish.h projects/clang900-import/sys/crypto/chacha20/chacha-sw.c projects/clang900-import/sys/crypto/des/des.h projects/clang900-import/sys/crypto/des/des_ecb.c projects/clang900-import/sys/crypto/des/des_setkey.c projects/clang900-import/sys/ddb/db_ps.c projects/clang900-import/sys/ddb/db_thread.c projects/clang900-import/sys/dev/acpica/acpi_pcib_acpi.c projects/clang900-import/sys/dev/ahci/ahci.c projects/clang900-import/sys/dev/ahci/ahci.h projects/clang900-import/sys/dev/ahci/ahci_pci.c projects/clang900-import/sys/dev/cxgbe/cxgbei/icl_cxgbei.c projects/clang900-import/sys/dev/cxgbe/iw_cxgbe/qp.c projects/clang900-import/sys/dev/cxgbe/t4_main.c projects/clang900-import/sys/dev/cxgbe/t4_sge.c projects/clang900-import/sys/dev/cxgbe/tom/t4_connect.c projects/clang900-import/sys/dev/cxgbe/tom/t4_cpl_io.c projects/clang900-import/sys/dev/cxgbe/tom/t4_ddp.c projects/clang900-import/sys/dev/cxgbe/tom/t4_listen.c projects/clang900-import/sys/dev/cxgbe/tom/t4_tls.c projects/clang900-import/sys/dev/cxgbe/tom/t4_tom.c projects/clang900-import/sys/dev/cxgbe/tom/t4_tom.h projects/clang900-import/sys/dev/dpaa/if_dtsec_rm.c projects/clang900-import/sys/dev/ichsmb/ichsmb.c projects/clang900-import/sys/dev/netmap/netmap.c projects/clang900-import/sys/dev/netmap/netmap_kern.h projects/clang900-import/sys/dev/netmap/netmap_kloop.c projects/clang900-import/sys/dev/netmap/netmap_mem2.c projects/clang900-import/sys/dev/nvme/nvme.c projects/clang900-import/sys/dev/nvme/nvme_ctrlr.c projects/clang900-import/sys/dev/nvme/nvme_ns.c projects/clang900-import/sys/dev/nvme/nvme_ns_cmd.c projects/clang900-import/sys/dev/nvme/nvme_private.h projects/clang900-import/sys/dev/nvme/nvme_qpair.c projects/clang900-import/sys/dev/pci/pci_pci.c projects/clang900-import/sys/dev/qlxgbe/ql_isr.c projects/clang900-import/sys/dev/rtwn/usb/rtwn_usb_attach.h projects/clang900-import/sys/dev/sound/midi/sequencer.c projects/clang900-import/sys/dev/sound/pci/hda/hdaa_patches.c projects/clang900-import/sys/dev/usb/net/if_axe.c projects/clang900-import/sys/dev/usb/net/if_axge.c projects/clang900-import/sys/dev/usb/net/usb_ethernet.c projects/clang900-import/sys/dev/usb/net/usb_ethernet.h projects/clang900-import/sys/dev/usb/usbdevs projects/clang900-import/sys/dev/vmware/vmci/vmci.c projects/clang900-import/sys/dev/vnic/nicvf_main.c projects/clang900-import/sys/dev/vnic/thunder_bgx.c projects/clang900-import/sys/dev/xdma/xdma_sg.c projects/clang900-import/sys/dts/arm/overlays/sun8i-h3-sid.dtso projects/clang900-import/sys/fs/cd9660/cd9660_node.c projects/clang900-import/sys/fs/devfs/devfs_vnops.c projects/clang900-import/sys/fs/ext2fs/ext2_inode.c projects/clang900-import/sys/fs/fuse/fuse_vnops.c projects/clang900-import/sys/fs/msdosfs/denode.h projects/clang900-import/sys/fs/msdosfs/fat.h projects/clang900-import/sys/fs/msdosfs/msdosfs_denode.c projects/clang900-import/sys/fs/msdosfs/msdosfs_fat.c projects/clang900-import/sys/fs/msdosfs/msdosfsmount.h projects/clang900-import/sys/fs/nfsclient/nfs_clnode.c projects/clang900-import/sys/fs/nullfs/null_subr.c projects/clang900-import/sys/fs/nullfs/null_vnops.c projects/clang900-import/sys/fs/smbfs/smbfs_node.c projects/clang900-import/sys/fs/tmpfs/tmpfs_vnops.c projects/clang900-import/sys/fs/udf/udf_vnops.c projects/clang900-import/sys/fs/unionfs/union_vnops.c projects/clang900-import/sys/gdb/gdb_int.h projects/clang900-import/sys/gdb/gdb_main.c projects/clang900-import/sys/gdb/gdb_packet.c projects/clang900-import/sys/i386/i386/mp_machdep.c projects/clang900-import/sys/i386/i386/vm_machdep.c projects/clang900-import/sys/i386/include/counter.h projects/clang900-import/sys/i386/include/pcpu.h projects/clang900-import/sys/kern/capabilities.conf projects/clang900-import/sys/kern/init_sysent.c projects/clang900-import/sys/kern/kern_cpuset.c projects/clang900-import/sys/kern/kern_exec.c projects/clang900-import/sys/kern/kern_exit.c projects/clang900-import/sys/kern/kern_lock.c projects/clang900-import/sys/kern/kern_lockstat.c projects/clang900-import/sys/kern/kern_mbuf.c projects/clang900-import/sys/kern/kern_mutex.c projects/clang900-import/sys/kern/kern_proc.c projects/clang900-import/sys/kern/kern_racct.c projects/clang900-import/sys/kern/kern_sendfile.c projects/clang900-import/sys/kern/kern_sysctl.c projects/clang900-import/sys/kern/makesyscalls.sh projects/clang900-import/sys/kern/subr_compressor.c projects/clang900-import/sys/kern/subr_pcpu.c projects/clang900-import/sys/kern/subr_vmem.c projects/clang900-import/sys/kern/sys_pipe.c projects/clang900-import/sys/kern/syscalls.c projects/clang900-import/sys/kern/syscalls.master projects/clang900-import/sys/kern/systrace_args.c projects/clang900-import/sys/kern/uipc_mbuf.c projects/clang900-import/sys/kern/uipc_shm.c projects/clang900-import/sys/kern/uipc_sockbuf.c projects/clang900-import/sys/kern/uipc_socket.c projects/clang900-import/sys/kern/vfs_bio.c projects/clang900-import/sys/kern/vfs_default.c projects/clang900-import/sys/kern/vfs_mount.c projects/clang900-import/sys/kern/vfs_subr.c projects/clang900-import/sys/kern/vfs_vnops.c projects/clang900-import/sys/kern/vnode_if.src projects/clang900-import/sys/kgssapi/krb5/kcrypto_des.c projects/clang900-import/sys/kgssapi/krb5/kcrypto_des3.c projects/clang900-import/sys/mips/include/profile.h projects/clang900-import/sys/mips/include/regnum.h projects/clang900-import/sys/modules/Makefile projects/clang900-import/sys/modules/dtb/allwinner/Makefile projects/clang900-import/sys/modules/linux/Makefile projects/clang900-import/sys/modules/linux64/Makefile projects/clang900-import/sys/modules/nvme/Makefile projects/clang900-import/sys/modules/zlib/Makefile projects/clang900-import/sys/net/ieee8023ad_lacp.c projects/clang900-import/sys/net/ieee8023ad_lacp.h projects/clang900-import/sys/net/if.h projects/clang900-import/sys/net/if_lagg.c projects/clang900-import/sys/net/if_var.h projects/clang900-import/sys/net/if_vlan.c projects/clang900-import/sys/net/netmap.h projects/clang900-import/sys/net/netmap_user.h projects/clang900-import/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/clang900-import/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c projects/clang900-import/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/clang900-import/sys/netgraph/ng_deflate.c projects/clang900-import/sys/netinet/ip_output.c projects/clang900-import/sys/netinet/sctp_indata.c projects/clang900-import/sys/netinet/sctp_indata.h projects/clang900-import/sys/netinet/sctp_input.c projects/clang900-import/sys/netinet/sctp_output.c projects/clang900-import/sys/netinet/sctp_output.h projects/clang900-import/sys/netinet/sctp_pcb.c projects/clang900-import/sys/netinet/tcp.h projects/clang900-import/sys/netinet/tcp_input.c projects/clang900-import/sys/netinet/tcp_output.c projects/clang900-import/sys/netinet/tcp_ratelimit.c projects/clang900-import/sys/netinet/tcp_sack.c projects/clang900-import/sys/netinet/tcp_stacks/rack.c projects/clang900-import/sys/netinet/tcp_stacks/rack_bbr_common.c projects/clang900-import/sys/netinet/tcp_subr.c projects/clang900-import/sys/netinet/tcp_usrreq.c projects/clang900-import/sys/netinet/tcp_var.h projects/clang900-import/sys/netinet6/ip6_output.c projects/clang900-import/sys/netsmb/smb_crypt.c projects/clang900-import/sys/opencrypto/cast.c projects/clang900-import/sys/opencrypto/cast.h projects/clang900-import/sys/opencrypto/cryptodev.c projects/clang900-import/sys/opencrypto/skipjack.c projects/clang900-import/sys/opencrypto/skipjack.h projects/clang900-import/sys/opencrypto/xform_aes_icm.c projects/clang900-import/sys/opencrypto/xform_aes_xts.c projects/clang900-import/sys/opencrypto/xform_blf.c projects/clang900-import/sys/opencrypto/xform_cast5.c projects/clang900-import/sys/opencrypto/xform_cml.c projects/clang900-import/sys/opencrypto/xform_des1.c projects/clang900-import/sys/opencrypto/xform_des3.c projects/clang900-import/sys/opencrypto/xform_enc.h projects/clang900-import/sys/opencrypto/xform_null.c projects/clang900-import/sys/opencrypto/xform_rijndael.c projects/clang900-import/sys/opencrypto/xform_skipjack.c projects/clang900-import/sys/powerpc/booke/pmap.c projects/clang900-import/sys/powerpc/conf/MPC85XX projects/clang900-import/sys/powerpc/conf/MPC85XXSPE projects/clang900-import/sys/powerpc/conf/QORIQ64 projects/clang900-import/sys/powerpc/conf/dpaa/DPAA projects/clang900-import/sys/powerpc/include/counter.h projects/clang900-import/sys/powerpc/powerpc/mp_machdep.c projects/clang900-import/sys/riscv/include/counter.h projects/clang900-import/sys/riscv/riscv/mp_machdep.c projects/clang900-import/sys/security/mac/mac_process.c projects/clang900-import/sys/sys/lockstat.h projects/clang900-import/sys/sys/mbuf.h projects/clang900-import/sys/sys/mount.h projects/clang900-import/sys/sys/param.h projects/clang900-import/sys/sys/pcpu.h projects/clang900-import/sys/sys/proc.h projects/clang900-import/sys/sys/seqc.h projects/clang900-import/sys/sys/sockbuf.h projects/clang900-import/sys/sys/syscall.h projects/clang900-import/sys/sys/syscall.mk projects/clang900-import/sys/sys/sysctl.h projects/clang900-import/sys/sys/sysproto.h projects/clang900-import/sys/sys/vnode.h projects/clang900-import/sys/ufs/ffs/ffs_alloc.c projects/clang900-import/sys/ufs/ffs/ffs_extern.h projects/clang900-import/sys/ufs/ffs/ffs_softdep.c projects/clang900-import/sys/ufs/ffs/ffs_vfsops.c projects/clang900-import/sys/ufs/ufs/ufs_extern.h projects/clang900-import/sys/ufs/ufs/ufs_inode.c projects/clang900-import/sys/vm/uma.h projects/clang900-import/sys/vm/uma_core.c projects/clang900-import/sys/vm/uma_int.h projects/clang900-import/sys/vm/vm_glue.c projects/clang900-import/sys/vm/vm_kern.c projects/clang900-import/sys/vm/vm_map.c projects/clang900-import/sys/vm/vm_map.h projects/clang900-import/sys/vm/vm_object.c projects/clang900-import/sys/vm/vm_object.h projects/clang900-import/sys/vm/vm_page.c projects/clang900-import/sys/vm/vm_page.h projects/clang900-import/sys/vm/vm_pageout.c projects/clang900-import/sys/vm/vm_pagequeue.h projects/clang900-import/sys/vm/vm_swapout.c projects/clang900-import/sys/vm/vnode_pager.c projects/clang900-import/tests/sys/fs/Makefile projects/clang900-import/tests/sys/fs/fusefs/mockfs.cc projects/clang900-import/tests/sys/fs/fusefs/xattr.cc projects/clang900-import/tests/sys/kern/ptrace_test.c projects/clang900-import/tests/sys/netpfil/common/Makefile projects/clang900-import/tests/sys/netpfil/common/pass_block.sh projects/clang900-import/tests/sys/netpfil/pf/forward.sh projects/clang900-import/tests/sys/netpfil/pf/icmp.sh projects/clang900-import/tests/sys/netpfil/pf/pass_block.sh projects/clang900-import/tests/sys/posixshm/posixshm_test.c projects/clang900-import/tests/sys/sys/Makefile projects/clang900-import/usr.bin/ar/write.c projects/clang900-import/usr.bin/bzip2/Makefile projects/clang900-import/usr.bin/bzip2recover/Makefile projects/clang900-import/usr.bin/cpuset/cpuset.c projects/clang900-import/usr.bin/gprof/Makefile projects/clang900-import/usr.bin/gprof/gprof.c projects/clang900-import/usr.bin/gprof/gprof.h projects/clang900-import/usr.bin/indent/indent.1 projects/clang900-import/usr.bin/ktrace/ktrace.1 projects/clang900-import/usr.bin/last/last.c projects/clang900-import/usr.bin/vtfontcvt/vtfontcvt.c projects/clang900-import/usr.bin/w/w.c projects/clang900-import/usr.sbin/makefs/ffs/buf.h projects/clang900-import/usr.sbin/makefs/msdos.c projects/clang900-import/usr.sbin/makefs/msdos.h projects/clang900-import/usr.sbin/makefs/msdos/Makefile.inc projects/clang900-import/usr.sbin/makefs/msdos/direntry.h projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_conv.c projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_denode.c projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_fat.c projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_lookup.c projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_vfsops.c projects/clang900-import/usr.sbin/makefs/msdos/msdosfs_vnops.c projects/clang900-import/usr.sbin/mixer/Makefile projects/clang900-import/usr.sbin/mixer/mixer.c projects/clang900-import/usr.sbin/pciconf/cap.c projects/clang900-import/usr.sbin/pmcstudy/Makefile Directory Properties: projects/clang900-import/ (props changed) projects/clang900-import/cddl/ (props changed) projects/clang900-import/cddl/contrib/opensolaris/ (props changed) projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/clang900-import/contrib/libc++/ (props changed) projects/clang900-import/contrib/libstdc++/ (props changed) projects/clang900-import/contrib/llvm/ (props changed) projects/clang900-import/contrib/llvm/tools/lldb/ (props changed) projects/clang900-import/contrib/netbsd-tests/ (props changed) projects/clang900-import/contrib/sendmail/ (props changed) projects/clang900-import/contrib/wpa/ (props changed) projects/clang900-import/gnu/lib/ (props changed) projects/clang900-import/sys/cddl/contrib/opensolaris/ (props changed) projects/clang900-import/sys/contrib/ipfilter/ (props changed) projects/clang900-import/sys/contrib/zlib/ (props changed) Modified: projects/clang900-import/ObsoleteFiles.inc ============================================================================== --- projects/clang900-import/ObsoleteFiles.inc Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/ObsoleteFiles.inc Tue Sep 3 05:58:43 2019 (r351732) @@ -49,6 +49,9 @@ OLD_FILES+=usr/include/c++/v1/experimental/system_erro OLD_FILES+=usr/include/c++/v1/experimental/tuple OLD_FILES+=usr/lib/libc++fs.a +# 20190825: zlib 1.0.4 removed from kernel +OLD_FILES+=usr/include/sys/zlib.h +OLD_FILES+=usr/include/sys/zutil.h # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py @@ -65,8 +68,8 @@ OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use) OLD_FILES+=usr/include/sys/capability.h -# 20190615: sys/pwm.h renamed to dev/pwmc.h and pwm(9) removed -OLD_FILES+=usr/include/sys/pwm.h usr/share/man/man9/pwm.9.gz +# 20190615: sys/pwm.h renamed to dev/pwmc.h +OLD_FILES+=usr/include/sys/pwm.h # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1. OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h Modified: projects/clang900-import/RELNOTES ============================================================================== --- projects/clang900-import/RELNOTES Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/RELNOTES Tue Sep 3 05:58:43 2019 (r351732) @@ -10,7 +10,25 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. -r351201: +r351522: + Add kernel-side support for in-kernel Transport Layer Security + (KTLS). KTLS permits using sendfile(2) over sockets using + TLS. + +r351361: + Add probes for lockmgr(9) to the lockstat DTrace provider, add + corresponding lockstat(1) events, and document the new probes in + dtrace_lockstat.4. + +r351356: + Intel RST is a new 'feature' that remaps NVMe devices from + their normal location to part of the AHCI bar space. This + will eliminate the need to set the BIOS SATA setting from RST + to AHCI causing the nvme drive to be erased before FreeBSD + will see the nvme drive. FreeBSD will now be able to see the + nvme drive now in the default config. + +r351201, r351372: Add a vop_stdioctl() call, so that file systems that do not support holes will have a trivial implementation of lseek(SEEK_DATA/SEEK_HOLE). The algorithm appears to be compatible with the POSIX draft and @@ -18,6 +36,8 @@ r351201: does not support holes. Prior to this patch, lseek(2) would reply -1 with errno set to ENOTTY for SEEK_DATA/SEEK_HOLE on files in file systems that do not support holes. + r351372 maps ENOTTY to EINVAL for lseek(SEEK_DATA/SEEK_HOLE) for + any other cases, such as a ENOTTY return from vn_bmap_seekhole(). r350665: The fuse driver has been renamed to fusefs(5) and been substantially @@ -49,6 +69,9 @@ r350315, r350316: r350307: libcap_random(3) has been removed. Applications can use native APIs to get random data in capability mode. + +r349529,r349530: + Add support for using unmapped mbufs with sendfile(2). r349352: nand(4) and related components have been removed. Modified: projects/clang900-import/UPDATING ============================================================================== --- projects/clang900-import/UPDATING Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/UPDATING Tue Sep 3 05:58:43 2019 (r351732) @@ -26,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20190823: + Several of ping6's options have been renamed for better consistency + with ping. If you use any of -ARWXaghmrtwx, you must update your + scripts. See ping6(8) for details. + 20190727: The vfs.fusefs.sync_unmount and vfs.fusefs.init_backgrounded sysctls and the "-o sync_unmount" and "-o init_backgrounded" mount options have Modified: projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh Tue Sep 3 05:58:43 2019 (r351732) @@ -43,7 +43,7 @@ reader() while true do sleep 0.1 - cat /etc/motd > /dev/null + cat /COPYRIGHT > /dev/null done } Modified: projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh Tue Sep 3 05:58:43 2019 (r351732) @@ -44,7 +44,7 @@ reader() while true do sleep 0.1 - cat /etc/motd > /dev/null + cat /COPYRIGHT > /dev/null done } Modified: projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh Tue Sep 3 05:58:43 2019 (r351732) @@ -55,7 +55,7 @@ else removeinet6=0 fi -$dtrace -c "/sbin/ping6 -q -c 1 -X 3 $local" -qs /dev/stdin <<EOF | sort -n | \ +$dtrace -c "/sbin/ping6 -q -c 1 -t 3 $local" -qs /dev/stdin <<EOF | sort -n | \ grep -v -e '^round-trip ' -e '^--- ' ip:::send /args[2]->ip_saddr == "$local" && args[2]->ip_daddr == "$local" && Modified: projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/tst.NoSpecBuffer.exe Tue Sep 3 05:58:43 2019 (r351732) @@ -26,5 +26,5 @@ while true do sleep 0.1 - cat /etc/motd > /dev/null + cat /COPYRIGHT > /dev/null done Modified: projects/clang900-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c Tue Sep 3 05:58:43 2019 (r351732) @@ -158,29 +158,33 @@ static ls_event_info_t g_event_info[LS_MAX_EVENTS] = { { 'C', "Lock", "R/W writer blocked by readers", "nsec", "lockstat:::rw-block", "arg2 == 0 && arg3 == 0 && arg4" }, { 'C', "Lock", "R/W reader blocked by writer", "nsec", - "lockstat:::rw-block", "arg2 != 0 && arg3 == 1" }, + "lockstat:::rw-block", "arg2 == 1 && arg3 == 1" }, { 'C', "Lock", "R/W reader blocked by write wanted", "nsec", - "lockstat:::rw-block", "arg2 != 0 && arg3 == 0 && arg4" }, + "lockstat:::rw-block", "arg2 == 1 && arg3 == 0 && arg4" }, { 'C', "Lock", "R/W writer spin on writer", "nsec", "lockstat:::rw-spin", "arg2 == 0 && arg3 == 1" }, { 'C', "Lock", "R/W writer spin on readers", "nsec", "lockstat:::rw-spin", "arg2 == 0 && arg3 == 0 && arg4" }, { 'C', "Lock", "R/W reader spin on writer", "nsec", - "lockstat:::rw-spin", "arg2 != 0 && arg3 == 1" }, + "lockstat:::rw-spin", "arg2 == 1 && arg3 == 1" }, { 'C', "Lock", "R/W reader spin on write wanted", "nsec", - "lockstat:::rw-spin", "arg2 != 0 && arg3 == 0 && arg4" }, + "lockstat:::rw-spin", "arg2 == 1 && arg3 == 0 && arg4" }, { 'C', "Lock", "SX exclusive block", "nsec", "lockstat:::sx-block", "arg2 == 0" }, { 'C', "Lock", "SX shared block", "nsec", - "lockstat:::sx-block", "arg2 != 0" }, + "lockstat:::sx-block", "arg2 == 1" }, { 'C', "Lock", "SX exclusive spin", "nsec", "lockstat:::sx-spin", "arg2 == 0" }, { 'C', "Lock", "SX shared spin", "nsec", - "lockstat:::sx-spin", "arg2 != 0" }, - { 'C', "Lock", "Unknown event (type 16)", "units" }, - { 'C', "Lock", "Unknown event (type 17)", "units" }, - { 'C', "Lock", "Unknown event (type 18)", "units" }, - { 'C', "Lock", "Unknown event (type 19)", "units" }, + "lockstat:::sx-spin", "arg2 == 1" }, + { 'C', "Lock", "lockmgr writer blocked by writer", "nsec", + "lockstat:::lockmgr-block", "arg2 == 0 && arg3 == 1" }, + { 'C', "Lock", "lockmgr writer blocked by readers", "nsec", + "lockstat:::lockmgr-block", "arg2 == 0 && arg3 == 0 && arg4" }, + { 'C', "Lock", "lockmgr reader blocked by writer", "nsec", + "lockstat:::lockmgr-block", "arg2 == 1 && arg3 == 1" }, + { 'C', "Lock", "lockmgr reader blocked by write wanted", "nsec", + "lockstat:::lockmgr-block", "arg2 == 1 && arg3 == 0 && arg4" }, { 'C', "Lock", "Unknown event (type 20)", "units" }, { 'C', "Lock", "Unknown event (type 21)", "units" }, { 'C', "Lock", "Unknown event (type 22)", "units" }, @@ -206,13 +210,17 @@ static ls_event_info_t g_event_info[LS_MAX_EVENTS] = { "lockstat:::rw-release", "arg1 == 1", "lockstat:::rw-acquire" }, { 'H', "Lock", "SX shared hold", "nsec", - "lockstat:::sx-release", "arg1 == 0", + "lockstat:::sx-release", "arg1 == 1", "lockstat:::sx-acquire" }, { 'H', "Lock", "SX exclusive hold", "nsec", - "lockstat:::sx-release", "arg1 == 1", + "lockstat:::sx-release", "arg1 == 0", "lockstat:::sx-acquire" }, - { 'H', "Lock", "Unknown event (type 38)", "units" }, - { 'H', "Lock", "Unknown event (type 39)", "units" }, + { 'H', "Lock", "lockmgr shared hold", "nsec", + "lockstat:::lockmgr-release", "arg1 == 1", + "lockstat:::lockmgr-acquire" }, + { 'H', "Lock", "lockmgr exclusive hold", "nsec", + "lockstat:::lockmgr-release,lockstat:::lockmgr-disown", "arg1 == 0", + "lockstat:::lockmgr-acquire" }, { 'H', "Lock", "Unknown event (type 40)", "units" }, { 'H', "Lock", "Unknown event (type 41)", "units" }, { 'H', "Lock", "Unknown event (type 42)", "units" }, Modified: projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c ============================================================================== --- projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c Tue Sep 3 05:58:43 2019 (r351732) @@ -472,7 +472,7 @@ differ(void *arg) if (err) return ((void *)-1); if (di->zerr) { - ASSERT(di->zerr == EINVAL); + ASSERT(di->zerr == EPIPE); (void) snprintf(di->errbuf, sizeof (di->errbuf), dgettext(TEXT_DOMAIN, "Internal error: bad data from diff IOCTL")); Modified: projects/clang900-import/contrib/libc++/include/cstdio ============================================================================== --- projects/clang900-import/contrib/libc++/include/cstdio Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/libc++/include/cstdio Tue Sep 3 05:58:43 2019 (r351732) @@ -73,7 +73,6 @@ int fputc(int c, FILE* stream); int fputs(const char* restrict s, FILE* restrict stream); int getc(FILE* stream); int getchar(void); -char* gets(char* s); // removed in C++14 int putc(int c, FILE* stream); int putchar(int c); int puts(const char* s); @@ -152,9 +151,6 @@ using ::tmpnam; #ifndef _LIBCPP_HAS_NO_STDIN using ::getchar; -#if _LIBCPP_STD_VER <= 11 && !defined(_LIBCPP_MSVCRT) -using ::gets; -#endif using ::scanf; using ::vscanf; #endif Modified: projects/clang900-import/contrib/libstdc++/include/c_std/std_cstdio.h ============================================================================== --- projects/clang900-import/contrib/libstdc++/include/c_std/std_cstdio.h Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/libstdc++/include/c_std/std_cstdio.h Tue Sep 3 05:58:43 2019 (r351732) @@ -74,7 +74,6 @@ #undef fwrite #undef getc #undef getchar -#undef gets #undef perror #undef printf #undef putc @@ -121,7 +120,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) using ::fwrite; using ::getc; using ::getchar; - using ::gets; using ::perror; using ::printf; using ::putc; Modified: projects/clang900-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp ============================================================================== --- projects/clang900-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp Tue Sep 3 05:58:43 2019 (r351732) @@ -787,7 +787,7 @@ ProcessMonitor::~ProcessMonitor() { StopMonitor(); } // Thread setup and tear down. void ProcessMonitor::StartLaunchOpThread(LaunchArgs *args, Status &error) { - static const char *g_thread_name = "lldb.process.freebsd.operation"; + static const char *g_thread_name = "freebsd.op"; if (m_operation_thread->IsJoinable()) return; @@ -955,7 +955,7 @@ FINISH: void ProcessMonitor::StartAttachOpThread(AttachArgs *args, lldb_private::Status &error) { - static const char *g_thread_name = "lldb.process.freebsd.operation"; + static const char *g_thread_name = "freebsd.op"; if (m_operation_thread->IsJoinable()) return; Modified: projects/clang900-import/contrib/netbsd-tests/lib/libc/ssp/h_gets.c ============================================================================== --- projects/clang900-import/contrib/netbsd-tests/lib/libc/ssp/h_gets.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/netbsd-tests/lib/libc/ssp/h_gets.c Tue Sep 3 05:58:43 2019 (r351732) @@ -33,6 +33,24 @@ __RCSID("$NetBSD: h_gets.c,v 1.1 2010/12/27 02:04:19 p #include <stdio.h> +#ifdef __FreeBSD__ +/* + * We want to test the gets() implementation, but cannot simply link against + * the gets symbol because it is not in the default version. (We've made it + * unavailable by default on FreeBSD because it should not be used.) + * + * The next two lines create an unsafe_gets() function that resolves to + * gets@FBSD_1.0, which we call from our local gets() implementation. + */ +__sym_compat(gets, unsafe_gets, FBSD_1.0); +char *unsafe_gets(char *); + +char *gets(char *buf) +{ + return unsafe_gets(buf); +} +#endif + int main(int argc, char *argv[]) { Modified: projects/clang900-import/contrib/sendmail/src/conf.c ============================================================================== --- projects/clang900-import/contrib/sendmail/src/conf.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/sendmail/src/conf.c Tue Sep 3 05:58:43 2019 (r351732) @@ -365,6 +365,20 @@ setdefaults(e) TLS_Srv_Opts = TLS_I_SRV; if (NULL == EVP_digest) EVP_digest = EVP_md5(); + Srv_SSL_Options = SSL_OP_ALL; + Clt_SSL_Options = SSL_OP_ALL +# ifdef SSL_OP_NO_SSLv2 + | SSL_OP_NO_SSLv2 +# endif +# ifdef SSL_OP_NO_TICKET + | SSL_OP_NO_TICKET +# endif + ; +# ifdef SSL_OP_TLSEXT_PADDING + /* SSL_OP_TLSEXT_PADDING breaks compatibility with some sites */ + Srv_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; + Clt_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; +# endif /* SSL_OP_TLSEXT_PADDING */ #endif /* STARTTLS */ #ifdef HESIOD_INIT HesiodContext = NULL; Modified: projects/clang900-import/contrib/sendmail/src/readcf.c ============================================================================== --- projects/clang900-import/contrib/sendmail/src/readcf.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/sendmail/src/readcf.c Tue Sep 3 05:58:43 2019 (r351732) @@ -159,22 +159,6 @@ readcf(cfname, safe, e) FileName = cfname; LineNumber = 0; -#if STARTTLS - Srv_SSL_Options = SSL_OP_ALL; - Clt_SSL_Options = SSL_OP_ALL -# ifdef SSL_OP_NO_SSLv2 - | SSL_OP_NO_SSLv2 -# endif -# ifdef SSL_OP_NO_TICKET - | SSL_OP_NO_TICKET -# endif - ; -# ifdef SSL_OP_TLSEXT_PADDING - /* SSL_OP_TLSEXT_PADDING breaks compatibility with some sites */ - Srv_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; - Clt_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; -# endif /* SSL_OP_TLSEXT_PADDING */ -#endif /* STARTTLS */ if (DontLockReadFiles) sff |= SFF_NOLOCK; cf = safefopen(cfname, O_RDONLY, 0444, sff); Modified: projects/clang900-import/contrib/wpa/hostapd/ChangeLog ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/ChangeLog Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/ChangeLog Tue Sep 3 05:58:43 2019 (r351732) @@ -1,5 +1,29 @@ ChangeLog for hostapd +2019-08-07 - v2.9 + * SAE changes + - disable use of groups using Brainpool curves + - improved protection against side channel attacks + [https://w1.fi/security/2019-6/] + * EAP-pwd changes + - disable use of groups using Brainpool curves + - improved protection against side channel attacks + [https://w1.fi/security/2019-6/] + * fixed FT-EAP initial mobility domain association using PMKSA caching + * added configuration of airtime policy + * fixed FILS to and RSNE into (Re)Association Response frames + * fixed DPP bootstrapping URI parser of channel list + * added support for regulatory WMM limitation (for ETSI) + * added support for MACsec Key Agreement using IEEE 802.1X/PSK + * added experimental support for EAP-TEAP server (RFC 7170) + * added experimental support for EAP-TLS server with TLS v1.3 + * added support for two server certificates/keys (RSA/ECC) + * added AKMSuiteSelector into "STA <addr>" control interface data to + determine with AKM was used for an association + * added eap_sim_id parameter to allow EAP-SIM/AKA server pseudonym and + fast reauthentication use to be disabled + * fixed an ECDH operation corner case with OpenSSL + 2019-04-21 - v2.8 * SAE changes - added support for SAE Password Identifier Modified: projects/clang900-import/contrib/wpa/hostapd/config_file.c ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/config_file.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/config_file.c Tue Sep 3 05:58:43 2019 (r351732) @@ -24,14 +24,6 @@ #include "config_file.h" -#ifndef CONFIG_NO_RADIUS -#ifdef EAP_SERVER -static struct hostapd_radius_attr * -hostapd_parse_radius_attr(const char *value); -#endif /* EAP_SERVER */ -#endif /* CONFIG_NO_RADIUS */ - - #ifndef CONFIG_NO_VLAN static int hostapd_config_read_vlan_file(struct hostapd_bss_config *bss, const char *fname) @@ -660,76 +652,7 @@ hostapd_config_read_radius_addr(struct hostapd_radius_ } -static struct hostapd_radius_attr * -hostapd_parse_radius_attr(const char *value) -{ - const char *pos; - char syntax; - struct hostapd_radius_attr *attr; - size_t len; - attr = os_zalloc(sizeof(*attr)); - if (attr == NULL) - return NULL; - - attr->type = atoi(value); - - pos = os_strchr(value, ':'); - if (pos == NULL) { - attr->val = wpabuf_alloc(1); - if (attr->val == NULL) { - os_free(attr); - return NULL; - } - wpabuf_put_u8(attr->val, 0); - return attr; - } - - pos++; - if (pos[0] == '\0' || pos[1] != ':') { - os_free(attr); - return NULL; - } - syntax = *pos++; - pos++; - - switch (syntax) { - case 's': - attr->val = wpabuf_alloc_copy(pos, os_strlen(pos)); - break; - case 'x': - len = os_strlen(pos); - if (len & 1) - break; - len /= 2; - attr->val = wpabuf_alloc(len); - if (attr->val == NULL) - break; - if (hexstr2bin(pos, wpabuf_put(attr->val, len), len) < 0) { - wpabuf_free(attr->val); - os_free(attr); - return NULL; - } - break; - case 'd': - attr->val = wpabuf_alloc(4); - if (attr->val) - wpabuf_put_be32(attr->val, atoi(pos)); - break; - default: - os_free(attr); - return NULL; - } - - if (attr->val == NULL) { - os_free(attr); - return NULL; - } - - return attr; -} - - static int hostapd_parse_das_client(struct hostapd_bss_config *bss, char *val) { char *secret; @@ -2313,6 +2236,42 @@ static unsigned int parse_tls_flags(const char *val) #endif /* EAP_SERVER */ +#ifdef CONFIG_AIRTIME_POLICY +static int add_airtime_weight(struct hostapd_bss_config *bss, char *value) +{ + struct airtime_sta_weight *wt; + char *pos, *next; + + wt = os_zalloc(sizeof(*wt)); + if (!wt) + return -1; + + /* 02:01:02:03:04:05 10 */ + pos = value; + next = os_strchr(pos, ' '); + if (next) + *next++ = '\0'; + if (!next || hwaddr_aton(pos, wt->addr)) { + wpa_printf(MSG_ERROR, "Invalid station address: '%s'", pos); + os_free(wt); + return -1; + } + + pos = next; + wt->weight = atoi(pos); + if (!wt->weight) { + wpa_printf(MSG_ERROR, "Invalid weight: '%s'", pos); + os_free(wt); + return -1; + } + + wt->next = bss->airtime_weight_list; + bss->airtime_weight_list = wt; + return 0; +} +#endif /* CONFIG_AIRTIME_POLICY */ + + #ifdef CONFIG_SAE static int parse_sae_password(struct hostapd_bss_config *bss, const char *val) { @@ -2376,6 +2335,36 @@ fail: #endif /* CONFIG_SAE */ +#ifdef CONFIG_DPP2 +static int hostapd_dpp_controller_parse(struct hostapd_bss_config *bss, + const char *pos) +{ + struct dpp_controller_conf *conf; + char *val; + + conf = os_zalloc(sizeof(*conf)); + if (!conf) + return -1; + val = get_param(pos, "ipaddr="); + if (!val || hostapd_parse_ip_addr(val, &conf->ipaddr)) + goto fail; + os_free(val); + val = get_param(pos, "pkhash="); + if (!val || os_strlen(val) != 2 * SHA256_MAC_LEN || + hexstr2bin(val, conf->pkhash, SHA256_MAC_LEN) < 0) + goto fail; + os_free(val); + conf->next = bss->dpp_controller; + bss->dpp_controller = conf; + return 0; +fail: + os_free(val); + os_free(conf); + return -1; +} +#endif /* CONFIG_DPP2 */ + + static int hostapd_config_fill(struct hostapd_config *conf, struct hostapd_bss_config *bss, const char *buf, char *pos, int line) @@ -2496,7 +2485,11 @@ static int hostapd_config_fill(struct hostapd_config * } else if (os_strcmp(buf, "eapol_version") == 0) { int eapol_version = atoi(pos); +#ifdef CONFIG_MACSEC + if (eapol_version < 1 || eapol_version > 3) { +#else /* CONFIG_MACSEC */ if (eapol_version < 1 || eapol_version > 2) { +#endif /* CONFIG_MACSEC */ wpa_printf(MSG_ERROR, "Line %d: invalid EAPOL version (%d): '%s'.", line, eapol_version, pos); @@ -2519,12 +2512,21 @@ static int hostapd_config_fill(struct hostapd_config * } else if (os_strcmp(buf, "server_cert") == 0) { os_free(bss->server_cert); bss->server_cert = os_strdup(pos); + } else if (os_strcmp(buf, "server_cert2") == 0) { + os_free(bss->server_cert2); + bss->server_cert2 = os_strdup(pos); } else if (os_strcmp(buf, "private_key") == 0) { os_free(bss->private_key); bss->private_key = os_strdup(pos); + } else if (os_strcmp(buf, "private_key2") == 0) { + os_free(bss->private_key2); + bss->private_key2 = os_strdup(pos); } else if (os_strcmp(buf, "private_key_passwd") == 0) { os_free(bss->private_key_passwd); bss->private_key_passwd = os_strdup(pos); + } else if (os_strcmp(buf, "private_key_passwd2") == 0) { + os_free(bss->private_key_passwd2); + bss->private_key_passwd2 = os_strdup(pos); } else if (os_strcmp(buf, "check_cert_subject") == 0) { if (!pos[0]) { wpa_printf(MSG_ERROR, "Line %d: unknown check_cert_subject '%s'", @@ -2605,6 +2607,20 @@ static int hostapd_config_fill(struct hostapd_config * } else if (os_strcmp(buf, "pac_key_refresh_time") == 0) { bss->pac_key_refresh_time = atoi(pos); #endif /* EAP_SERVER_FAST */ +#ifdef EAP_SERVER_TEAP + } else if (os_strcmp(buf, "eap_teap_auth") == 0) { + int val = atoi(pos); + + if (val < 0 || val > 1) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid eap_teap_auth value", + line); + return 1; + } + bss->eap_teap_auth = val; + } else if (os_strcmp(buf, "eap_teap_pac_no_inner") == 0) { + bss->eap_teap_pac_no_inner = atoi(pos); +#endif /* EAP_SERVER_TEAP */ #ifdef EAP_SERVER_SIM } else if (os_strcmp(buf, "eap_sim_db") == 0) { os_free(bss->eap_sim_db); @@ -2613,6 +2629,8 @@ static int hostapd_config_fill(struct hostapd_config * bss->eap_sim_db_timeout = atoi(pos); } else if (os_strcmp(buf, "eap_sim_aka_result_ind") == 0) { bss->eap_sim_aka_result_ind = atoi(pos); + } else if (os_strcmp(buf, "eap_sim_id") == 0) { + bss->eap_sim_id = atoi(pos); #endif /* EAP_SERVER_SIM */ #ifdef EAP_SERVER_TNC } else if (os_strcmp(buf, "tnc") == 0) { @@ -2816,6 +2834,9 @@ static int hostapd_config_fill(struct hostapd_config * a = a->next; a->next = attr; } + } else if (os_strcmp(buf, "radius_req_attr_sqlite") == 0) { + os_free(bss->radius_req_attr_sqlite); + bss->radius_req_attr_sqlite = os_strdup(pos); } else if (os_strcmp(buf, "radius_das_port") == 0) { bss->radius_das_port = atoi(pos); } else if (os_strcmp(buf, "radius_das_client") == 0) { @@ -3442,6 +3463,8 @@ static int hostapd_config_fill(struct hostapd_config * conf->he_op.he_twt_required = atoi(pos); } else if (os_strcmp(buf, "he_rts_threshold") == 0) { conf->he_op.he_rts_threshold = atoi(pos); + } else if (os_strcmp(buf, "he_basic_mcs_nss_set") == 0) { + conf->he_op.he_basic_mcs_nss_set = atoi(pos); } else if (os_strcmp(buf, "he_mu_edca_qos_info_param_count") == 0) { conf->he_mu_edca.he_qos_info |= set_he_cap(atoi(pos), HE_QOS_INFO_EDCA_PARAM_SET_COUNT); @@ -3526,6 +3549,20 @@ static int hostapd_config_fill(struct hostapd_config * } else if (os_strcmp(buf, "he_mu_edca_ac_vo_timer") == 0) { conf->he_mu_edca.he_mu_ac_vo_param[HE_MU_AC_PARAM_TIMER_IDX] = atoi(pos) & 0xff; + } else if (os_strcmp(buf, "he_spr_sr_control") == 0) { + conf->spr.sr_control = atoi(pos) & 0xff; + } else if (os_strcmp(buf, "he_spr_non_srg_obss_pd_max_offset") == 0) { + conf->spr.non_srg_obss_pd_max_offset = atoi(pos); + } else if (os_strcmp(buf, "he_spr_srg_obss_pd_min_offset") == 0) { + conf->spr.srg_obss_pd_min_offset = atoi(pos); + } else if (os_strcmp(buf, "he_spr_srg_obss_pd_max_offset") == 0) { + conf->spr.srg_obss_pd_max_offset = atoi(pos); + } else if (os_strcmp(buf, "he_oper_chwidth") == 0) { + conf->he_oper_chwidth = atoi(pos); + } else if (os_strcmp(buf, "he_oper_centr_freq_seg0_idx") == 0) { + conf->he_oper_centr_freq_seg0_idx = atoi(pos); + } else if (os_strcmp(buf, "he_oper_centr_freq_seg1_idx") == 0) { + conf->he_oper_centr_freq_seg1_idx = atoi(pos); #endif /* CONFIG_IEEE80211AX */ } else if (os_strcmp(buf, "max_listen_interval") == 0) { bss->max_listen_interval = atoi(pos); @@ -4298,6 +4335,11 @@ static int hostapd_config_fill(struct hostapd_config * } else if (os_strcmp(buf, "dpp_csign") == 0) { if (parse_wpabuf_hex(line, buf, &bss->dpp_csign, pos)) return 1; +#ifdef CONFIG_DPP2 + } else if (os_strcmp(buf, "dpp_controller") == 0) { + if (hostapd_dpp_controller_parse(bss, pos)) + return 1; +#endif /* CONFIG_DPP2 */ #endif /* CONFIG_DPP */ #ifdef CONFIG_OWE } else if (os_strcmp(buf, "owe_transition_bssid") == 0) { @@ -4349,6 +4391,121 @@ static int hostapd_config_fill(struct hostapd_config * conf->rssi_reject_assoc_timeout = atoi(pos); } else if (os_strcmp(buf, "pbss") == 0) { bss->pbss = atoi(pos); +#ifdef CONFIG_AIRTIME_POLICY + } else if (os_strcmp(buf, "airtime_mode") == 0) { + int val = atoi(pos); + + if (val < 0 || val > AIRTIME_MODE_MAX) { + wpa_printf(MSG_ERROR, "Line %d: Unknown airtime_mode", + line); + return 1; + } + conf->airtime_mode = val; + } else if (os_strcmp(buf, "airtime_update_interval") == 0) { + conf->airtime_update_interval = atoi(pos); + } else if (os_strcmp(buf, "airtime_bss_weight") == 0) { + bss->airtime_weight = atoi(pos); + } else if (os_strcmp(buf, "airtime_bss_limit") == 0) { + int val = atoi(pos); + + if (val < 0 || val > 1) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid airtime_bss_limit (must be 0 or 1)", + line); + return 1; + } + bss->airtime_limit = val; + } else if (os_strcmp(buf, "airtime_sta_weight") == 0) { + if (add_airtime_weight(bss, pos) < 0) { + wpa_printf(MSG_ERROR, + "Line %d: Invalid airtime weight '%s'", + line, pos); + return 1; + } +#endif /* CONFIG_AIRTIME_POLICY */ +#ifdef CONFIG_MACSEC + } else if (os_strcmp(buf, "macsec_policy") == 0) { + int macsec_policy = atoi(pos); + + if (macsec_policy < 0 || macsec_policy > 1) { + wpa_printf(MSG_ERROR, + "Line %d: invalid macsec_policy (%d): '%s'.", + line, macsec_policy, pos); + return 1; + } + bss->macsec_policy = macsec_policy; + } else if (os_strcmp(buf, "macsec_integ_only") == 0) { + int macsec_integ_only = atoi(pos); + + if (macsec_integ_only < 0 || macsec_integ_only > 1) { + wpa_printf(MSG_ERROR, + "Line %d: invalid macsec_integ_only (%d): '%s'.", + line, macsec_integ_only, pos); + return 1; + } + bss->macsec_integ_only = macsec_integ_only; + } else if (os_strcmp(buf, "macsec_replay_protect") == 0) { + int macsec_replay_protect = atoi(pos); + + if (macsec_replay_protect < 0 || macsec_replay_protect > 1) { + wpa_printf(MSG_ERROR, + "Line %d: invalid macsec_replay_protect (%d): '%s'.", + line, macsec_replay_protect, pos); + return 1; + } + bss->macsec_replay_protect = macsec_replay_protect; + } else if (os_strcmp(buf, "macsec_replay_window") == 0) { + bss->macsec_replay_window = atoi(pos); + } else if (os_strcmp(buf, "macsec_port") == 0) { + int macsec_port = atoi(pos); + + if (macsec_port < 1 || macsec_port > 65534) { + wpa_printf(MSG_ERROR, + "Line %d: invalid macsec_port (%d): '%s'.", + line, macsec_port, pos); + return 1; + } + bss->macsec_port = macsec_port; + } else if (os_strcmp(buf, "mka_priority") == 0) { + int mka_priority = atoi(pos); + + if (mka_priority < 0 || mka_priority > 255) { + wpa_printf(MSG_ERROR, + "Line %d: invalid mka_priority (%d): '%s'.", + line, mka_priority, pos); + return 1; + } + bss->mka_priority = mka_priority; + } else if (os_strcmp(buf, "mka_cak") == 0) { + size_t len = os_strlen(pos); + + if (len > 2 * MACSEC_CAK_MAX_LEN || + (len != 2 * 16 && len != 2 * 32) || + hexstr2bin(pos, bss->mka_cak, len / 2)) { + wpa_printf(MSG_ERROR, "Line %d: Invalid MKA-CAK '%s'.", + line, pos); + return 1; + } + bss->mka_cak_len = len / 2; + bss->mka_psk_set |= MKA_PSK_SET_CAK; + } else if (os_strcmp(buf, "mka_ckn") == 0) { + size_t len = os_strlen(pos); + + if (len > 2 * MACSEC_CKN_MAX_LEN || /* too long */ + len < 2 || /* too short */ + len % 2 != 0 /* not an integral number of bytes */) { + wpa_printf(MSG_ERROR, "Line %d: Invalid MKA-CKN '%s'.", + line, pos); + return 1; + } + bss->mka_ckn_len = len / 2; + if (hexstr2bin(pos, bss->mka_ckn, bss->mka_ckn_len)) { + wpa_printf(MSG_ERROR, "Line %d: Invalid MKA-CKN '%s'.", + line, pos); + return -1; + } + bss->mka_psk_set |= MKA_PSK_SET_CKN; +#endif /* CONFIG_MACSEC */ } else { wpa_printf(MSG_ERROR, "Line %d: unknown configuration item '%s'", Modified: projects/clang900-import/contrib/wpa/hostapd/ctrl_iface.c ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/ctrl_iface.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/ctrl_iface.c Tue Sep 3 05:58:43 2019 (r351732) @@ -1830,26 +1830,40 @@ static void hostapd_data_test_rx(void *ctx, const u8 * struct iphdr ip; const u8 *pos; unsigned int i; + char extra[30]; - if (len != HWSIM_PACKETLEN) + if (len < sizeof(*eth) + sizeof(ip) || len > HWSIM_PACKETLEN) { + wpa_printf(MSG_DEBUG, + "test data: RX - ignore unexpected length %d", + (int) len); return; + } eth = (const struct ether_header *) buf; os_memcpy(&ip, eth + 1, sizeof(ip)); pos = &buf[sizeof(*eth) + sizeof(ip)]; if (ip.ihl != 5 || ip.version != 4 || - ntohs(ip.tot_len) != HWSIM_IP_LEN) + ntohs(ip.tot_len) > HWSIM_IP_LEN) { + wpa_printf(MSG_DEBUG, + "test data: RX - ignore unexpect IP header"); return; + } - for (i = 0; i < HWSIM_IP_LEN - sizeof(ip); i++) { - if (*pos != (u8) i) + for (i = 0; i < ntohs(ip.tot_len) - sizeof(ip); i++) { + if (*pos != (u8) i) { + wpa_printf(MSG_DEBUG, + "test data: RX - ignore mismatching payload"); return; + } pos++; } - wpa_msg(hapd->msg_ctx, MSG_INFO, "DATA-TEST-RX " MACSTR " " MACSTR, - MAC2STR(eth->ether_dhost), MAC2STR(eth->ether_shost)); + extra[0] = '\0'; + if (ntohs(ip.tot_len) != HWSIM_IP_LEN) + os_snprintf(extra, sizeof(extra), " len=%d", ntohs(ip.tot_len)); + wpa_msg(hapd->msg_ctx, MSG_INFO, "DATA-TEST-RX " MACSTR " " MACSTR "%s", + MAC2STR(eth->ether_dhost), MAC2STR(eth->ether_shost), extra); } @@ -1894,7 +1908,7 @@ static int hostapd_ctrl_iface_data_test_config(struct static int hostapd_ctrl_iface_data_test_tx(struct hostapd_data *hapd, char *cmd) { u8 dst[ETH_ALEN], src[ETH_ALEN]; - char *pos; + char *pos, *pos2; int used; long int val; u8 tos; @@ -1903,11 +1917,12 @@ static int hostapd_ctrl_iface_data_test_tx(struct host struct iphdr *ip; u8 *dpos; unsigned int i; + size_t send_len = HWSIM_IP_LEN; if (hapd->l2_test == NULL) return -1; - /* format: <dst> <src> <tos> */ + /* format: <dst> <src> <tos> [len=<length>] */ pos = cmd; used = hwaddr_aton2(pos, dst); @@ -1921,11 +1936,19 @@ static int hostapd_ctrl_iface_data_test_tx(struct host return -1; pos += used; - val = strtol(pos, NULL, 0); + val = strtol(pos, &pos2, 0); if (val < 0 || val > 0xff) return -1; tos = val; + pos = os_strstr(pos2, " len="); + if (pos) { + i = atoi(pos + 5); + if (i < sizeof(*ip) || i > HWSIM_IP_LEN) + return -1; + send_len = i; + } + eth = (struct ether_header *) &buf[2]; os_memcpy(eth->ether_dhost, dst, ETH_ALEN); os_memcpy(eth->ether_shost, src, ETH_ALEN); @@ -1936,17 +1959,17 @@ static int hostapd_ctrl_iface_data_test_tx(struct host ip->version = 4; ip->ttl = 64; ip->tos = tos; - ip->tot_len = htons(HWSIM_IP_LEN); + ip->tot_len = htons(send_len); ip->protocol = 1; ip->saddr = htonl(192U << 24 | 168 << 16 | 1 << 8 | 1); ip->daddr = htonl(192U << 24 | 168 << 16 | 1 << 8 | 2); ip->check = ipv4_hdr_checksum(ip, sizeof(*ip)); dpos = (u8 *) (ip + 1); - for (i = 0; i < HWSIM_IP_LEN - sizeof(*ip); i++) + for (i = 0; i < send_len - sizeof(*ip); i++) *dpos++ = i; if (l2_packet_send(hapd->l2_test, dst, ETHERTYPE_IP, &buf[2], - HWSIM_PACKETLEN) < 0) + sizeof(struct ether_header) + send_len) < 0) return -1; wpa_dbg(hapd->msg_ctx, MSG_DEBUG, "test data: TX dst=" MACSTR Modified: projects/clang900-import/contrib/wpa/hostapd/defconfig ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/defconfig Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/defconfig Tue Sep 3 05:58:43 2019 (r351732) @@ -108,11 +108,18 @@ CONFIG_EAP_TTLS=y #CONFIG_EAP_GPSK_SHA256=y # EAP-FAST for the integrated EAP server -# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed -# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., -# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. #CONFIG_EAP_FAST=y +# EAP-TEAP for the integrated EAP server +# Note: The current EAP-TEAP implementation is experimental and should not be +# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number +# of conflicting statements and missing details and the implementation has +# vendor specific workarounds for those and as such, may not interoperate with +# any other implementation. This should not be used for anything else than +# experimentation and interoperability testing until those issues has been +# resolved. +#CONFIG_EAP_TEAP=y + # Wi-Fi Protected Setup (WPS) #CONFIG_WPS=y # Enable UPnP support for external WPS Registrars @@ -375,6 +382,9 @@ CONFIG_IPV6=y # Opportunistic Wireless Encryption (OWE) # Experimental implementation of draft-harkins-owe-07.txt #CONFIG_OWE=y + +# Airtime policy support +#CONFIG_AIRTIME_POLICY=y # Override default value for the wpa_disable_eapol_key_retries configuration # parameter. See that parameter in hostapd.conf for more details. Modified: projects/clang900-import/contrib/wpa/hostapd/eap_register.c ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/eap_register.c Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/eap_register.c Tue Sep 3 05:58:43 2019 (r351732) @@ -121,6 +121,11 @@ int eap_server_register_methods(void) ret = eap_server_fast_register(); #endif /* EAP_SERVER_FAST */ +#ifdef EAP_SERVER_TEAP + if (ret == 0) + ret = eap_server_teap_register(); +#endif /* EAP_SERVER_TEAP */ + #ifdef EAP_SERVER_WSC if (ret == 0) ret = eap_server_wsc_register(); Modified: projects/clang900-import/contrib/wpa/hostapd/hostapd.conf ============================================================================== --- projects/clang900-import/contrib/wpa/hostapd/hostapd.conf Tue Sep 3 05:55:56 2019 (r351731) +++ projects/clang900-import/contrib/wpa/hostapd/hostapd.conf Tue Sep 3 05:58:43 2019 (r351732) @@ -782,10 +782,8 @@ wmm_ac_vo_acm=0 # 1 = supported #he_mu_beamformer=1 -# he_bss_color: BSS color -# 0 = no BSS color (default) -# unsigned integer = BSS color -#he_bss_color=0 +# he_bss_color: BSS color (1-63) +#he_bss_color=1 #he_default_pe_duration: The duration of PE field in an HE PPDU in us # Possible values are 0 us (default), 4 us, 8 us, 12 us, and 16 us @@ -801,6 +799,17 @@ wmm_ac_vo_acm=0 # unsigned integer = duration in units of 16 us #he_rts_threshold=0 +# HE operating channel information; see matching vht_* parameters for details. +#he_oper_chwidth +#he_oper_centr_freq_seg0_idx +#he_oper_centr_freq_seg1_idx + +#he_basic_mcs_nss_set: Basic NSS/MCS set +# 16-bit combination of 2-bit values of Max HE-MCS For 1..8 SS; each 2-bit +# value having following meaning: +# 0 = HE-MCS 0-7, 1 = HE-MCS 0-9, 2 = HE-MCS 0-11, 3 = not supported +#he_basic_mcs_nss_set + #he_mu_edca_qos_info_param_count #he_mu_edca_qos_info_q_ack #he_mu_edca_qos_info_queue_request=1 @@ -825,6 +834,12 @@ wmm_ac_vo_acm=0 #he_mu_edca_ac_vo_ecwmax=15 #he_mu_edca_ac_vo_timer=255 +# Spatial Reuse Parameter Set +#he_spr_sr_control +#he_spr_non_srg_obss_pd_max_offset +#he_spr_srg_obss_pd_min_offset +#he_spr_srg_obss_pd_max_offset + ##### IEEE 802.1X-2004 related configuration ################################## # Require IEEE 802.1X authorization @@ -836,6 +851,8 @@ wmm_ac_vo_acm=0 # the new version number correctly (they seem to drop the frames completely). # In order to make hostapd interoperate with these clients, the version number # can be set to the older version (1) with this configuration value. +# Note: When using MACsec, eapol_version shall be set to 3, which is +# defined in IEEE Std 802.1X-2010. #eapol_version=2 # Optional displayable message sent with EAP Request-Identity. The first \0 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909030558.x835wiQh062946>