CVS commit: src/external/bsd/wpa

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Nov 21 20:15:18 UTC 2016

Modified Files:
        src/external/bsd/wpa/bin: Makefile.inc
        src/external/bsd/wpa/bin/hostapd: Makefile
        src/external/bsd/wpa/bin/hostapd_cli: Makefile
        src/external/bsd/wpa/bin/wpa_cli: 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 wpa_auth.c
        src/external/bsd/wpa/dist/src/drivers: driver.h driver_bsd.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/utils: common.c common.h eloop.c os.h
            os_unix.c radiotap.h trace.h
        src/external/bsd/wpa/dist/src/wps: httpread.c
        src/external/bsd/wpa/dist/wpa_supplicant: Makefile README config.c
            ctrl_iface.c defconfig driver_i.h events.c main.c wnm_sta.c
            wpa_cli.c wpa_priv.c wpa_supplicant.c wpa_supplicant_i.h
Removed Files:
        src/external/bsd/wpa/dist/patches: openssl-0.9.8za-tls-extensions.patch
        src/external/bsd/wpa/dist/src/crypto: crypto_cryptoapi.c tls_schannel.c
        src/external/bsd/wpa/dist/wpa_supplicant/tests: link_test.c
            test_eap_sim_common.c test_wpa.c

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/hostapd_cli/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_cli/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/hostapd/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
    src/external/bsd/wpa/dist/patches/openssl-0.9.8za-tls-extensions.patch
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c
cvs rdiff -u -r1.2 -r1.3 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.8 -r1.9 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.1.1.2 -r0 \
    src/external/bsd/wpa/dist/src/crypto/crypto_cryptoapi.c
cvs rdiff -u -r1.1.1.4 -r0 \
    src/external/bsd/wpa/dist/src/crypto/tls_schannel.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/drivers/driver.h
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/eap_peer/eap_pwd.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/wpa/dist/src/eap_server/eap_server.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/wpa/dist/src/eap_server/eap_server_pwd.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/p2p/p2p.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/radius/radius_das.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/utils/common.c \
    src/external/bsd/wpa/dist/src/utils/common.h \
    src/external/bsd/wpa/dist/src/utils/os_unix.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/wpa/dist/src/utils/eloop.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/dist/src/utils/os.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/utils/radiotap.h \
    src/external/bsd/wpa/dist/src/utils/trace.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/wps/httpread.c
cvs rdiff -u -r1.2 -r1.3 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/wnm_sta.c \
    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.5 -r1.6 src/external/bsd/wpa/dist/wpa_supplicant/config.c \
    src/external/bsd/wpa/dist/wpa_supplicant/events.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c \
    src/external/bsd/wpa/dist/wpa_supplicant/main.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
    src/external/bsd/wpa/dist/wpa_supplicant/driver_i.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c
cvs rdiff -u -r1.6 -r1.7 \
    src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/bsd/wpa/dist/wpa_supplicant/tests/link_test.c
cvs rdiff -u -r1.1.1.2 -r0 \
    src/external/bsd/wpa/dist/wpa_supplicant/tests/test_eap_sim_common.c
cvs rdiff -u -r1.1.1.3 -r0 \
    src/external/bsd/wpa/dist/wpa_supplicant/tests/test_wpa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.