| 1 |
gurligebis 14/06/06 16:42:05 |
| 2 |
|
| 3 |
Added: |
| 4 |
wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch |
| 5 |
wpa_supplicant-2.2-dbus-path-fix.patch |
| 6 |
wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch |
| 7 |
wpa_supplicant-2.2-generate-libeap-peer.patch |
| 8 |
Removed: wpa_supplicant-2.1-WPA-fix.patch |
| 9 |
wpa_supplicant-2.1-generate-libeap-peer.patch |
| 10 |
wpa_supplicant-2.1-dbus-path-fix.patch |
| 11 |
wpa_supplicant-2.1-fix-undefined-reference-to-random_get_bytes.patch |
| 12 |
wpa_supplicant-2.1-NFC-fix.patch |
| 13 |
wpa_supplicant-2.1-do-not-call-dbus-functions-with-NULL-path.patch |
| 14 |
Log: |
| 15 |
Bumping to 2.2, fixing #512574 |
| 16 |
|
| 17 |
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 15AE484C) |
| 18 |
|
| 19 |
Revision Changes Path |
| 20 |
1.1 net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch |
| 21 |
|
| 22 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch?rev=1.1&view=markup |
| 23 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch?rev=1.1&content-type=text/plain |
| 24 |
|
| 25 |
Index: wpa_supplicant-2.2-fix-undefined-reference-to-random_get_bytes.patch |
| 26 |
=================================================================== |
| 27 |
diff -Naur a/src/eap_peer/Makefile b/src/eap_peer/Makefile |
| 28 |
--- a/src/eap_peer/Makefile 2013-05-17 09:51:55.000000000 +0000 |
| 29 |
+++ b/src/eap_peer/Makefile 2013-05-17 09:54:03.010830904 +0000 |
| 30 |
@@ -36,6 +36,7 @@ |
| 31 |
OBJS_both += ../utils/wpa_debug.o |
| 32 |
OBJS_both += ../utils/base64.o |
| 33 |
OBJS_both += ../utils/wpabuf.o |
| 34 |
+OBJS_both += ../utils/eloop.o |
| 35 |
OBJS_both += ../crypto/md5.o |
| 36 |
ifneq ($(CONFIG_TLS), openssl) |
| 37 |
OBJS_both += ../crypto/sha1.o |
| 38 |
@@ -48,6 +49,7 @@ |
| 39 |
OBJS_both += ../crypto/aes-omac1.o |
| 40 |
OBJS_both += ../crypto/ms_funcs.o |
| 41 |
OBJS_both += ../crypto/sha256.o |
| 42 |
+OBJS_both += ../crypto/random.o |
| 43 |
|
| 44 |
|
| 45 |
OBJS_both += ../eap_common/eap_peap_common.o |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-dbus-path-fix.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-dbus-path-fix.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-dbus-path-fix.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: wpa_supplicant-2.2-dbus-path-fix.patch |
| 55 |
=================================================================== |
| 56 |
diff -aurp a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in |
| 57 |
--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-15 09:00:03.048545044 +0000 |
| 58 |
+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-15 09:01:19.759550509 +0000 |
| 59 |
@@ -1,5 +1,5 @@ |
| 60 |
[D-BUS Service] |
| 61 |
Name=fi.epitest.hostap.WPASupplicant |
| 62 |
-Exec=@BINDIR@/wpa_supplicant -u |
| 63 |
+Exec=/usr/sbin/wpa_supplicant -u |
| 64 |
User=root |
| 65 |
SystemdService=wpa_supplicant.service |
| 66 |
diff -aurp a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in |
| 67 |
--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-15 09:00:03.048545044 +0000 |
| 68 |
+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-15 09:01:28.727551913 +0000 |
| 69 |
@@ -1,5 +1,5 @@ |
| 70 |
[D-BUS Service] |
| 71 |
Name=fi.w1.wpa_supplicant1 |
| 72 |
-Exec=@BINDIR@/wpa_supplicant -u |
| 73 |
+Exec=/usr/sbin/wpa_supplicant -u |
| 74 |
User=root |
| 75 |
SystemdService=wpa_supplicant.service |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.1 net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch?rev=1.1&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch?rev=1.1&content-type=text/plain |
| 83 |
|
| 84 |
Index: wpa_supplicant-2.2-do-not-call-dbus-functions-with-NULL-path.patch |
| 85 |
=================================================================== |
| 86 |
diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c |
| 87 |
--- a/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:28:37.616150164 +0000 |
| 88 |
+++ b/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:30:21.904157611 +0000 |
| 89 |
@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru |
| 90 |
const struct wpa_dbus_property_desc *dsc; |
| 91 |
int i = 0; |
| 92 |
|
| 93 |
- if (iface == NULL) |
| 94 |
+ if (iface == NULL || path == NULL) |
| 95 |
return; |
| 96 |
|
| 97 |
dbus_connection_get_object_path_data(iface->con, path, |
| 98 |
diff -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c |
| 99 |
--- a/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:28:29.502149373 +0000 |
| 100 |
+++ b/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:30:48.859162441 +0000 |
| 101 |
@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res |
| 102 |
DBusMessage *_signal; |
| 103 |
|
| 104 |
/* Do nothing if the control interface is not turned on */ |
| 105 |
- if (iface == NULL) |
| 106 |
+ if (iface == NULL || wpa_s->dbus_path == NULL) |
| 107 |
return; |
| 108 |
|
| 109 |
_signal = dbus_message_new_signal(wpa_s->dbus_path, |
| 110 |
@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch |
| 111 |
if (wpa_s->global == NULL) |
| 112 |
return; |
| 113 |
iface = wpa_s->global->dbus; |
| 114 |
- if (iface == NULL) |
| 115 |
+ if (iface == NULL || wpa_s->dbus_path == NULL) |
| 116 |
return; |
| 117 |
|
| 118 |
/* Only send signal if state really changed */ |
| 119 |
@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning |
| 120 |
dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE; |
| 121 |
|
| 122 |
/* Do nothing if the control interface is not turned on */ |
| 123 |
- if (iface == NULL) |
| 124 |
+ if (iface == NULL || wpa_s->dbus_path == NULL) |
| 125 |
return; |
| 126 |
|
| 127 |
_signal = dbus_message_new_signal(wpa_s->dbus_path, |
| 128 |
@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred |
| 129 |
if (wpa_s->global == NULL) |
| 130 |
return; |
| 131 |
iface = wpa_s->global->dbus; |
| 132 |
- if (iface == NULL) |
| 133 |
+ if (iface == NULL || wpa_s->dbus_path == NULL) |
| 134 |
return; |
| 135 |
|
| 136 |
_signal = dbus_message_new_signal(wpa_s->dbus_path, |
| 137 |
@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific |
| 138 |
if (wpa_s->global == NULL) |
| 139 |
return; |
| 140 |
iface = wpa_s->global->dbus; |
| 141 |
- if (iface == NULL) |
| 142 |
+ if (iface == NULL || wpa_s->dbus_path == NULL) |
| 143 |
return; |
| 144 |
|
| 145 |
_signal = dbus_message_new_signal(wpa_s->dbus_path, |
| 146 |
|
| 147 |
|
| 148 |
|
| 149 |
1.1 net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch |
| 150 |
|
| 151 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch?rev=1.1&view=markup |
| 152 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-2.2-generate-libeap-peer.patch?rev=1.1&content-type=text/plain |
| 153 |
|
| 154 |
Index: wpa_supplicant-2.2-generate-libeap-peer.patch |
| 155 |
=================================================================== |
| 156 |
diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c |
| 157 |
--- a/src/eap_peer/eap_methods.c 2012-05-15 08:23:17.151386999 +0000 |
| 158 |
+++ b/src/eap_peer/eap_methods.c 2012-05-15 08:23:57.403389760 +0000 |
| 159 |
@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_ |
| 160 |
|
| 161 |
|
| 162 |
/** |
| 163 |
+ * eap_peer_register_methods - Register all known EAP peer methods |
| 164 |
+ * |
| 165 |
+ * This function is called at program start to register all compiled |
| 166 |
+ * in EAP peer methods. |
| 167 |
+ */ |
| 168 |
+int eap_peer_register_methods(void) |
| 169 |
+{ |
| 170 |
+ int ret = 0; |
| 171 |
+ |
| 172 |
+#ifdef EAP_MD5 |
| 173 |
+ if (ret == 0) |
| 174 |
+ ret = eap_peer_md5_register(); |
| 175 |
+#endif /* EAP_MD5 */ |
| 176 |
+ |
| 177 |
+#ifdef EAP_TLS |
| 178 |
+ if (ret == 0) |
| 179 |
+ ret = eap_peer_tls_register(); |
| 180 |
+#endif /* EAP_TLS */ |
| 181 |
+ |
| 182 |
+#ifdef EAP_MSCHAPv2 |
| 183 |
+ if (ret == 0) |
| 184 |
+ ret = eap_peer_mschapv2_register(); |
| 185 |
+#endif /* EAP_MSCHAPv2 */ |
| 186 |
+ |
| 187 |
+#ifdef EAP_PEAP |
| 188 |
+ if (ret == 0) |
| 189 |
+ ret = eap_peer_peap_register(); |
| 190 |
+#endif /* EAP_PEAP */ |
| 191 |
+ |
| 192 |
+#ifdef EAP_TTLS |
| 193 |
+ if (ret == 0) |
| 194 |
+ ret = eap_peer_ttls_register(); |
| 195 |
+#endif /* EAP_TTLS */ |
| 196 |
+ |
| 197 |
+#ifdef EAP_GTC |
| 198 |
+ if (ret == 0) |
| 199 |
+ ret = eap_peer_gtc_register(); |
| 200 |
+#endif /* EAP_GTC */ |
| 201 |
+ |
| 202 |
+#ifdef EAP_OTP |
| 203 |
+ if (ret == 0) |
| 204 |
+ ret = eap_peer_otp_register(); |
| 205 |
+#endif /* EAP_OTP */ |
| 206 |
+ |
| 207 |
+#ifdef EAP_SIM |
| 208 |
+ if (ret == 0) |
| 209 |
+ ret = eap_peer_sim_register(); |
| 210 |
+#endif /* EAP_SIM */ |
| 211 |
+ |
| 212 |
+#ifdef EAP_LEAP |
| 213 |
+ if (ret == 0) |
| 214 |
+ ret = eap_peer_leap_register(); |
| 215 |
+#endif /* EAP_LEAP */ |
| 216 |
+ |
| 217 |
+#ifdef EAP_PSK |
| 218 |
+ if (ret == 0) |
| 219 |
+ ret = eap_peer_psk_register(); |
| 220 |
+#endif /* EAP_PSK */ |
| 221 |
+ |
| 222 |
+#ifdef EAP_AKA |
| 223 |
+ if (ret == 0) |
| 224 |
+ ret = eap_peer_aka_register(); |
| 225 |
+#endif /* EAP_AKA */ |
| 226 |
+ |
| 227 |
+#ifdef EAP_AKA_PRIME |
| 228 |
+ if (ret == 0) |
| 229 |
+ ret = eap_peer_aka_prime_register(); |
| 230 |
+#endif /* EAP_AKA_PRIME */ |
| 231 |
+ |
| 232 |
+#ifdef EAP_FAST |
| 233 |
+ if (ret == 0) |
| 234 |
+ ret = eap_peer_fast_register(); |
| 235 |
+#endif /* EAP_FAST */ |
| 236 |
+ |
| 237 |
+#ifdef EAP_PAX |
| 238 |
+ if (ret == 0) |
| 239 |
+ ret = eap_peer_pax_register(); |
| 240 |
+#endif /* EAP_PAX */ |
| 241 |
+ |
| 242 |
+#ifdef EAP_SAKE |
| 243 |
+ if (ret == 0) |
| 244 |
+ ret = eap_peer_sake_register(); |
| 245 |
+#endif /* EAP_SAKE */ |
| 246 |
+ |
| 247 |
+#ifdef EAP_GPSK |
| 248 |
+ if (ret == 0) |
| 249 |
+ ret = eap_peer_gpsk_register(); |
| 250 |
+#endif /* EAP_GPSK */ |
| 251 |
+ |
| 252 |
+#ifdef EAP_WSC |
| 253 |
+ if (ret == 0) |
| 254 |
+ ret = eap_peer_wsc_register(); |
| 255 |
+#endif /* EAP_WSC */ |
| 256 |
+ |
| 257 |
+#ifdef EAP_IKEV2 |
| 258 |
+ if (ret == 0) |
| 259 |
+ ret = eap_peer_ikev2_register(); |
| 260 |
+#endif /* EAP_IKEV2 */ |
| 261 |
+ |
| 262 |
+#ifdef EAP_VENDOR_TEST |
| 263 |
+ if (ret == 0) |
| 264 |
+ ret = eap_peer_vendor_test_register(); |
| 265 |
+#endif /* EAP_VENDOR_TEST */ |
| 266 |
+ |
| 267 |
+#ifdef EAP_TNC |
| 268 |
+ if (ret == 0) |
| 269 |
+ ret = eap_peer_tnc_register(); |
| 270 |
+#endif /* EAP_TNC */ |
| 271 |
+ |
| 272 |
+ return ret; |
| 273 |
+} |
| 274 |
+ |
| 275 |
+ |
| 276 |
+/** |
| 277 |
* eap_peer_unregister_methods - Unregister EAP peer methods |
| 278 |
* |
| 279 |
* This function is called at program termination to unregister all EAP peer |
| 280 |
diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h |
| 281 |
--- a/src/eap_peer/eap_methods.h 2012-05-15 08:23:17.151386999 +0000 |
| 282 |
+++ b/src/eap_peer/eap_methods.h 2012-05-15 08:23:57.404389735 +0000 |
| 283 |
@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na |
| 284 |
const char * eap_get_name(int vendor, EapType type); |
| 285 |
size_t eap_get_names(char *buf, size_t buflen); |
| 286 |
char ** eap_get_names_as_string_array(size_t *num); |
| 287 |
+int eap_peer_register_methods(void); |
| 288 |
void eap_peer_unregister_methods(void); |
| 289 |
|
| 290 |
#else /* IEEE8021X_EAPOL */ |
| 291 |
diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc |
| 292 |
--- a/src/eap_peer/libeap0.pc 1970-01-01 00:00:00.000000000 +0000 |
| 293 |
+++ b/src/eap_peer/libeap0.pc 2012-05-15 08:23:57.404389735 +0000 |
| 294 |
@@ -0,0 +1,10 @@ |
| 295 |
+prefix=/usr |
| 296 |
+exec_prefix=/usr |
| 297 |
+libdir=${exec_prefix}/lib |
| 298 |
+includedir=${prefix}/include/eap_peer |
| 299 |
+ |
| 300 |
+Name: libeap0 |
| 301 |
+Description: EAP Peer Library API |
| 302 |
+Version: 0.7.2 |
| 303 |
+Libs: -L${libdir} -leap |
| 304 |
+Cflags: -I${includedir} |
| 305 |
diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile |
| 306 |
--- a/src/eap_peer/Makefile 2012-05-15 08:23:17.152386964 +0000 |
| 307 |
+++ b/src/eap_peer/Makefile 2012-05-15 08:23:57.403389760 +0000 |
| 308 |
@@ -1,11 +1,188 @@ |
| 309 |
-all: |
| 310 |
- @echo Nothing to be made. |
| 311 |
+LIBEAP_NAME = libeap |
| 312 |
+LIBEAP_CURRENT = 0 |
| 313 |
+LIBEAP_REVISION = 0 |
| 314 |
+LIBEAP_AGE = 0 |
| 315 |
+ |
| 316 |
+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE) |
| 317 |
+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT) |
| 318 |
+ |
| 319 |
+.PHONY: all clean install uninstall |
| 320 |
+ |
| 321 |
+all: $(LIBEAP) |
| 322 |
+ |
| 323 |
+ifndef CC |
| 324 |
+CC=gcc |
| 325 |
+endif |
| 326 |
+ |
| 327 |
+ifndef CFLAGS |
| 328 |
+CFLAGS = -MMD -O0 -Wall -g |
| 329 |
+endif |
| 330 |
+ |
| 331 |
+CONFIG_TLS=openssl |
| 332 |
+ |
| 333 |
+INCLUDE_INSTALL_DIR=/usr/include/eap_peer |
| 334 |
+ |
| 335 |
+# Got to use override all across the board, otherwise a 'make |
| 336 |
+# CFLAGS=XX' will kill us because the command line's CFLAGS will |
| 337 |
+# overwrite Make's and we'll loose all the infrastructure it sets. |
| 338 |
+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common |
| 339 |
+ |
| 340 |
+# at least for now, need to include config_ssid.h and config_blob.h from |
| 341 |
+# wpa_supplicant directory |
| 342 |
+override CFLAGS += -I ../../wpa_supplicant |
| 343 |
+ |
| 344 |
+OBJS_both += ../utils/common.o |
| 345 |
+OBJS_both += ../utils/os_unix.o |
| 346 |
+OBJS_both += ../utils/wpa_debug.o |
| 347 |
+OBJS_both += ../utils/base64.o |
| 348 |
+OBJS_both += ../utils/wpabuf.o |
| 349 |
+OBJS_both += ../crypto/md5.o |
| 350 |
+ifneq ($(CONFIG_TLS), openssl) |
| 351 |
+OBJS_both += ../crypto/sha1.o |
| 352 |
+endif |
| 353 |
+OBJS_both += ../crypto/sha1-tlsprf.o |
| 354 |
+OBJS_both += ../crypto/aes-encblock.o |
| 355 |
+OBJS_both += ../crypto/aes-wrap.o |
| 356 |
+OBJS_both += ../crypto/aes-ctr.o |
| 357 |
+OBJS_both += ../crypto/aes-eax.o |
| 358 |
+OBJS_both += ../crypto/aes-omac1.o |
| 359 |
+OBJS_both += ../crypto/ms_funcs.o |
| 360 |
+OBJS_both += ../crypto/sha256.o |
| 361 |
+ |
| 362 |
+ |
| 363 |
+OBJS_both += ../eap_common/eap_peap_common.o |
| 364 |
+OBJS_both += ../eap_common/eap_psk_common.o |
| 365 |
+OBJS_both += ../eap_common/eap_pax_common.o |
| 366 |
+OBJS_both += ../eap_common/eap_sake_common.o |
| 367 |
+OBJS_both += ../eap_common/eap_gpsk_common.o |
| 368 |
+OBJS_both += ../eap_common/chap.o |
| 369 |
+ |
| 370 |
+OBJS_peer += ../eap_peer/eap_tls.o |
| 371 |
+OBJS_peer += ../eap_peer/eap_peap.o |
| 372 |
+OBJS_peer += ../eap_peer/eap_ttls.o |
| 373 |
+OBJS_peer += ../eap_peer/eap_md5.o |
| 374 |
+OBJS_peer += ../eap_peer/eap_mschapv2.o |
| 375 |
+OBJS_peer += ../eap_peer/mschapv2.o |
| 376 |
+OBJS_peer += ../eap_peer/eap_otp.o |
| 377 |
+OBJS_peer += ../eap_peer/eap_gtc.o |
| 378 |
+OBJS_peer += ../eap_peer/eap_leap.o |
| 379 |
+OBJS_peer += ../eap_peer/eap_psk.o |
| 380 |
+OBJS_peer += ../eap_peer/eap_pax.o |
| 381 |
+OBJS_peer += ../eap_peer/eap_sake.o |
| 382 |
+OBJS_peer += ../eap_peer/eap_gpsk.o |
| 383 |
+OBJS_peer += ../eap_peer/eap.o |
| 384 |
+OBJS_peer += ../eap_common/eap_common.o |
| 385 |
+OBJS_peer += ../eap_peer/eap_methods.o |
| 386 |
+OBJS_peer += ../eap_peer/eap_tls_common.o |
| 387 |
+ |
| 388 |
+override CFLAGS += -DEAP_TLS |
| 389 |
+override CFLAGS += -DEAP_PEAP |
| 390 |
+override CFLAGS += -DEAP_TTLS |
| 391 |
+override CFLAGS += -DEAP_MD5 |
| 392 |
+override CFLAGS += -DEAP_MSCHAPv2 |
| 393 |
+override CFLAGS += -DEAP_GTC |
| 394 |
+override CFLAGS += -DEAP_OTP |
| 395 |
+override CFLAGS += -DEAP_LEAP |
| 396 |
+override CFLAGS += -DEAP_PSK |
| 397 |
+override CFLAGS += -DEAP_PAX |
| 398 |
+override CFLAGS += -DEAP_SAKE |
| 399 |
+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 |
| 400 |
+override CFLAGS += -DEAP_TLS_FUNCS |
| 401 |
+ |
| 402 |
+override CFLAGS += -DIEEE8021X_EAPOL |
| 403 |
+ |
| 404 |
+ifeq ($(CONFIG_TLS), openssl) |
| 405 |
+override CFLAGS += -DEAP_TLS_OPENSSL |
| 406 |
+OBJS_both += ../crypto/tls_openssl.o |
| 407 |
+OBJS_both += ../crypto/crypto_openssl.o |
| 408 |
+LIBS += -lssl -lcrypto |
| 409 |
+override CFLAGS += -DINTERNAL_SHA256 |
| 410 |
+endif |
| 411 |
+ |
| 412 |
+ifeq ($(CONFIG_TLS), internal) |
| 413 |
+OBJS_both += ../crypto/tls_internal.o |
| 414 |
+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o |
| 415 |
+OBJS_both += ../tls/tlsv1_cred.o |
| 416 |
+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o |
| 417 |
+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o |
| 418 |
+ |
| 419 |
+OBJS_peer += ../tls/tlsv1_client.o |
| 420 |
+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o |
| 421 |
+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT |
| 422 |
+ |
| 423 |
+OBJS_server += ../tls/tlsv1_server.o |
| 424 |
+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o |
| 425 |
+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER |
| 426 |
+ |
| 427 |
+override CFLAGS += -DCONFIG_TLS_INTERNAL |
| 428 |
+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL |
| 429 |
+override CFLAGS += -DCONFIG_INTERNAL_X509 |
| 430 |
+override CFLAGS += -DINTERNAL_AES |
| 431 |
+override CFLAGS += -DINTERNAL_SHA1 |
| 432 |
+override CFLAGS += -DINTERNAL_SHA256 |
| 433 |
+override CFLAGS += -DINTERNAL_MD5 |
| 434 |
+override CFLAGS += -DINTERNAL_MD4 |
| 435 |
+override CFLAGS += -DINTERNAL_DES |
| 436 |
+ifdef CONFIG_INTERNAL_LIBTOMMATH |
| 437 |
+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH |
| 438 |
+else |
| 439 |
+LIBS += -ltommath |
| 440 |
+endif |
| 441 |
+endif |
| 442 |
+ |
| 443 |
+ifndef LDO |
| 444 |
+LDO=$(CC) |
| 445 |
+endif |
| 446 |
+ |
| 447 |
+ |
| 448 |
+OBJS_lib=$(OBJS_both) $(OBJS_peer) |
| 449 |
+ |
| 450 |
+ #$(OBJS_server) |
| 451 |
+ |
| 452 |
+override CFLAGS += -fPIC -DPIC |
| 453 |
+LDFLAGS += -shared |
| 454 |
+ |
| 455 |
+$(LIBEAP): $(OBJS_lib) |
| 456 |
+ $(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS) |
| 457 |
+ |
| 458 |
+ |
| 459 |
+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \ |
| 460 |
+ ../utils/wpabuf.h ../utils/build_config.h \ |
| 461 |
+ ../utils/os.h ../utils/wpa_debug.h |
| 462 |
+COMMON_HEADERS = ../common/defs.h |
| 463 |
+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h |
| 464 |
+MAIN_HEADERS = eap.h eap_methods.h eap_config.h |
| 465 |
+CRYPTO_HEADERS = ../crypto/tls.h |
| 466 |
+ |
| 467 |
+install: |
| 468 |
+ |
| 469 |
+ mkdir -p $(DESTDIR)/usr/lib |
| 470 |
+# copy the lib file to std lib location |
| 471 |
+ cp $(LIBEAP) $(DESTDIR)/usr/lib |
| 472 |
+ ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so |
| 473 |
+ ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0 |
| 474 |
+ |
| 475 |
+# copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include |
| 476 |
+ mkdir -p \ |
| 477 |
+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \ |
| 478 |
+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \ |
| 479 |
+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \ |
| 480 |
+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto |
| 481 |
+ install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common |
| 482 |
+ install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common |
| 483 |
+ install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto |
| 484 |
+ install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util |
| 485 |
+ install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/ |
| 486 |
+ |
| 487 |
+ mkdir -p $(DESTDIR)/usr/lib/pkgconfig |
| 488 |
+ cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig |
| 489 |
+ |
| 490 |
+uninstall: |
| 491 |
+ |
| 492 |
+ rm $(DESTDIR)/usr/lib/$(LIBEAP) |
| 493 |
+ rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR) |
| 494 |
+ rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc |
| 495 |
|
| 496 |
clean: |
| 497 |
- rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov |
| 498 |
+ rm -f *~ *.o *.so *.d *.gcno *.gcda *.gcov libeap.a $(LIBEAP) $(OBJS_lib) |
| 499 |
|
| 500 |
-install: |
| 501 |
- if ls *.so >/dev/null 2>&1; then \ |
| 502 |
- install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \ |
| 503 |
- cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \ |
| 504 |
- ; fi |
Archives