mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-29 10:11:12 +02:00
hostapd: update wpe patch, 80211ac goodness, etc
This commit is contained in:
Anton Bolshakov
parent
ef39e2a6b3
commit
f3329109be
4 changed files with 44 additions and 73 deletions
|
|
@ -14,12 +14,10 @@ AUX hostapd-2.0-karma_cli.patch 38194 SHA256 1d5e2da76e6c1c5169ea4b0893f9247f096
|
|||
AUX hostapd-2.0-tls_length_fix.patch 1859 SHA256 bbca0422a0babbf9d7fad2b758ecddaae45624db1b2db6d7663292548e25906a SHA512 e354e9352605003101cba296735232d11ac685f1db8718e5d59b55de1b86b55144e4871afe85cae4374f52af1b42df3ebd4747e109c86e0750ef9eb5345453d7 WHIRLPOOL 6a9379b09ffb73d13ea813952e2b39b5ab90ec98a27ed211ff2904d52e346c9e6273fe99e8ae6509773597afa352d9e77f3081103c5e5c55c86e12f8176a5419
|
||||
AUX hostapd-2.0-wpe_karma.patch 6293 SHA256 44075cb7cfff24c4f7a13f2c7aaef5b32db9da2ec3b1e3ffd5f6c5ab9f062066 SHA512 d89baa9aafc20db0840007f1e88823b7e19f5f9869abd60a452d0c6f8a560e41fb2d74b044d1acbf592379b903b9d174dbe4abc358114d741f805279ea3906d7 WHIRLPOOL f51daea3dbaa3e4e7d2549576130ef1704ddac775cffe3e8715f84bbeae8568cdfadb90f85188943bf3d9cef0c29ecc111041cf0eb5ccc7485c7083afc0c5bac
|
||||
AUX hostapd-2.0-wpe_karma_cli.patch 6196 SHA256 421ca210e1e071153e22dd83162cfa05dfbece47d2b4479eadbb3821098d7dd4 SHA512 16d24477883ccefec82d68e4ade58761ad1eaf7731958df839e6de454f65c20b5e41bc5748a0b415fceda8db24fa4533e508e9ed8e912dd3542d774d72382b1b WHIRLPOOL 3d135d0659e9e435d9699f3d76da35d0238a1f29a6f8b3298966a7a60646d1272b85e1b79882eae842e27f55cfb50a63fad2cc8909036a6f32d571fd233d761e
|
||||
AUX hostapd-2.2-wpe.patch 32225 SHA256 9ad6e909c0bce1a8cbea8aab746bb79dbe1a3e03028d02f5525ee1494a550a84 SHA512 b6b731c7d8c280f5fb850b4f9613ed00bc8cfb4221a73a2f43b5d028a600eb976f2a6874026c425233f30d7a5574f617c1d8ab5ba94b205044612dd5b0a0b9f4 WHIRLPOOL 3d7185ae8f990adfa0e4a248097b822830812199b69b331196f104f053ddf472d1a1ccec9992492e581c1a37028f52e49a8921b9a2fe2fd70312397ae5ad32a0
|
||||
AUX hostapd-2.2.conf 73432 SHA256 f669f2f2a688def3b9e8ca53dcad96a27fb283f11bd240484a48583a9b5b4b4a SHA512 78a8f59399baeaa5f0f2780cd27eedee266fe406a3cd5c7840fcaf82399cb8d508508a1ca620b400e4f9890e02b9347ab39e32da9c98dec0f2faec5ee8c7354c WHIRLPOOL 271bb95be768027ac90ab0f12c7cb62ca11f45de5f939cb4313a31b3ba2b3704776c1f5693322e2390ca2ab62600b922e17788e173a9d5738cc450cf7f4f67ea
|
||||
AUX hostapd-2.2_wpe.eap_user 4072 SHA256 b78ea8d15f148775183c1b5a1985609b119d4ea5ef2e51df3e487c3f5dfffc93 SHA512 bb9f4526e0bd1be51b042936c3162f423e91123573c41e4ec8ea80b6a67ff179d3e6482a134e791e5f57e754484e391bd38c10ec648375341b31ffc5919e7c37 WHIRLPOOL 64afc23f65f823ecb72386444175c89ad38eabe4596e0120c8c866e68b3b0af7282b3d9a872dd46335cffa4a90eb82dccc07ae3c176edc9432ce14ee6303f686
|
||||
AUX hostapd-2.2-wpe.patch 31849 SHA256 1c2f70491c7f7b3aa1dba5223293c8c4a7ce292e1f34d3d42358b44dbb62fc9a SHA512 4c6230c72b75b0cb74cb241fa6d7584e792424b9fc5ada9e6ff90828b9fcd436160ef26e2a033ce04c3a0382b8046e300c7fc473c5ebc178e5e51d2ade1967b4 WHIRLPOOL 717350344c562e5e5f52c81bd070dbe6ad55216d2f80a5f33dbe9538ceaa714d8b08b2e849445acd4a4b9fad54df950360f07009bee00a235b76f0bdb6fcb08f
|
||||
AUX hostapd-conf.d 245 SHA256 916f4b14095ee4ec8a510391c883e9f01868e18d79a3d5cbeb13a104a793d45d SHA512 f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30 WHIRLPOOL 0ab1dbd8e04df9e7b8ae875dfdfdcdd770e4fcb62197bb81e47588a9ecf0b8bb715adbde34f2be82d630fdd536e9f888f463dd12cab0c06220c345b0093a3dd5
|
||||
AUX hostapd-ext.conf 3482 SHA256 d1d14dd3084bdb5a0fc031672e787d1e3466160f71bfd7425606a12952197978 SHA512 229db5ebe73f19501bf54001ccc13fa655de25ce14389f609cedb3e5d11c1c276b773044dd28a530136b26d1dda66ae7a03f4c21d5fa581131d0efc4c8b6ea03 WHIRLPOOL bd2617c1fc1094584bf26b792f12717ef7ac9cab7d66efbd0248d9adda36aa428965f7458c830ec0b799fa075b13131afad939212f2f7ac7bdaf2d087ffa4396
|
||||
AUX hostapd-init.d 1022 SHA256 a220058841e66a11603df8e968ccc68945f01e1d11c1ae498922d0e01f6fa804 SHA512 0d9d3c69c7b4c50ab08a7633b3b0b2f770647045ba967de628c34bf37644dcae6ef8288cab0fd0508b8ee8eafa8f48bda0d378c5aadbbbc5cde9f5441f7c97a1 WHIRLPOOL e86f507cff5712ff2590f39c58989a379b81feb40cedcd424188e055ac38f772a7bb9c1089efabd6ff104078257aa2a20a82790e17b085c03264d35b6f4e274d
|
||||
AUX hostapd-init.d 858 SHA256 b9701b9ea509638ee1ed74bec38a22e6bd7358763497ce53c146d2faf9e97a61 SHA512 f34c28422aad0ccc7f144ce391f908d38cac2a04785358337f962da401449ca83e310714f9d852cec9c119d7d2457b9264309b87a553f194b3cde66686000c2d WHIRLPOOL 456dd8982344e31a9c198fbc66d27e2f5080abcf974bced857ecfc5825ac8212829383525cbe81edfda01323133414a62eada9af84f3c80424077dcb7d822217
|
||||
AUX hostapd-int.conf 9623 SHA256 54f5ccb3a80114bc42af49b6f450a870b363f482dca4db6213037966bac230a2 SHA512 6da1ef9690305c699304b1458fea944dd392126025d08dda1dec407a5b107c98f42396d37afb0bf6651a8a625905585b0737403dea5aeb01311b72f6cc704309 WHIRLPOOL df88ad2e14a16f61426b17c804f67a970cd9285ea4e05ced89071da12a51ec789239dda03373fdce468c32325d1e799d91cedee90781990df98b85c5e6b20b02
|
||||
AUX hostapd.service 213 SHA256 16f0612c192fb5d7e7de716f25fdfc2ccecc35a00ff745ae67e02d7292558d8f SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29 WHIRLPOOL 3e415fa8068aa429cb37c7957d396d5e261b5843ae06eb81370728be36573e59e90707c7047b336eb82562e98017608e712ceb28afe2bae385b2821e1cdbd856
|
||||
DIST hostapd-1.0.tar.gz 1327943 SHA256 002e9dcb7e46cf82b5900a2fcf92b30fc8cdfd32a72d7fd4488588f1c013dfcc SHA512 2f189ef3d52099ee249a96820b257f331e0cb601e89dc01c583ec697d5e9a68f6b80c2913bbb4b37f18dc4a218f34ed9deb0357d55509de9d0f58dd60df33a8b WHIRLPOOL 79f0fd8b7f256d69771f8b022e74ee9908a6a613c875392cf151bdada86c077bbf8e88213547efa64c240daf9fb5e5f9bffe2fa5f7f98d5ca27d5d7058f5995a
|
||||
|
|
@ -30,6 +28,6 @@ EBUILD hostapd-1.0-r6.ebuild 5667 SHA256 2498a2a7dca7a45c8c098d97fbc2f6debd6d4ae
|
|||
EBUILD hostapd-1.0-r7.ebuild 5929 SHA256 990a6e67a42a5fc12990593523f041efb6792b290d0ef2195d26569ad03aa955 SHA512 62dabf590f28b365324e5ffb35e720f5fafa6180078d90e0d9bd32c4d6c5d5bdf40facdcc797cf1b7eac19f3f55cb64035cd321e58685eb77d23329fb8a84ceb WHIRLPOOL 887aed4edca8767110c68b11144df16522efdc220be9af346c8283b3ae1df459f27b6710490fd04e61d6c9a26283e34ba562c4ed8feadf424d074b2c368d3c78
|
||||
EBUILD hostapd-2.0-r1.ebuild 5936 SHA256 1e1d4c37ddb1e363c34f63ef49f5a4c3d5dc45a5136fe1ca8a203bde7d09eb5f SHA512 3ff4e2356ab21cf5f71b5afd08febc19a0716689a1415352791bbae76e6a93ae2083a9b4efa6e4b516bc66527892a942511d299e276f4fc1ceb2555ccb4b9ab5 WHIRLPOOL 586771eaa93f5319941c305d9db0924b3f88955236911d25d4ce3c539cdf757cda9127ea45636745288d0c652286543d29a81a430d9f9dd25deb009f7b95ee14
|
||||
EBUILD hostapd-2.0.ebuild 5811 SHA256 171850dafc9146389792deba39fd8663c7d915b9a56b380f755335f2f8796e4e SHA512 18c740d43a41aca693e3bdf015b91e54560ee6d1628cf2ece52b74dbdca99fa0b34da7fa4dc9bc9479b556e0fe1aca989d49d13f3afc91d4409218325d4a7864 WHIRLPOOL a08c79fd6b64ac652b70a0670f675892290ea657cb6e476206920e9f10c9196f9b01397dc82896b49bb5c601227f7bf916a8370e152a25b57970a8aa539ec981
|
||||
EBUILD hostapd-2.2.ebuild 5559 SHA256 97f2da4584cc7d226b4ea69339dfa12eb5b04f499392209df4e4f0e17188807c SHA512 36b1fcdceef1c51cbca32ada5fd3c3ed1e071baec965889304c89ca127a5ded376fa748d3a59c11b74a24bdac12297a7bcc03bbd055d707e31908b4f29a33fce WHIRLPOOL 222c35756dd45f784c3fbad534dfec7fa549f7e43ab7866cfc8696a40e264a5a05bf7f56c34aa2b09e9ce8ade478031f9534d30122bb28651dbec394062be4ed
|
||||
EBUILD hostapd-2.2-r1.ebuild 5578 SHA256 2e89bcd6f5b897ac2dabcff3ddf5fc5bc598e388767938f1a02bac0a61be4079 SHA512 9fbaae03731762ef8311bf3f46b0fb78c4ab3f8cf31188c04c2fff2edcec4b50ce6fd55285bc131ffd1d54e331caa871171010c071efba574eafa7d0154edfca WHIRLPOOL f9466e009dfb0945947204ece893f761c8397bbbfe5b522ba3369f98f964093d929e77e4ee3152c34c40cc9b782102e85c7b56aeeb649bd475d16f24ff786a4e
|
||||
MISC ChangeLog 20312 SHA256 4a1673cde56f1b7ea1dfd20f0ac702ad3e7e916b84cfdf4f5aa0448d01b13659 SHA512 1c03ba7921beb21500e160aa5abfb867967777f0c4a36e220524bde419a30663a03d38b757c97405a88e1a5a2baf91e27b8022514ae99bdd1b4768ad520ec15e WHIRLPOOL 3c0df927502c29770fcac11fad0a5c655ff05674fc7444fef1e4a68cdbb55b1690efd3b89d3240a978f045d33029be036961a44095173660cfe4d20c3a05918b
|
||||
MISC metadata.xml 752 SHA256 78c8bab11c00f4988d677b1f4bf5a66c3221c0f9a3c46cfaf333a8857f250662 SHA512 c9e8749a721896e4b91ee76b9008e8a3e0d58496d804a6ce103fa501ccd0322b18b28f69432babc506a4c97a22c993da11c34946d6b44517b3cbb45f80bf6bde WHIRLPOOL c8cc369fa5d5725617c4143053bef31f34fdc40b9a7c36a082765d5e9afcd12f5b45d567e7ea3e2431dfbbf3378daf05b73aead94978e650e012652e1928d7aa
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN hostapd-2.2/hostapd/config_file.c hostapd-2.2-wpe/hostapd/config_file.c
|
||||
--- hostapd-2.2/hostapd/config_file.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/config_file.c 2014-07-26 15:19:18.415749622 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/config_file.c 2014-08-14 08:45:54.629127667 -0400
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ap/wpa_auth.h"
|
||||
#include "ap/ap_config.h"
|
||||
|
|
@ -33,7 +33,7 @@ diff -rupN hostapd-2.2/hostapd/config_file.c hostapd-2.2-wpe/hostapd/config_file
|
|||
bss->eap_server = atoi(pos);
|
||||
diff -rupN hostapd-2.2/hostapd/main.c hostapd-2.2-wpe/hostapd/main.c
|
||||
--- hostapd-2.2/hostapd/main.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/main.c 2014-07-26 15:19:18.419749747 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/main.c 2014-08-14 08:45:54.637127773 -0400
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "config_file.h"
|
||||
#include "eap_register.h"
|
||||
|
|
@ -48,7 +48,7 @@ diff -rupN hostapd-2.2/hostapd/main.c hostapd-2.2-wpe/hostapd/main.c
|
|||
{
|
||||
fprintf(stderr,
|
||||
- "hostapd v" VERSION_STR "\n"
|
||||
+ "hostapd-wpe v" VERSION_STR "\n"
|
||||
+ "hostapd v" VERSION_STR "\n"
|
||||
"User space daemon for IEEE 802.11 AP management,\n"
|
||||
"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
|
||||
"Copyright (c) 2002-2014, Jouni Malinen <j@w1.fi> "
|
||||
|
|
@ -68,7 +68,7 @@ diff -rupN hostapd-2.2/hostapd/main.c hostapd-2.2-wpe/hostapd/main.c
|
|||
fprintf(stderr,
|
||||
"\n"
|
||||
- "usage: hostapd [-hdBKtv] [-P <PID file>] [-e <entropy file>] "
|
||||
+ "usage: hostapd-wpe [-hdBKtvskc] [-P <PID file>] [-e <entropy file>] "
|
||||
+ "usage: hostapd [-hdBKtvskc] [-P <PID file>] [-e <entropy file>] "
|
||||
"\\\n"
|
||||
" [-g <global ctrl_iface>] [-G <group>] \\\n"
|
||||
" <configuration file(s)>\n"
|
||||
|
|
@ -113,7 +113,7 @@ diff -rupN hostapd-2.2/hostapd/main.c hostapd-2.2-wpe/hostapd/main.c
|
|||
break;
|
||||
diff -rupN hostapd-2.2/hostapd/Makefile hostapd-2.2-wpe/hostapd/Makefile
|
||||
--- hostapd-2.2/hostapd/Makefile 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/Makefile 2014-07-26 15:19:18.423749972 -0400
|
||||
+++ hostapd-2.2-wpe/hostapd/Makefile 2014-08-14 08:45:54.641127921 -0400
|
||||
@@ -59,6 +59,7 @@ OBJS += ../src/ap/preauth_auth.o
|
||||
OBJS += ../src/ap/pmksa_cache_auth.o
|
||||
OBJS += ../src/ap/ieee802_11_shared.o
|
||||
|
|
@ -122,23 +122,14 @@ diff -rupN hostapd-2.2/hostapd/Makefile hostapd-2.2-wpe/hostapd/Makefile
|
|||
|
||||
OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
|
||||
|
||||
@@ -871,7 +872,7 @@ LIBS += -lsqlite3
|
||||
LIBS_h += -lsqlite3
|
||||
endif
|
||||
|
||||
-ALL=hostapd hostapd_cli
|
||||
+ALL=hostapd-wpe hostapd-wpe_cli
|
||||
|
||||
all: verify_config $(ALL)
|
||||
|
||||
@@ -913,15 +914,15 @@ install: all
|
||||
|
||||
BCHECK=../src/drivers/build.hostapd
|
||||
|
||||
-hostapd: $(BCHECK) $(OBJS)
|
||||
- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
|
||||
+hostapd-wpe: $(BCHECK) $(OBJS)
|
||||
+ $(Q)$(CC) $(LDFLAGS) -o hostapd-wpe $(OBJS) $(LIBS)
|
||||
+hostapd: $(BCHECK) $(OBJS)
|
||||
+ $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
|
||||
@$(E) " LD " $@
|
||||
|
||||
ifdef CONFIG_WPA_TRACE
|
||||
|
|
@ -146,23 +137,14 @@ diff -rupN hostapd-2.2/hostapd/Makefile hostapd-2.2-wpe/hostapd/Makefile
|
|||
endif
|
||||
-hostapd_cli: $(OBJS_c)
|
||||
- $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
|
||||
+hostapd-wpe_cli: $(OBJS_c)
|
||||
+ $(Q)$(CC) $(LDFLAGS) -o hostapd-wpe_cli $(OBJS_c) $(LIBS_c)
|
||||
+hostapd_cli: $(OBJS_c)
|
||||
+ $(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
|
||||
@$(E) " LD " $@
|
||||
|
||||
NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) ../src/crypto/md5.o
|
||||
@@ -965,7 +966,7 @@ lcov-html:
|
||||
|
||||
clean:
|
||||
$(MAKE) -C ../src clean
|
||||
- rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw
|
||||
+ rm -f core *~ *.o hostapd-wpe hostapd-wpe_cli nt_password_hash hlr_auc_gw
|
||||
rm -f *.d *.gcno *.gcda *.gcov
|
||||
rm -f lcov.info
|
||||
rm -rf lcov-html
|
||||
diff -rupN hostapd-2.2/src/ap/beacon.c hostapd-2.2-wpe/src/ap/beacon.c
|
||||
--- hostapd-2.2/src/ap/beacon.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/ap/beacon.c 2014-07-26 15:25:00.551738718 -0400
|
||||
+++ hostapd-2.2-wpe/src/ap/beacon.c 2014-08-14 08:45:54.641127921 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "beacon.h"
|
||||
#include "hs20.h"
|
||||
|
|
@ -188,7 +170,7 @@ diff -rupN hostapd-2.2/src/ap/beacon.c hostapd-2.2-wpe/src/ap/beacon.c
|
|||
if (res != NO_SSID_MATCH) {
|
||||
diff -rupN hostapd-2.2/src/ap/ieee802_11.c hostapd-2.2-wpe/src/ap/ieee802_11.c
|
||||
--- hostapd-2.2/src/ap/ieee802_11.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/ap/ieee802_11.c 2014-07-26 15:19:18.427750234 -0400
|
||||
+++ hostapd-2.2-wpe/src/ap/ieee802_11.c 2014-08-14 08:45:54.641127921 -0400
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "wnm_ap.h"
|
||||
#include "ieee802_11.h"
|
||||
|
|
@ -211,7 +193,7 @@ diff -rupN hostapd-2.2/src/ap/ieee802_11.c hostapd-2.2-wpe/src/ap/ieee802_11.c
|
|||
"Station tried to associate with unknown SSID "
|
||||
diff -rupN hostapd-2.2/src/crypto/ms_funcs.c hostapd-2.2-wpe/src/crypto/ms_funcs.c
|
||||
--- hostapd-2.2/src/crypto/ms_funcs.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/ms_funcs.c 2014-07-26 15:19:18.427750234 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/ms_funcs.c 2014-08-14 08:45:54.649128041 -0400
|
||||
@@ -78,7 +78,7 @@ static int utf8_to_ucs2(const u8 *utf8_s
|
||||
* @challenge: 8-octet Challenge (OUT)
|
||||
* Returns: 0 on success, -1 on failure
|
||||
|
|
@ -223,7 +205,7 @@ diff -rupN hostapd-2.2/src/crypto/ms_funcs.c hostapd-2.2-wpe/src/crypto/ms_funcs
|
|||
{
|
||||
diff -rupN hostapd-2.2/src/crypto/ms_funcs.h hostapd-2.2-wpe/src/crypto/ms_funcs.h
|
||||
--- hostapd-2.2/src/crypto/ms_funcs.h 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/ms_funcs.h 2014-07-26 15:19:18.431750483 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/ms_funcs.h 2014-08-14 08:45:54.649128041 -0400
|
||||
@@ -9,6 +9,10 @@
|
||||
#ifndef MS_FUNCS_H
|
||||
#define MS_FUNCS_H
|
||||
|
|
@ -237,7 +219,7 @@ diff -rupN hostapd-2.2/src/crypto/ms_funcs.h hostapd-2.2-wpe/src/crypto/ms_funcs
|
|||
const u8 *password, size_t password_len,
|
||||
diff -rupN hostapd-2.2/src/crypto/tls_openssl.c hostapd-2.2-wpe/src/crypto/tls_openssl.c
|
||||
--- hostapd-2.2/src/crypto/tls_openssl.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/tls_openssl.c 2014-07-26 15:28:37.435731190 -0400
|
||||
+++ hostapd-2.2-wpe/src/crypto/tls_openssl.c 2014-08-14 08:45:54.653128013 -0400
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/pkcs12.h>
|
||||
|
|
@ -402,7 +384,7 @@ diff -rupN hostapd-2.2/src/crypto/tls_openssl.c hostapd-2.2-wpe/src/crypto/tls_o
|
|||
+
|
||||
diff -rupN hostapd-2.2/src/eap_server/eap_server.c hostapd-2.2-wpe/src/eap_server/eap_server.c
|
||||
--- hostapd-2.2/src/eap_server/eap_server.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server.c 2014-07-26 15:19:18.435750609 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server.c 2014-08-14 08:45:54.653128013 -0400
|
||||
@@ -22,7 +22,8 @@
|
||||
#define STATE_MACHINE_DATA struct eap_sm
|
||||
#define STATE_MACHINE_DEBUG_PREFIX "EAP"
|
||||
|
|
@ -436,7 +418,7 @@ diff -rupN hostapd-2.2/src/eap_server/eap_server.c hostapd-2.2-wpe/src/eap_serve
|
|||
eap_user_free(user);
|
||||
diff -rupN hostapd-2.2/src/eap_server/eap_server_mschapv2.c hostapd-2.2-wpe/src/eap_server/eap_server_mschapv2.c
|
||||
--- hostapd-2.2/src/eap_server/eap_server_mschapv2.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_mschapv2.c 2014-07-26 15:19:18.435750609 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_mschapv2.c 2014-08-14 08:45:54.653128013 -0400
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "crypto/ms_funcs.h"
|
||||
#include "crypto/random.h"
|
||||
|
|
@ -487,7 +469,7 @@ diff -rupN hostapd-2.2/src/eap_server/eap_server_mschapv2.c hostapd-2.2-wpe/src/
|
|||
|
||||
diff -rupN hostapd-2.2/src/eap_server/eap_server_peap.c hostapd-2.2-wpe/src/eap_server/eap_server_peap.c
|
||||
--- hostapd-2.2/src/eap_server/eap_server_peap.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_peap.c 2014-07-26 15:19:18.443751022 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_peap.c 2014-08-14 08:45:54.653128013 -0400
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "eap_common/eap_tlv_common.h"
|
||||
#include "eap_common/eap_peap_common.h"
|
||||
|
|
@ -529,7 +511,7 @@ diff -rupN hostapd-2.2/src/eap_server/eap_server_peap.c hostapd-2.2-wpe/src/eap_
|
|||
|
||||
diff -rupN hostapd-2.2/src/eap_server/eap_server_ttls.c hostapd-2.2-wpe/src/eap_server/eap_server_ttls.c
|
||||
--- hostapd-2.2/src/eap_server/eap_server_ttls.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_ttls.c 2014-07-26 15:19:18.447751093 -0400
|
||||
+++ hostapd-2.2-wpe/src/eap_server/eap_server_ttls.c 2014-08-14 08:45:54.657127982 -0400
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "eap_server/eap_tls_common.h"
|
||||
#include "eap_common/chap.h"
|
||||
|
|
@ -602,7 +584,7 @@ diff -rupN hostapd-2.2/src/eap_server/eap_server_ttls.c hostapd-2.2-wpe/src/eap_
|
|||
"NT-Response");
|
||||
diff -rupN hostapd-2.2/src/Makefile hostapd-2.2-wpe/src/Makefile
|
||||
--- hostapd-2.2/src/Makefile 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/Makefile 2014-07-26 15:19:18.447751093 -0400
|
||||
+++ hostapd-2.2-wpe/src/Makefile 2014-08-14 08:45:54.657127982 -0400
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS=ap common crypto drivers eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet p2p pae radius rsn_supp tls utils wps
|
||||
+SUBDIRS=ap common crypto drivers eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet p2p pae radius rsn_supp tls utils wps wpe
|
||||
|
|
@ -611,7 +593,7 @@ diff -rupN hostapd-2.2/src/Makefile hostapd-2.2-wpe/src/Makefile
|
|||
for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d; done
|
||||
diff -rupN hostapd-2.2/src/utils/wpa_debug.c hostapd-2.2-wpe/src/utils/wpa_debug.c
|
||||
--- hostapd-2.2/src/utils/wpa_debug.c 2014-06-04 09:26:14.000000000 -0400
|
||||
+++ hostapd-2.2-wpe/src/utils/wpa_debug.c 2014-07-26 15:19:18.447751093 -0400
|
||||
+++ hostapd-2.2-wpe/src/utils/wpa_debug.c 2014-08-14 08:45:54.657127982 -0400
|
||||
@@ -30,7 +30,7 @@ static FILE *wpa_debug_tracing_file = NU
|
||||
|
||||
|
||||
|
|
@ -623,7 +605,7 @@ diff -rupN hostapd-2.2/src/utils/wpa_debug.c hostapd-2.2-wpe/src/utils/wpa_debug
|
|||
|
||||
diff -rupN hostapd-2.2/src/wpe/Makefile hostapd-2.2-wpe/src/wpe/Makefile
|
||||
--- hostapd-2.2/src/wpe/Makefile 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ hostapd-2.2-wpe/src/wpe/Makefile 2014-07-26 15:19:18.451751075 -0400
|
||||
+++ hostapd-2.2-wpe/src/wpe/Makefile 2014-08-14 08:45:54.657127982 -0400
|
||||
@@ -0,0 +1,8 @@
|
||||
+all:
|
||||
+ @echo Nothing to be made.
|
||||
|
|
@ -635,8 +617,8 @@ diff -rupN hostapd-2.2/src/wpe/Makefile hostapd-2.2-wpe/src/wpe/Makefile
|
|||
+ @echo Nothing to be made.
|
||||
diff -rupN hostapd-2.2/src/wpe/wpe.c hostapd-2.2-wpe/src/wpe/wpe.c
|
||||
--- hostapd-2.2/src/wpe/wpe.c 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ hostapd-2.2-wpe/src/wpe/wpe.c 2014-07-26 15:19:18.451751075 -0400
|
||||
@@ -0,0 +1,208 @@
|
||||
+++ hostapd-2.2-wpe/src/wpe/wpe.c 2014-08-14 08:47:02.353123957 -0400
|
||||
@@ -0,0 +1,209 @@
|
||||
+/*
|
||||
+ wpe.c -
|
||||
+ brad.antoniewicz@foundstone.com
|
||||
|
|
@ -695,11 +677,12 @@ diff -rupN hostapd-2.2/src/wpe/wpe.c hostapd-2.2-wpe/src/wpe/wpe.c
|
|||
+ va_list ap;
|
||||
+
|
||||
+ va_start(ap, fmt);
|
||||
+
|
||||
+ vprintf(fmt, ap);
|
||||
+ va_end(ap);
|
||||
+
|
||||
+ va_start(ap, fmt);
|
||||
+ if ( wpe_conf.wpe_logfile_fp != NULL )
|
||||
+ vfprintf(wpe_conf.wpe_logfile_fp, fmt, ap);
|
||||
+
|
||||
+ va_end(ap);
|
||||
+}
|
||||
+
|
||||
|
|
@ -725,7 +708,7 @@ diff -rupN hostapd-2.2/src/wpe/wpe.c hostapd-2.2-wpe/src/wpe/wpe.c
|
|||
+ wpe_log_file_and_stdout("%02x:",response[x]);
|
||||
+ wpe_log_file_and_stdout("%02x\n",response[x]);
|
||||
+
|
||||
+ if (strncmp(type, "mschapv2", 8) == 0 ){
|
||||
+ if (strncmp(type, "mschapv2", 8) == 0 || strncmp(type, "eap-ttls/mschapv2", 17) == 0) {
|
||||
+ wpe_log_file_and_stdout("\t jtr NETNTLM:\t");
|
||||
+ for (x=0; x<username_len; x++)
|
||||
+ wpe_log_file_and_stdout("%c",username[x]);
|
||||
|
|
@ -847,7 +830,7 @@ diff -rupN hostapd-2.2/src/wpe/wpe.c hostapd-2.2-wpe/src/wpe/wpe.c
|
|||
+
|
||||
diff -rupN hostapd-2.2/src/wpe/wpe.h hostapd-2.2-wpe/src/wpe/wpe.h
|
||||
--- hostapd-2.2/src/wpe/wpe.h 1969-12-31 19:00:00.000000000 -0500
|
||||
+++ hostapd-2.2-wpe/src/wpe/wpe.h 2014-07-26 15:19:18.451751075 -0400
|
||||
+++ hostapd-2.2-wpe/src/wpe/wpe.h 2014-08-14 08:45:54.657127982 -0400
|
||||
@@ -0,0 +1,50 @@
|
||||
+/*
|
||||
+ wpe.h -
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.3 2011/09/25 14:03:46 gurligebis Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-init.d,v 1.4 2014/03/21 19:47:14 gurligebis Exp $
|
||||
|
||||
pidfile="/run/${SVCNAME}.pid"
|
||||
command="/usr/sbin/hostapd"
|
||||
command_args="-P ${pidfile} -B ${OPTIONS} ${CONFIGS}"
|
||||
|
||||
extra_started_commands="reload"
|
||||
|
||||
|
|
@ -15,7 +19,7 @@ depend() {
|
|||
use logger
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
start_pre() {
|
||||
local file
|
||||
|
||||
for file in ${CONFIGS}; do
|
||||
|
|
@ -26,25 +30,10 @@ checkconfig() {
|
|||
done
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --start --exec /usr/sbin/hostapd \
|
||||
-- -B ${OPTIONS} ${CONFIGS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop --exec /usr/sbin/hostapd
|
||||
eend $?
|
||||
}
|
||||
|
||||
reload() {
|
||||
checkconfig || return 1
|
||||
start_pre || return 1
|
||||
|
||||
ebegin "Reloading ${SVCNAME} configuration"
|
||||
kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
|
||||
kill -HUP $(cat ${pidfile}) > /dev/null 2>&1
|
||||
eend $?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2.ebuild,v 1.1 2014/06/06 16:23:18 gurligebis Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r1.ebuild,v 1.1 2014/08/29 19:28:44 gurligebis Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
|
|
@ -21,8 +21,8 @@ DEPEND="ssl? ( dev-libs/openssl )
|
|||
crda? ( net-wireless/crda )
|
||||
)
|
||||
madwifi? ( ||
|
||||
( >net-wireless/madwifi-ng-tools-0.9.3
|
||||
net-wireless/madwifi-old ) )"
|
||||
( >net-wireless/madwifi-ng-tools-0.9.3 ) )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${S}/${PN}"
|
||||
|
|
@ -105,6 +105,7 @@ src_configure() {
|
|||
echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
|
||||
echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
|
||||
echo "CONFIG_PEERKEY=y" >> ${CONFIG}
|
||||
echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
|
||||
echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
|
||||
Loading…
Reference in a new issue