Module Name: src
Committed By: christos
Date: Fri Jan 4 21:22:21 UTC 2019
Modified Files:
src/external/bsd/wpa/bin: Makefile.inc
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile
src/external/bsd/wpa/dist/hostapd: hostapd_cli.c main.c
src/external/bsd/wpa/dist/src/ap: ap_drv_ops.c drv_callbacks.c
hostapd.c hostapd.h ieee802_11.c wmm.c wpa_auth.c wpa_auth.h
wpa_auth_ft.c wpa_auth_i.h
src/external/bsd/wpa/dist/src/common: wpa_common.h
src/external/bsd/wpa/dist/src/drivers: driver.h driver_wired.c
src/external/bsd/wpa/dist/src/eap_peer: eap_pwd.c
src/external/bsd/wpa/dist/src/eap_server: eap_server.c eap_server_pwd.c
eap_server_tls_common.c
src/external/bsd/wpa/dist/src/p2p: p2p.c
src/external/bsd/wpa/dist/src/radius: radius_das.c
src/external/bsd/wpa/dist/src/rsn_supp: tdls.c wpa.c wpa_ft.c wpa_i.h
src/external/bsd/wpa/dist/src/utils: common.c common.h eloop.h os.h
os_unix.c
src/external/bsd/wpa/dist/wpa_supplicant: Makefile README config.c
ctrl_iface.c defconfig driver_i.h events.c wnm_sta.c wpa_cli.c
wpa_priv.c wpa_supplicant.c wpa_supplicant_i.h
Removed Files:
src/external/bsd/wpa/dist/src/ap: peerkey_auth.c
src/external/bsd/wpa/dist/src/rsn_supp: peerkey.c peerkey.h
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/bin/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/hostapd/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/ap/drv_callbacks.c \
src/external/bsd/wpa/dist/src/ap/hostapd.c \
src/external/bsd/wpa/dist/src/ap/hostapd.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/ap/ieee802_11.c \
src/external/bsd/wpa/dist/src/ap/wmm.c \
src/external/bsd/wpa/dist/src/ap/wpa_auth.h \
src/external/bsd/wpa/dist/src/ap/wpa_auth_ft.c \
src/external/bsd/wpa/dist/src/ap/wpa_auth_i.h
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/wpa/dist/src/ap/peerkey_auth.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/common/wpa_common.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/drivers/driver.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/drivers/driver_wired.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/eap_peer/eap_pwd.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/wpa/dist/src/eap_server/eap_server.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_pwd.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/p2p/p2p.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/radius/radius_das.c
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/wpa/dist/src/rsn_supp/peerkey.c
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/wpa/dist/src/rsn_supp/peerkey.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/rsn_supp/tdls.c \
src/external/bsd/wpa/dist/src/rsn_supp/wpa_ft.c \
src/external/bsd/wpa/dist/src/rsn_supp/wpa_i.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/rsn_supp/wpa.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/utils/common.c \
src/external/bsd/wpa/dist/src/utils/os_unix.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/utils/common.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/utils/eloop.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/dist/src/utils/os.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/wpa_supplicant/Makefile \
src/external/bsd/wpa/dist/wpa_supplicant/README \
src/external/bsd/wpa/dist/wpa_supplicant/defconfig \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_priv.c \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_i.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/dist/wpa_supplicant/config.c \
src/external/bsd/wpa/dist/wpa_supplicant/events.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c \
src/external/bsd/wpa/dist/wpa_supplicant/wnm_sta.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/wpa_supplicant/driver_i.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
