From 2b2563da953978f63e3e707f758fd600dcd19a32 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 20 Dec 2018 11:12:40 +0100 Subject: Update to FreeBSD head 2018-12-20 Git mirror commit 19a6ceb89dbacf74697d493e48c388767126d418. It includes an update of wpa_supplicant to version 2.7. It includes an update of the OpenSSL baseline to version 1.1.1a. Update #3472. --- libbsd.py | 152 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 80 insertions(+), 72 deletions(-) (limited to 'libbsd.py') diff --git a/libbsd.py b/libbsd.py index 021763cc..e1600111 100644 --- a/libbsd.py +++ b/libbsd.py @@ -2452,7 +2452,6 @@ class altq(builder.Module): self.addKernelSpaceSourceFiles( [ 'sys/net/altq/altq_cbq.c', - 'sys/net/altq/altq_cdnr.c', 'sys/net/altq/altq_codel.c', 'sys/net/altq/altq_fairq.c', 'sys/net/altq/altq_hfsc.c', @@ -3599,6 +3598,7 @@ class crypto_openssl(builder.Module): 'crypto/openssl/crypto/evp/p_sign.c', 'crypto/openssl/crypto/evp/p_verify.c', 'crypto/openssl/crypto/ex_data.c', + 'crypto/openssl/crypto/getenv.c', 'crypto/openssl/crypto/hmac/hmac.c', 'crypto/openssl/crypto/hmac/hm_ameth.c', 'crypto/openssl/crypto/hmac/hm_pmeth.c', @@ -4355,15 +4355,18 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/src/common/defs.h', 'contrib/wpa/src/common/eapol_common.h', 'contrib/wpa/src/common/gas.h', + 'contrib/wpa/src/common/gas_server.h', 'contrib/wpa/src/common/hw_features_common.h', 'contrib/wpa/src/common/ieee802_11_common.h', 'contrib/wpa/src/common/ieee802_11_defs.h', + 'contrib/wpa/src/common/ieee802_1x_defs.h', 'contrib/wpa/src/common/qca-vendor.h', 'contrib/wpa/src/common/sae.h', 'contrib/wpa/src/common/version.h', 'contrib/wpa/src/common/wpa_common.h', 'contrib/wpa/src/common/wpa_ctrl.h', 'contrib/wpa/src/crypto/aes.h', + 'contrib/wpa/src/crypto/aes_siv.h', 'contrib/wpa/src/crypto/aes_wrap.h', 'contrib/wpa/src/crypto/crypto.h', 'contrib/wpa/src/crypto/dh_group5.h', @@ -4374,10 +4377,12 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/src/crypto/sha256.h', 'contrib/wpa/src/crypto/sha256_i.h', 'contrib/wpa/src/crypto/sha384.h', + 'contrib/wpa/src/crypto/sha512.h', 'contrib/wpa/src/crypto/tls.h', 'contrib/wpa/src/drivers/driver.h', 'contrib/wpa/src/drivers/driver_ndis.h', 'contrib/wpa/src/drivers/driver_nl80211.h', + 'contrib/wpa/src/drivers/driver_wired_common.h', 'contrib/wpa/src/drivers/linux_defines.h', 'contrib/wpa/src/eap_common/chap.h', 'contrib/wpa/src/eap_common/eap_common.h', @@ -4404,7 +4409,6 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/src/l2_packet/l2_packet.h', 'contrib/wpa/src/p2p/p2p.h', 'contrib/wpa/src/radius/radius.h', - 'contrib/wpa/src/rsn_supp/peerkey.h', 'contrib/wpa/src/rsn_supp/pmksa_cache.h', 'contrib/wpa/src/rsn_supp/preauth.h', 'contrib/wpa/src/rsn_supp/wpa.h', @@ -4456,6 +4460,7 @@ class usr_sbin_wpa_supplicant(builder.Module): 'contrib/wpa/wpa_supplicant/dbus/dbus_common.h', 'contrib/wpa/wpa_supplicant/dbus/dbus_new.h', 'contrib/wpa/wpa_supplicant/dbus/dbus_old.h', + 'contrib/wpa/wpa_supplicant/dpp_supplicant.h', 'contrib/wpa/wpa_supplicant/driver_i.h', 'contrib/wpa/wpa_supplicant/gas_query.h', 'contrib/wpa/wpa_supplicant/hs20_supplicant.h', @@ -4482,104 +4487,107 @@ class usr_sbin_wpa_supplicant(builder.Module): ) self.addUserSpaceSourceFiles( [ - 'contrib/wpa/wpa_supplicant/blacklist.c', - 'contrib/wpa/wpa_supplicant/bss.c', - 'contrib/wpa/wpa_supplicant/config.c', - 'contrib/wpa/wpa_supplicant/config_file.c', - 'contrib/wpa/wpa_supplicant/ctrl_iface.c', - 'contrib/wpa/wpa_supplicant/ctrl_iface_unix.c', - 'contrib/wpa/wpa_supplicant/eap_register.c', - 'contrib/wpa/wpa_supplicant/events.c', - 'contrib/wpa/wpa_supplicant/gas_query.c', - 'contrib/wpa/wpa_supplicant/hs20_supplicant.c', - 'contrib/wpa/wpa_supplicant/interworking.c', - 'contrib/wpa/wpa_supplicant/main.c', - 'contrib/wpa/wpa_supplicant/notify.c', - 'contrib/wpa/wpa_supplicant/offchannel.c', - 'contrib/wpa/wpa_supplicant/scan.c', - 'contrib/wpa/wpa_supplicant/wmm_ac.c', - 'contrib/wpa/wpa_supplicant/wpa_supplicant.c', - 'contrib/wpa/wpa_supplicant/wpas_glue.c', - 'contrib/wpa/wpa_supplicant/wps_supplicant.c', 'contrib/wpa/src/ap/ap_drv_ops.c', 'contrib/wpa/src/ap/hs20.c', 'contrib/wpa/src/ap/ieee802_11_shared.c', 'contrib/wpa/src/ap/wpa_auth.c', 'contrib/wpa/src/ap/wpa_auth_ft.c', - 'contrib/wpa/src/utils/base64.c', - 'contrib/wpa/src/utils/common.c', - 'contrib/wpa/src/utils/eloop.c', - 'contrib/wpa/src/utils/os_unix.c', - 'contrib/wpa/src/utils/uuid.c', - 'contrib/wpa/src/utils/wpa_debug.c', - 'contrib/wpa/src/utils/wpabuf.c', 'contrib/wpa/src/common/ctrl_iface_common.c', 'contrib/wpa/src/common/gas.c', 'contrib/wpa/src/common/hw_features_common.c', 'contrib/wpa/src/common/ieee802_11_common.c', 'contrib/wpa/src/common/wpa_common.c', + 'contrib/wpa/src/crypto/aes-ctr.c', + 'contrib/wpa/src/crypto/aes-eax.c', + 'contrib/wpa/src/crypto/aes-encblock.c', + 'contrib/wpa/src/crypto/aes-omac1.c', + 'contrib/wpa/src/crypto/aes-unwrap.c', + 'contrib/wpa/src/crypto/crypto_openssl.c', + 'contrib/wpa/src/crypto/ms_funcs.c', + 'contrib/wpa/src/crypto/random.c', + 'contrib/wpa/src/crypto/rc4.c', + 'contrib/wpa/src/crypto/sha1.c', + 'contrib/wpa/src/crypto/sha1-pbkdf2.c', + 'contrib/wpa/src/crypto/sha1-prf.c', + 'contrib/wpa/src/crypto/sha256-internal.c', + 'contrib/wpa/src/crypto/sha256-prf.c', + 'contrib/wpa/src/crypto/tls_internal.c', 'contrib/wpa/src/drivers/driver_bsd.c', 'contrib/wpa/src/drivers/driver_common.c', 'contrib/wpa/src/drivers/driver_ndis.c', - 'contrib/wpa/src/drivers/driver_wired.c', 'contrib/wpa/src/drivers/drivers.c', + 'contrib/wpa/src/drivers/driver_wired.c', + 'contrib/wpa/src/drivers/driver_wired_common.c', + 'contrib/wpa/src/eap_common/chap.c', + 'contrib/wpa/src/eap_common/eap_common.c', + 'contrib/wpa/src/eap_common/eap_peap_common.c', + 'contrib/wpa/src/eap_common/eap_psk_common.c', + 'contrib/wpa/src/eapol_supp/eapol_supp_sm.c', + 'contrib/wpa/src/eap_peer/eap.c', + 'contrib/wpa/src/eap_peer/eap_gtc.c', + 'contrib/wpa/src/eap_peer/eap_leap.c', + 'contrib/wpa/src/eap_peer/eap_md5.c', + 'contrib/wpa/src/eap_peer/eap_methods.c', + 'contrib/wpa/src/eap_peer/eap_mschapv2.c', + 'contrib/wpa/src/eap_peer/eap_otp.c', + 'contrib/wpa/src/eap_peer/eap_peap.c', + 'contrib/wpa/src/eap_peer/eap_psk.c', + 'contrib/wpa/src/eap_peer/eap_tls.c', + 'contrib/wpa/src/eap_peer/eap_tls_common.c', + 'contrib/wpa/src/eap_peer/eap_ttls.c', + 'contrib/wpa/src/eap_peer/mschapv2.c', + 'contrib/wpa/src/l2_packet/l2_packet_freebsd.c', + 'contrib/wpa/src/rsn_supp/pmksa_cache.c', + 'contrib/wpa/src/rsn_supp/preauth.c', + 'contrib/wpa/src/rsn_supp/wpa.c', + 'contrib/wpa/src/rsn_supp/wpa_ft.c', + 'contrib/wpa/src/rsn_supp/wpa_ie.c', + 'contrib/wpa/src/utils/base64.c', + 'contrib/wpa/src/utils/bitfield.c', + 'contrib/wpa/src/utils/common.c', + 'contrib/wpa/src/utils/eloop.c', + 'contrib/wpa/src/utils/os_unix.c', + 'contrib/wpa/src/utils/uuid.c', + 'contrib/wpa/src/utils/wpabuf.c', + 'contrib/wpa/src/utils/wpa_debug.c', 'contrib/wpa/src/wps/http_client.c', - 'contrib/wpa/src/wps/http_server.c', 'contrib/wpa/src/wps/httpread.c', + 'contrib/wpa/src/wps/http_server.c', 'contrib/wpa/src/wps/upnp_xml.c', - 'contrib/wpa/src/wps/wps.c', 'contrib/wpa/src/wps/wps_attr_build.c', 'contrib/wpa/src/wps/wps_attr_parse.c', 'contrib/wpa/src/wps/wps_attr_process.c', + 'contrib/wpa/src/wps/wps.c', 'contrib/wpa/src/wps/wps_common.c', 'contrib/wpa/src/wps/wps_dev_attr.c', 'contrib/wpa/src/wps/wps_enrollee.c', 'contrib/wpa/src/wps/wps_registrar.c', - 'contrib/wpa/src/wps/wps_upnp.c', 'contrib/wpa/src/wps/wps_upnp_ap.c', + 'contrib/wpa/src/wps/wps_upnp.c', 'contrib/wpa/src/wps/wps_upnp_event.c', 'contrib/wpa/src/wps/wps_upnp_ssdp.c', 'contrib/wpa/src/wps/wps_upnp_web.c', - 'contrib/wpa/src/l2_packet/l2_packet_freebsd.c', - 'contrib/wpa/src/rsn_supp/peerkey.c', - 'contrib/wpa/src/rsn_supp/pmksa_cache.c', - 'contrib/wpa/src/rsn_supp/preauth.c', - 'contrib/wpa/src/rsn_supp/wpa.c', - 'contrib/wpa/src/rsn_supp/wpa_ft.c', - 'contrib/wpa/src/rsn_supp/wpa_ie.c', - 'contrib/wpa/src/eapol_supp/eapol_supp_sm.c', - 'contrib/wpa/src/eap_peer/eap.c', - 'contrib/wpa/src/eap_peer/eap_methods.c', - 'contrib/wpa/src/eap_peer/eap_mschapv2.c', - 'contrib/wpa/src/eap_peer/mschapv2.c', - 'contrib/wpa/src/eap_peer/eap_md5.c', - 'contrib/wpa/src/eap_peer/eap_tls.c', - 'contrib/wpa/src/eap_peer/eap_peap.c', - 'contrib/wpa/src/eap_peer/eap_ttls.c', - 'contrib/wpa/src/eap_peer/eap_gtc.c', - 'contrib/wpa/src/eap_peer/eap_otp.c', - 'contrib/wpa/src/eap_peer/eap_leap.c', - 'contrib/wpa/src/eap_peer/eap_psk.c', - 'contrib/wpa/src/eap_peer/eap_tls_common.c', - 'contrib/wpa/src/eap_common/eap_common.c', - 'contrib/wpa/src/eap_common/eap_peap_common.c', - 'contrib/wpa/src/eap_common/eap_psk_common.c', - 'contrib/wpa/src/eap_common/chap.c', - 'contrib/wpa/src/crypto/crypto_openssl.c', - 'contrib/wpa/src/crypto/random.c', - 'contrib/wpa/src/crypto/aes-omac1.c', - 'contrib/wpa/src/crypto/sha256-prf.c', - 'contrib/wpa/src/crypto/sha256-internal.c', - 'contrib/wpa/src/crypto/sha1.c', - 'contrib/wpa/src/crypto/sha1-prf.c', - 'contrib/wpa/src/crypto/aes-unwrap.c', - 'contrib/wpa/src/crypto/rc4.c', - 'contrib/wpa/src/crypto/sha1-pbkdf2.c', - 'contrib/wpa/src/crypto/tls_internal.c', - 'contrib/wpa/src/crypto/ms_funcs.c', - 'contrib/wpa/src/crypto/aes-eax.c', - 'contrib/wpa/src/crypto/aes-ctr.c', - 'contrib/wpa/src/crypto/aes-encblock.c', + 'contrib/wpa/wpa_supplicant/blacklist.c', + 'contrib/wpa/wpa_supplicant/bss.c', + 'contrib/wpa/wpa_supplicant/config.c', + 'contrib/wpa/wpa_supplicant/config_file.c', + 'contrib/wpa/wpa_supplicant/ctrl_iface.c', + 'contrib/wpa/wpa_supplicant/ctrl_iface_unix.c', + 'contrib/wpa/wpa_supplicant/eap_register.c', + 'contrib/wpa/wpa_supplicant/events.c', + 'contrib/wpa/wpa_supplicant/gas_query.c', + 'contrib/wpa/wpa_supplicant/hs20_supplicant.c', + 'contrib/wpa/wpa_supplicant/interworking.c', + 'contrib/wpa/wpa_supplicant/main.c', + 'contrib/wpa/wpa_supplicant/notify.c', + 'contrib/wpa/wpa_supplicant/offchannel.c', + 'contrib/wpa/wpa_supplicant/op_classes.c', + 'contrib/wpa/wpa_supplicant/rrm.c', + 'contrib/wpa/wpa_supplicant/scan.c', + 'contrib/wpa/wpa_supplicant/wmm_ac.c', + 'contrib/wpa/wpa_supplicant/wpas_glue.c', + 'contrib/wpa/wpa_supplicant/wpa_supplicant.c', + 'contrib/wpa/wpa_supplicant/wps_supplicant.c', 'usr.sbin/wpa/wpa_supplicant/Packet32.c', ], mm.generator['source'](['-D__FreeBSD__=1', -- cgit v1.2.3