CVS commit: src/external/bsd/wpa

[Christos Zoulas]

Module Name: src
Committed By: christos
Date: Thu Oct 16 19:29:30 UTC 2014

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile
src/external/bsd/wpa/dist/hostapd: hostapd_cli.c
src/external/bsd/wpa/dist/src/ap: wpa_auth.c
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c driver_test.c
src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c
src/external/bsd/wpa/dist/src/radius: radius_das.c
src/external/bsd/wpa/dist/src/utils: eloop.c os.h radiotap.h
src/external/bsd/wpa/dist/wpa_supplicant: wpa_cli.c
Removed Files:
src/external/bsd/wpa/dist/hostapd: dump_state.c dump_state.h
src/external/bsd/wpa/dist/patches: openssl-0.9.8-tls-extensions.patch
openssl-0.9.8d-tls-extensions.patch
openssl-0.9.8e-tls-extensions.patch
openssl-0.9.8g-tls-extensions.patch
openssl-0.9.8h-tls-extensions.patch
openssl-0.9.8i-tls-extensions.patch
openssl-0.9.8x-tls-extensions.patch
openssl-0.9.9-session-ticket.patch
src/external/bsd/wpa/dist/src/crypto: fips_prf_cryptoapi.c
fips_prf_gnutls.c fips_prf_nss.c
src/external/bsd/wpa/dist/src/utils: eloop_none.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/wpa/dist/hostapd/dump_state.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/wpa/dist/hostapd/dump_state.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.8x-tls-extensions.patch \
src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch
cvs rdiff -u -r1.6 -r1.7 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/fips_prf_cryptoapi.c \
src/external/bsd/wpa/dist/src/crypto/fips_prf_gnutls.c \
src/external/bsd/wpa/dist/src/crypto/fips_prf_nss.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/drivers/driver_test.c
cvs rdiff -u -r1.4 -r1.5 \
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/radius/radius_das.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/utils/eloop.c \
src/external/bsd/wpa/dist/src/utils/os.h
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/wpa/dist/src/utils/eloop_none.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/utils/radiotap.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c

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