diff options
Diffstat (limited to 'usr.sbin/wpa')
-rw-r--r-- | usr.sbin/wpa/Makefile.crypto | 8 | ||||
-rw-r--r-- | usr.sbin/wpa/hostapd/Makefile | 20 | ||||
-rw-r--r-- | usr.sbin/wpa/hostapd_cli/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/wpa/ndis_events/ndis_events.c | 1 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_cli/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_passphrase/Makefile | 10 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_priv/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Makefile | 17 | ||||
-rw-r--r-- | usr.sbin/wpa/wpa_supplicant/Packet32.c | 1 |
9 files changed, 30 insertions, 36 deletions
diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto index 94367bb..46cd9ef 100644 --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -2,8 +2,7 @@ .if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) SRCS+= crypto_openssl.c random.c sha1-prf.c sha256-prf.c -DPADD+= ${LIBSSL} ${LIBCRYPTO} -LDADD+= -lssl -lcrypto +LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 .else CFLAGS+=-DCONFIG_CRYPTO_INTERNAL @@ -54,7 +53,8 @@ SRCS+= tls_openssl.c .endif .if defined(CONFIG_INTERNAL_AES) -SRCS+= aes-internal.c \ +SRCS+= aes-unwrap.c aes-wrap.c \ + aes-internal.c \ aes-internal-dec.c \ aes-internal-enc.c .endif @@ -93,7 +93,7 @@ SRCS+= md4-internal.c .endif .if defined(CONFIG_INTERNAL_MD5) -SRCS+= md5-internal.c +SRCS+= md5.c md5-internal.c .endif .if defined(NEED_FIPS186_2_PRF) diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 7ab542f..04fbc4d 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -7,15 +7,17 @@ ${WPA_DISTDIR}/src/drivers PROG= hostapd -SRCS= accounting.c aes-wrap.c ap_config.c ap_drv_ops.c ap_mlme.c authsrv.c \ - base64.c beacon.c chap.c common.c config_file.c ctrl_iface.c \ +SRCS= accounting.c aes-omac1.c ap_config.c ap_drv_ops.c ap_mlme.c authsrv.c \ + base64.c beacon.c bss_load.c chap.c common.c config_file.c \ + ctrl_iface.c \ ctrl_iface_ap.c driver_common.c l2_packet_freebsd.c driver_bsd.c \ drivers.c drv_callbacks.c eap_common.c eap_peap_common.c \ eap_register.c eap_server.c eap_server_methods.c eap_user_db.c \ eapol_auth_dump.c eapol_auth_sm.c eloop.c gas.c gas_serv.c hostapd.c \ - hs20.c http_client.c http_server.c httpread.c ieee802_11_auth.c \ + hs20.c http_client.c http_server.c httpread.c \ + hw_features_common.c ieee802_11_auth.c \ ieee802_11_common.c ieee802_11_shared.c ieee802_1x.c ip_addr.c \ - main.c md5.c ms_funcs.c os_unix.c peerkey_auth.c pmksa_cache_auth.c \ + main.c ms_funcs.c os_unix.c peerkey_auth.c pmksa_cache_auth.c \ preauth_auth.c radius.c radius_client.c radius_das.c sta_info.c \ tkip_countermeasures.c upnp_xml.c utils.c uuid.c vlan_init.c \ wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_common.c wpa_debug.c \ @@ -46,8 +48,7 @@ CFLAGS+=-DCONFIG_DRIVER_BSD \ CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD+= pcap util # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} @@ -65,10 +66,9 @@ CFLAGS+=-DDPKCS12_FUNCS \ -DEAP_SERVER_TLS \ -DEAP_SERVER_TTLS \ -DEAP_TLS_FUNCS \ - -DEAP_SERVER_WSC \ - -DCONFIG_NO_DUMP_STATE -SRCS+= dump_state.c \ - eap_server_gtc.c \ + -DEAP_SERVER_WSC + +SRCS+= eap_server_gtc.c \ eap_server_identity.c \ eap_server_md5.c \ eap_server_mschapv2.c \ diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile index 3542aac..48af140 100644 --- a/usr.sbin/wpa/hostapd_cli/Makefile +++ b/usr.sbin/wpa/hostapd_cli/Makefile @@ -10,8 +10,7 @@ SRCS= common.c edit.c eloop.c hostapd_cli.c os_unix.c wpa_ctrl.c wpa_debug.c CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= hostapd_cli.8 diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c index 9c6e9de..b61fd0a 100644 --- a/usr.sbin/wpa/ndis_events/ndis_events.c +++ b/usr.sbin/wpa/ndis_events/ndis_events.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index 9530b73..3203829 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -15,7 +15,6 @@ CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX CFLAGS+= -D_DIRENT_HAVE_D_TYPE CFLAGS+= -DCONFIG_WPA_CLI_EDIT=y -LDADD+= -lutil -DPADD+= ${LIBUTIL} +LIBADD+= util .include <bsd.prog.mk> diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile index d0f5198..aaf5c19 100644 --- a/usr.sbin/wpa/wpa_passphrase/Makefile +++ b/usr.sbin/wpa/wpa_passphrase/Makefile @@ -5,14 +5,12 @@ .PATH.c:${WPA_SUPPLICANT_DISTDIR} PROG= wpa_passphrase -SRCS= common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c sha1.c \ - wpa_passphrase.c +SRCS= common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c \ + sha1.c wpa_passphrase.c -CFLAGS+= -DINTERNAL_SHA1 -CFLAGS+= -DINTERNAL_MD5 +CFLAGS+= -DCONFIG_CRYPTO_INTERNAL -DINTERNAL_SHA1 -DINTERNAL_MD5 -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= wpa_passphrase.8 diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile index 4dbc631..cf77678 100644 --- a/usr.sbin/wpa/wpa_priv/Makefile +++ b/usr.sbin/wpa/wpa_priv/Makefile @@ -9,8 +9,7 @@ PROG= wpa_priv SRCS= drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \ driver_common.c l2_packet_freebsd.c -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +LIBADD= pcap .include "${.CURDIR}/../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index 673a04d..ecbacb1 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -8,14 +8,17 @@ ${WPA_DISTDIR}/src/drivers PROG= wpa_supplicant -SRCS= aes-unwrap.c base64.c blacklist.c bss.c common.c config.c \ +SRCS= ap_drv_ops.c base64.c blacklist.c bss.c common.c config.c \ config_file.c ctrl_iface.c ctrl_iface_unix.c driver_bsd.c \ driver_common.c driver_ndis.c driver_wired.c drivers.c \ eap_register.c eloop.c events.c gas.c gas_query.c hs20.c \ hs20_supplicant.c http_client.c http_server.c httpread.c \ - ieee802_11_common.c interworking.c l2_packet_freebsd.c main.c \ - md5.c notify.c offchannel.c os_unix.c peerkey.c pmksa_cache.c \ - preauth.c scan.c upnp_xml.c uuid.c wpa.c wpa_common.c wpa_debug.c \ + hw_features_common.c \ + ieee802_11_common.c ieee802_11_shared.c \ + interworking.c l2_packet_freebsd.c main.c \ + notify.c offchannel.c os_unix.c peerkey.c pmksa_cache.c \ + preauth.c scan.c upnp_xml.c uuid.c wmm_ac.c \ + wpa.c wpa_common.c wpa_debug.c \ wpa_ft.c wpa_ie.c wpa_supplicant.c wpabuf.c wpas_glue.c wps.c \ wps_attr_build.c wps_attr_parse.c wps_attr_process.c \ wps_common.c wps_dev_attr.c wps_enrollee.c wps_registrar.c \ @@ -49,8 +52,7 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \ -DCONFIG_GAS \ -DPKCS12_FUNCS #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD= pcap util # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} @@ -127,8 +129,7 @@ NEED_FIPS186_2_PRF=y # .if !empty(CFLAGS:M*-DPCSC_FUNCS) SRCS+= pcsc_funcs.c -DPADD+=${LIBPTHREAD} -LDADD+=-lpcsclite -lpthread +LIBADD+= pcslite pthread .endif .if !empty(CFLAGS:M*-DEAP_GPSK) diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c index 876417e..8e7da03 100644 --- a/usr.sbin/wpa/wpa_supplicant/Packet32.c +++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <arpa/inet.h> |