Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd Hook wpa stuff 0.7.2
details: https://anonhg.NetBSD.org/src/rev/5c1dcf5bdbbb
branches: trunk
changeset: 756830:5c1dcf5bdbbb
user: christos <christos%NetBSD.org@localhost>
date: Wed Aug 04 17:12:33 2010 +0000
description:
Hook wpa stuff 0.7.2
diffstat:
external/bsd/Makefile | 4 +-
external/bsd/wpa/Makefile | 5 +
external/bsd/wpa/NetBSD-upgrade | 27 +
external/bsd/wpa/bin/Makefile | 5 +
external/bsd/wpa/bin/Makefile.inc | 34 +
external/bsd/wpa/bin/hostapd/Makefile | 191 ++++
external/bsd/wpa/bin/hostapd/aes-xinternal.c | 10 +
external/bsd/wpa/bin/hostapd/hostapd.8 | 131 +++
external/bsd/wpa/bin/hostapd/hostapd.conf.5 | 213 +++++
external/bsd/wpa/bin/hostapd_cli/Makefile | 12 +
external/bsd/wpa/bin/hostapd_cli/hostapd_cli.8 | 114 ++
external/bsd/wpa/bin/wpa_cli/Makefile | 16 +
external/bsd/wpa/bin/wpa_cli/wpa_cli.8 | 227 +++++
external/bsd/wpa/bin/wpa_passphrase/Makefile | 29 +
external/bsd/wpa/bin/wpa_passphrase/wpa_passphrase.8 | 50 +
external/bsd/wpa/bin/wpa_supplicant/Makefile | 122 +++
external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c | 10 +
external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.8 | 164 ++++
external/bsd/wpa/bin/wpa_supplicant/wpa_supplicant.conf.5 | 538 ++++++++++++++
external/bsd/wpa/dist/hostapd/hostapd_cli.c | 2 +-
external/bsd/wpa/dist/src/drivers/driver_bsd.c | 50 +-
external/bsd/wpa/dist/src/utils/os.h | 2 +-
external/bsd/wpa/dist/src/utils/radiotap.h | 5 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c | 64 +-
24 files changed, 1988 insertions(+), 37 deletions(-)
diffs (truncated from 2277 to 300 lines):
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/Makefile
--- a/external/bsd/Makefile Wed Aug 04 16:16:55 2010 +0000
+++ b/external/bsd/Makefile Wed Aug 04 17:12:33 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/07/11 06:16:54 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2010/08/04 17:12:33 christos Exp $
.include <bsd.own.mk>
SUBDIR+= am-utils bind cron dhcpcd fetch file flex libarchive libevent liblzf \
- mdocml openresolv top byacc
+ mdocml openresolv top byacc wpa
.if (${MKATF} != "no")
SUBDIR+= atf
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/Makefile Wed Aug 04 17:12:33 2010 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:33 christos Exp $
+
+SUBDIR= bin
+
+.include <bsd.subdir.mk>
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/NetBSD-upgrade
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/NetBSD-upgrade Wed Aug 04 17:12:33 2010 +0000
@@ -0,0 +1,27 @@
+$NetBSD: NetBSD-upgrade,v 1.1 2010/08/04 17:12:33 christos Exp $
+
+WPA Supplicant/Hostapd
+ originals can be found at: http://hostap.epitest.fi/releases/
+
+
+For the import files and directories were pruned by:
+
+ tar -zxf wpa_supplicant-X.Y.Z.tar.gz
+ tar -zxf hostapd-X.Y.Z.tar.gz
+ mv hostapd-X.Y.Z/hostapd wpa_supplicant-X.Y.Z
+
+then imported by:
+
+ cd wpa_supplicant-X.Y.Z
+ cvs import -m 'Import wpa_supplicant and hostapd' \
+ src/external/bsd/wpa/dist MALINEN vX_Y_Z
+
+To make local changes to wpa, simply patch and commit
+to the main branch (aka HEAD). Never make local changes on the
+vendor (MALINEN) branch.
+
+All local changes should be submitted to Jouni Malinen for inclusion in
+the next vendor release.
+
+sam%FreeBSD.org@localhost & scw%NetBSD.org@localhost, christos%NetBSD.org@localhost
+4-August-2010
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/bin/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/bin/Makefile Wed Aug 04 17:12:33 2010 +0000
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:33 christos Exp $
+
+SUBDIR= hostapd hostapd_cli wpa_cli wpa_passphrase wpa_supplicant
+
+.include <bsd.subdir.mk>
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/bin/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/bin/Makefile.inc Wed Aug 04 17:12:33 2010 +0000
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile.inc,v 1.1 2010/08/04 17:12:33 christos Exp $
+
+BINDIR?= /usr/sbin
+
+USE_FORT?= yes # network client/server
+
+WPA_DISTDIR?= ${.CURDIR}/../../dist
+WPA_SUPPLICANT_DISTDIR?= ${WPA_DISTDIR}/wpa_supplicant
+HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
+
+.PATH.c: \
+ ${WPA_DISTDIR}/src/ap \
+ ${WPA_DISTDIR}/src/common \
+ ${WPA_DISTDIR}/src/crypto \
+ ${WPA_DISTDIR}/src/eap_common \
+ ${WPA_DISTDIR}/src/eapol_supp \
+ ${WPA_DISTDIR}/src/l2_packet \
+ ${WPA_DISTDIR}/src/utils
+
+CPPFLAGS+= \
+ -I${WPA_DISTDIR}/src \
+ -I${WPA_DISTDIR}/src/ap \
+ -I${WPA_DISTDIR}/src/common \
+ -I${WPA_DISTDIR}/src/crypto \
+ -I${WPA_DISTDIR}/src/l2_packet \
+ -I${WPA_DISTDIR}/src/utils
+
+CPPFLAGS+=-DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+.include <bsd.own.mk>
+
+.if ${MKCRYPTO} == "no"
+NO_OPENSSL= # defined
+.endif
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/bin/hostapd/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile Wed Aug 04 17:12:33 2010 +0000
@@ -0,0 +1,191 @@
+# $NetBSD: Makefile,v 1.1 2010/08/04 17:12:33 christos Exp $
+
+.include "${.CURDIR}/../Makefile.inc"
+
+
+PROG= hostapd
+
+# ap
+SRCS+= \
+accounting.c \
+ap_config.c \
+ap_drv_ops.c \
+ap_mlme.c \
+authsrv.c \
+ctrl_iface_ap.c \
+drv_callbacks.c \
+hostapd.c \
+ieee802_11_auth.c \
+ieee802_1x.c \
+peerkey_auth.c \
+pmksa_cache_auth.c \
+preauth_auth.c \
+sta_info.c \
+tkip_countermeasures.c \
+utils.c \
+vlan_init.c \
+wpa_auth.c \
+wpa_auth_glue.c \
+wpa_auth_ie.c
+
+# common
+SRCS+= \
+ieee802_11_common.c \
+wpa_common.c \
+wpa_ctrl.c
+
+# drivers
+SRCS+= \
+driver_bsd.c \
+drivers.c
+
+# radius
+SRCS+= \
+radius.c \
+radius_client.c \
+radius_server.c
+
+# utils
+SRCS+= \
+base64.c \
+common.c \
+eloop.c \
+ip_addr.c \
+os_unix.c \
+wpa_debug.c \
+wpabuf.c
+
+# main
+SRCS+= \
+main.c \
+config_file.c \
+ctrl_iface.c \
+dump_state.c \
+eap_register.c
+
+# l2_packet
+SRCS+= \
+l2_packet_freebsd.c
+
+# eapol_auth
+SRCS+= \
+eapol_auth_dump.c \
+eapol_auth_sm.c
+
+# eap_server
+SRCS+= \
+eap_common.c \
+eap_server.c \
+eap_server_methods.c
+
+# crypto
+SRCS+= \
+md5.c \
+sha1.c \
+sha1-pbkdf2.c
+
+.PATH.c: \
+ ${HOSTAPD_DISTDIR} \
+ ${WPA_DISTDIR}/src/eap_server \
+ ${WPA_DISTDIR}/src/eapol_auth \
+ ${WPA_DISTDIR}/src/drivers \
+ ${WPA_DISTDIR}/src/radius
+
+MAN= hostapd.8 hostapd.conf.5
+
+CPPFLAGS+= -I${.CURDIR} -I${HOSTAPD_DISTDIR}
+CPPFLAGS+= -DHOSTAPD
+CPPFLAGS+= -DHOSTAPD_DUMP_STATE
+CPPFLAGS+= -DALL_DH_GROUPS
+CPPFLAGS+= -DRADIUS_SERVER
+CPPFLAGS+= -DCONFIG_CTRL_IFACE
+CPPFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
+CPPFLAGS+= -DCONFIG_DRIVER_BSD
+CPPFLAGS+= -DCONFIG_IPV6
+CPPFLAGS+= -DCONFIG_PEERKEY
+CPPFLAGS+= -DCONFIG_RSN_PREAUTH
+
+DPADD+= ${LIBPCAP}
+LDADD+= -lpcap
+
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+CPPFLAGS+= -DEAP_SERVER
+CPPFLAGS+= -DEAP_SERVER_AKA
+CPPFLAGS+= -DEAP_SERVER_AKA_PRIME
+CPPFLAGS+= -DEAP_SERVER_GPSK
+CPPFLAGS+= -DEAP_SERVER_GPSK_SHA256
+CPPFLAGS+= -DEAP_SERVER_GTC
+CPPFLAGS+= -DEAP_SERVER_IDENTITY
+CPPFLAGS+= -DEAP_SERVER_IKEV2
+CPPFLAGS+= -DEAP_SERVER_MD5
+CPPFLAGS+= -DEAP_SERVER_MSCHAPV2
+CPPFLAGS+= -DEAP_SERVER_PAX
+CPPFLAGS+= -DEAP_SERVER_PEAP
+CPPFLAGS+= -DEAP_SERVER_PSK
+CPPFLAGS+= -DEAP_SERVER_SAKE
+CPPFLAGS+= -DEAP_SERVER_SIM
+CPPFLAGS+= -DEAP_SERVER_TLS
+CPPFLAGS+= -DEAP_SERVER_TNC
+CPPFLAGS+= -DEAP_SERVER_TTLS
+CPPFLAGS+= -DEAP_TLS_FUNCS
+CPPFLAGS+= -DPKCS12_FUNCS
+
+# crypto
+SRCS+= \
+aes-cbc.c \
+aes-ctr.c \
+aes-eax.c \
+aes-encblock.c \
+aes-omac1.c \
+aes-wrap.c \
+crypto_openssl.c \
+dh_groups.c \
+fips_prf_openssl.c \
+ms_funcs.c \
+sha1-tlsprf.c \
+sha256.c \
+tls_openssl.c
+
+# eap_common
+SRCS+= \
+chap.c \
+eap_gpsk_common.c \
+eap_ikev2_common.c \
+eap_pax_common.c \
+eap_peap_common.c \
+eap_psk_common.c \
+eap_sake_common.c \
+eap_sim_common.c \
+ikev2_common.c
+
+# eap_server
+SRCS+= \
+eap_server_aka.c \
+eap_server_gpsk.c \
+eap_server_gtc.c \
+eap_server_identity.c \
+eap_server_ikev2.c \
+eap_server_md5.c \
+eap_server_mschapv2.c \
+eap_server_pax.c \
+eap_server_peap.c \
+eap_server_psk.c \
+eap_server_sake.c \
+eap_server_sim.c \
+eap_server_tls.c \
+eap_server_tls_common.c \
+eap_server_tnc.c \
+eap_server_ttls.c \
+eap_sim_db.c \
+ikev2.c \
+tncs.c
+
+
+DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
+LDADD+= -lssl -lcrypto -ldes
+.else
+CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
+SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
+.endif
+
+.include <bsd.prog.mk>
diff -r 661ccae739e0 -r 5c1dcf5bdbbb external/bsd/wpa/bin/hostapd/aes-xinternal.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/wpa/bin/hostapd/aes-xinternal.c Wed Aug 04 17:12:33 2010 +0000
Home |
Main Index |
Thread Index |
Old Index