Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/wpa merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/b9c642e70c9d
branches: trunk
changeset: 807227:b9c642e70c9d
user: christos <christos%NetBSD.org@localhost>
date: Wed Apr 01 19:45:14 2015 +0000
description:
merge conflicts.
diffstat:
external/bsd/wpa/bin/hostapd/Makefile | 11 +-
external/bsd/wpa/bin/wpa_passphrase/Makefile | 4 +-
external/bsd/wpa/bin/wpa_supplicant/Makefile | 9 +-
external/bsd/wpa/dist/hostapd/hostapd_cli.c | 94 +-
external/bsd/wpa/dist/src/ap/ap_drv_ops.c | 111 +-
external/bsd/wpa/dist/src/ap/wpa_auth.c | 344 +-
external/bsd/wpa/dist/src/crypto/crypto_nss.c | 207 -
external/bsd/wpa/dist/src/crypto/tls_nss.c | 645 --
external/bsd/wpa/dist/src/drivers/driver_bsd.c | 53 +-
external/bsd/wpa/dist/src/drivers/driver_madwifi.c | 1309 ----
external/bsd/wpa/dist/src/drivers/driver_test.c | 2683 ----------
external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c | 41 +
external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c | 19 +
external/bsd/wpa/dist/src/radius/radius_das.c | 13 +
external/bsd/wpa/dist/src/utils/eloop.c | 4 +-
external/bsd/wpa/dist/src/utils/os.h | 6 +
external/bsd/wpa/dist/src/utils/os_unix.c | 101 +-
external/bsd/wpa/dist/src/utils/trace.h | 1 +
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c | 1929 ++++++-
external/bsd/wpa/dist/wpa_supplicant/events.c | 332 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c | 283 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c | 1036 +++-
22 files changed, 3643 insertions(+), 5592 deletions(-)
diffs (truncated from 12860 to 300 lines):
diff -r 864cb9aeb300 -r b9c642e70c9d external/bsd/wpa/bin/hostapd/Makefile
--- a/external/bsd/wpa/bin/hostapd/Makefile Wed Apr 01 19:24:35 2015 +0000
+++ b/external/bsd/wpa/bin/hostapd/Makefile Wed Apr 01 19:45:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/01/23 02:57:34 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/01 19:45:14 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -13,6 +13,7 @@
ap_mlme.c \
authsrv.c \
beacon.c \
+bss_load.c \
ctrl_iface_ap.c \
drv_callbacks.c \
eap_user_db.c \
@@ -33,6 +34,7 @@
# common
SRCS+= \
+hw_features_common.c \
ieee802_11_common.c \
wpa_common.c \
wpa_ctrl.c
@@ -85,10 +87,14 @@
# crypto
SRCS+= \
crypto_openssl.c \
-md5.c \
random.c \
sha1-prf.c
+# crypto for non-openssl
+NO_SRCS+= \
+aes-wrap.c \
+md5.c
+
.PATH.c: \
${HOSTAPD_DISTDIR} \
${WPA_DISTDIR}/src/eap_server \
@@ -144,7 +150,6 @@
aes-eax.c \
aes-encblock.c \
aes-omac1.c \
-aes-wrap.c \
dh_groups.c \
fips_prf_openssl.c \
ms_funcs.c \
diff -r 864cb9aeb300 -r b9c642e70c9d external/bsd/wpa/bin/wpa_passphrase/Makefile
--- a/external/bsd/wpa/bin/wpa_passphrase/Makefile Wed Apr 01 19:24:35 2015 +0000
+++ b/external/bsd/wpa/bin/wpa_passphrase/Makefile Wed Apr 01 19:45:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/03 02:07:31 christos Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/01 19:45:14 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -6,7 +6,7 @@
PROG= wpa_passphrase
SRCS= \
-md5.c \
+common.c \
os_unix.c \
wpa_debug.c \
wpa_passphrase.c \
diff -r 864cb9aeb300 -r b9c642e70c9d external/bsd/wpa/bin/wpa_supplicant/Makefile
--- a/external/bsd/wpa/bin/wpa_supplicant/Makefile Wed Apr 01 19:24:35 2015 +0000
+++ b/external/bsd/wpa/bin/wpa_supplicant/Makefile Wed Apr 01 19:45:14 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/10/16 19:29:29 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/01 19:45:14 christos Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -22,10 +22,10 @@
eapol_supp_sm.c \
eloop.c \
events.c \
+hw_features_common.c \
ieee802_11_common.c \
l2_packet_freebsd.c \
main.c \
-md5.c \
notify.c \
os_unix.c \
peerkey.c \
@@ -33,6 +33,7 @@
preauth.c \
random.c \
scan.c \
+wmm_ac.c \
wpa.c \
wpa_common.c \
wpa_debug.c \
@@ -106,7 +107,6 @@
aes-eax.c \
aes-encblock.c \
aes-omac1.c \
-aes-unwrap.c \
# NB: requires patch to openssl
#CPPFLAGS+= -DEAP_FAST
@@ -116,7 +116,8 @@
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
+SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
+SRCS+= aes-unwrap.c md5.c
.endif
.endif
diff -r 864cb9aeb300 -r b9c642e70c9d external/bsd/wpa/dist/hostapd/hostapd_cli.c
--- a/external/bsd/wpa/dist/hostapd/hostapd_cli.c Wed Apr 01 19:24:35 2015 +0000
+++ b/external/bsd/wpa/dist/hostapd/hostapd_cli.c Wed Apr 01 19:45:14 2015 +0000
@@ -1,6 +1,6 @@
/*
* hostapd - command line interface for hostapd daemon
- * Copyright (c) 2004-2014, Jouni Malinen <j%w1.fi@localhost>
+ * Copyright (c) 2004-2015, Jouni Malinen <j%w1.fi@localhost>
*
* This software may be distributed under the terms of the BSD license.
* See README for more details.
@@ -18,7 +18,7 @@
static const char *hostapd_cli_version =
"hostapd_cli v" VERSION_STR "\n"
-"Copyright (c) 2004-2014, Jouni Malinen <j%w1.fi@localhost> and contributors";
+"Copyright (c) 2004-2015, Jouni Malinen <j%w1.fi@localhost> and contributors";
static const char *hostapd_cli_license =
@@ -393,7 +393,7 @@
else
res = os_snprintf(cmd, sizeof(cmd), "WPS_CHECK_PIN %s",
argv[0]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long WPS_CHECK_PIN command.\n");
return -1;
}
@@ -456,7 +456,7 @@
res = os_snprintf(cmd, sizeof(cmd), "WPS_NFC_CONFIG_TOKEN %s",
argv[0]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long WPS_NFC_CONFIG_TOKEN command.\n");
return -1;
}
@@ -477,7 +477,7 @@
}
res = os_snprintf(cmd, sizeof(cmd), "WPS_NFC_TOKEN %s", argv[0]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long WPS_NFC_TOKEN command.\n");
return -1;
}
@@ -499,7 +499,7 @@
res = os_snprintf(cmd, sizeof(cmd), "NFC_GET_HANDOVER_SEL %s %s",
argv[0], argv[1]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long NFC_GET_HANDOVER_SEL command.\n");
return -1;
}
@@ -596,7 +596,7 @@
res = os_snprintf(buf, sizeof(buf), "DISASSOC_IMMINENT %s %s",
argv[0], argv[1]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
return -1;
return wpa_ctrl_command(ctrl, buf);
}
@@ -616,8 +616,35 @@
res = os_snprintf(buf, sizeof(buf), "ESS_DISASSOC %s %s %s",
argv[0], argv[1], argv[2]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
+ return -1;
+ return wpa_ctrl_command(ctrl, buf);
+}
+
+
+static int hostapd_cli_cmd_bss_tm_req(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+{
+ char buf[2000], *tmp;
+ int res, i, total;
+
+ if (argc < 1) {
+ printf("Invalid 'bss_tm_req' command - at least one argument (STA addr) is needed\n");
return -1;
+ }
+
+ res = os_snprintf(buf, sizeof(buf), "BSS_TM_REQ %s", argv[0]);
+ if (os_snprintf_error(sizeof(buf), res))
+ return -1;
+
+ total = res;
+ for (i = 1; i < argc; i++) {
+ tmp = &buf[total];
+ res = os_snprintf(tmp, sizeof(buf) - total, " %s", argv[i]);
+ if (os_snprintf_error(sizeof(buf) - total, res))
+ return -1;
+ total += res;
+ }
return wpa_ctrl_command(ctrl, buf);
}
@@ -709,7 +736,7 @@
}
res = os_snprintf(buf, sizeof(buf), "SET_QOS_MAP_SET %s", argv[0]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
return -1;
return wpa_ctrl_command(ctrl, buf);
}
@@ -728,7 +755,7 @@
}
res = os_snprintf(buf, sizeof(buf), "SEND_QOS_MAP_CONF %s", argv[0]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
return -1;
return wpa_ctrl_command(ctrl, buf);
}
@@ -748,7 +775,7 @@
res = os_snprintf(buf, sizeof(buf), "HS20_WNM_NOTIF %s %s",
argv[0], argv[1]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
return -1;
return wpa_ctrl_command(ctrl, buf);
}
@@ -773,7 +800,7 @@
res = os_snprintf(buf, sizeof(buf),
"HS20_DEAUTH_REQ %s %s %s",
argv[0], argv[1], argv[2]);
- if (res < 0 || res >= (int) sizeof(buf))
+ if (os_snprintf_error(sizeof(buf), res))
return -1;
return wpa_ctrl_command(ctrl, buf);
}
@@ -866,7 +893,7 @@
}
res = os_snprintf(cmd, sizeof(cmd), "SET %s %s", argv[0], argv[1]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long SET command.\n");
return -1;
}
@@ -886,7 +913,7 @@
}
res = os_snprintf(cmd, sizeof(cmd), "GET %s", argv[0]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long GET command.\n");
return -1;
}
@@ -914,7 +941,7 @@
res = os_snprintf(cmd, sizeof(cmd), "CHAN_SWITCH %s %s",
argv[0], argv[1]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - 1) {
+ if (os_snprintf_error(sizeof(cmd), res)) {
printf("Too long CHAN_SWITCH command.\n");
return -1;
}
@@ -923,7 +950,7 @@
for (i = 2; i < argc; i++) {
tmp = cmd + total;
res = os_snprintf(tmp, sizeof(cmd) - total, " %s", argv[i]);
- if (res < 0 || (size_t) res >= sizeof(cmd) - total - 1) {
+ if (os_snprintf_error(sizeof(cmd) - total, res)) {
printf("Too long CHAN_SWITCH command.\n");
return -1;
}
@@ -933,6 +960,27 @@
}
+static int hostapd_cli_cmd_enable(struct wpa_ctrl *ctrl, int argc,
+ char *argv[])
+{
+ return wpa_ctrl_command(ctrl, "ENABLE");
+}
+
+
+static int hostapd_cli_cmd_reload(struct wpa_ctrl *ctrl, int argc,
Home |
Main Index |
Thread Index |
Old Index