From 64a932a45bb3f44e51d92d9a9ef66ff4e92ccd85 Mon Sep 17 00:00:00 2001 From: Alexandre Perrin Date: Tue, 27 May 2014 15:47:41 +0200 Subject: [PATCH 1/2] hostapd / wpa_supplicant: local modifications to contrib - Added README.DRAGONFLY and README.DELETED to both vendors, - changes to wps_upnp.c in order to compile. --- contrib/hostapd/README.DELETED | 47 ++++++++++++++++++++++++++++ contrib/hostapd/README.DRAGONFLY | 17 +++++++++++ contrib/hostapd/src/wps/wps_upnp.c | 6 ++-- contrib/wpa_supplicant/README.DELETED | 51 +++++++++++++++++++++++++++++++ contrib/wpa_supplicant/README.DRAGONFLY | 18 +++++++++++ contrib/wpa_supplicant/src/wps/wps_upnp.c | 6 ++-- 6 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 contrib/hostapd/README.DELETED create mode 100644 contrib/hostapd/README.DRAGONFLY create mode 100644 contrib/wpa_supplicant/README.DELETED create mode 100644 contrib/wpa_supplicant/README.DRAGONFLY diff --git a/contrib/hostapd/README.DELETED b/contrib/hostapd/README.DELETED new file mode 100644 index 0000000..c2a92d4 --- /dev/null +++ b/contrib/hostapd/README.DELETED @@ -0,0 +1,47 @@ +hostapd/Android.mk +hostapd/Makefile +hostapd/android.config +hostapd/defconfig +hostapd/eap_testing.txt +hostapd/hlr_auc_gw.c +hostapd/hlr_auc_gw.milenage_db +hostapd/hostapd.8 +hostapd/hostapd.accept +hostapd/hostapd.conf +hostapd/hostapd.deny +hostapd/hostapd.eap_user +hostapd/hostapd.eap_user_sqlite +hostapd/hostapd.radius_clients +hostapd/hostapd.sim_db +hostapd/hostapd.vlan +hostapd/hostapd.wpa_psk +hostapd/hostapd_cli.1 +hostapd/logwatch/ +hostapd/nt_password_hash.c +hostapd/wired.conf +hostapd/wps-ap-nfc.py +src/Makefile +src/ap/Makefile +src/common/Makefile +src/crypto/.gitignore +src/crypto/Makefile +src/drivers/.gitignore +src/drivers/Makefile +src/drivers/drivers.mak +src/drivers/drivers.mk +src/eap_common/Makefile +src/eap_peer/Makefile +src/eap_server/Makefile +src/eapol_auth/Makefile +src/eapol_supp/Makefile +src/l2_packet/Makefile +src/lib.rules +src/p2p/Makefile +src/radius/.gitignore +src/radius/Makefile +src/rsn_supp/Makefile +src/tls/.gitignore +src/tls/Makefile +src/utils/.gitignore +src/utils/Makefile +src/wps/Makefile diff --git a/contrib/hostapd/README.DRAGONFLY b/contrib/hostapd/README.DRAGONFLY new file mode 100644 index 0000000..0d5224d --- /dev/null +++ b/contrib/hostapd/README.DRAGONFLY @@ -0,0 +1,17 @@ +HOSTAPD 2.1 +=========== + +This directory contains a selected set of files from hostapd-2.1. +Original source can be downloaded from: + + http://hostap.epitest.fi/hostapd/ + +file = hostapd-2.1.tar.gz +date = 23 May 2014 +size = 1490215 +sha1 = 5c1a1ead3ccf89bceb035bd6b5a6e516d44f4b2b + + +The following files have been added or patched: +=============================================== + modified: src/wps/wps_upnp.c diff --git a/contrib/hostapd/src/wps/wps_upnp.c b/contrib/hostapd/src/wps/wps_upnp.c index 6fb3d4c..6d4dc74 100644 --- a/contrib/hostapd/src/wps/wps_upnp.c +++ b/contrib/hostapd/src/wps/wps_upnp.c @@ -824,7 +824,7 @@ fail: } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #include #include @@ -865,7 +865,7 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) } return 0; } -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __DragonFly__ */ /** @@ -911,7 +911,7 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, goto fail; } os_memcpy(mac, req.ifr_addr.sa_data, 6); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (eth_get(net_if, mac) < 0) { wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address"); goto fail; diff --git a/contrib/wpa_supplicant/README.DELETED b/contrib/wpa_supplicant/README.DELETED new file mode 100644 index 0000000..7e01475 --- /dev/null +++ b/contrib/wpa_supplicant/README.DELETED @@ -0,0 +1,51 @@ +src/Makefile +src/ap/Makefile +src/common/Makefile +src/crypto/.gitignore +src/crypto/Makefile +src/drivers/.gitignore +src/drivers/Makefile +src/drivers/drivers.mak +src/drivers/drivers.mk +src/eap_common/Makefile +src/eap_peer/Makefile +src/eap_server/Makefile +src/eapol_auth/Makefile +src/eapol_supp/Makefile +src/l2_packet/Makefile +src/lib.rules +src/p2p/Makefile +src/radius/.gitignore +src/radius/Makefile +src/rsn_supp/Makefile +src/tls/.gitignore +src/tls/Makefile +src/utils/.gitignore +src/utils/Makefile +src/wps/Makefile +wpa_supplicant/.gitignore +wpa_supplicant/Android.mk +wpa_supplicant/Makefile +wpa_supplicant/README-Windows.txt +wpa_supplicant/android.config +wpa_supplicant/dbus/.gitignore +wpa_supplicant/dbus/Makefile +wpa_supplicant/dbus/dbus-wpa_supplicant.conf +wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in +wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in +wpa_supplicant/defconfig +wpa_supplicant/doc/ +wpa_supplicant/eap_proxy_dummy.mk +wpa_supplicant/examples/ +wpa_supplicant/nmake.mak +wpa_supplicant/systemd/ +wpa_supplicant/tests/ +wpa_supplicant/todo.txt +wpa_supplicant/utils/log2pcap.py +wpa_supplicant/vs2005/ +wpa_supplicant/win_example.reg +wpa_supplicant/wpa_gui-qt4/ +wpa_supplicant/wpa_supplicant.conf +wpa_supplicant/wpa_supplicant_conf.mk +wpa_supplicant/wpa_supplicant_conf.sh +wpa_supplicant/wpa_supplicant_template.conf diff --git a/contrib/wpa_supplicant/README.DRAGONFLY b/contrib/wpa_supplicant/README.DRAGONFLY new file mode 100644 index 0000000..cd9e8e9 --- /dev/null +++ b/contrib/wpa_supplicant/README.DRAGONFLY @@ -0,0 +1,18 @@ +WPA SUPPLICANT 2.1 +================== + +This directory contains a selected set of files from wpa_supplicant-2.1. +Original source can be downloaded from: + + http://hostap.epitest.fi/wpa_supplicant/ + +file = wpa_supplicant-2.1.tar.gz +date = 23 May 2014 +size = 2222066 +sha1 = 25b9cb997cd9d2e84cf1ab73fac71b717cbb5f65 + +A list of files and directories removed is in README.DELETED + +The following files have been added or patched: +=============================================== + modified: src/wps/wps_upnp.c diff --git a/contrib/wpa_supplicant/src/wps/wps_upnp.c b/contrib/wpa_supplicant/src/wps/wps_upnp.c index 6fb3d4c..6d4dc74 100644 --- a/contrib/wpa_supplicant/src/wps/wps_upnp.c +++ b/contrib/wpa_supplicant/src/wps/wps_upnp.c @@ -824,7 +824,7 @@ fail: } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #include #include @@ -865,7 +865,7 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) } return 0; } -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __DragonFly__ */ /** @@ -911,7 +911,7 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, goto fail; } os_memcpy(mac, req.ifr_addr.sa_data, 6); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (eth_get(net_if, mac) < 0) { wpa_printf(MSG_ERROR, "WPS UPnP: Failed to get MAC address"); goto fail; -- 1.9.2