wpa: Port to new files to RTEMS.

4 files changed, 20 insertions, 0 deletions

diff --git a/freebsd/contrib/wpa/src/rsn_supp/tdls.c b/freebsd/contrib/wpa/src/rsn_supp/tdls.c
index 8d0359d1..c8be56aa 100644
--- a/freebsd/contrib/wpa/src/rsn_supp/tdls.c
+++ b/freebsd/contrib/wpa/src/rsn_supp/tdls.c
@@ -24,6 +24,7 @@
 #include "drivers/driver.h"
 #include "l2_packet/l2_packet.h"
 
+#if defined(__rtems__) && defined(CONFIG_TDLS)
 #ifdef CONFIG_TDLS_TESTING
 #define TDLS_TESTING_LONG_FRAME BIT(0)
 #define TDLS_TESTING_ALT_RSN_IE BIT(1)
@@ -3008,3 +3009,4 @@ int wpa_tdls_disable_chan_switch(struct wpa_sm *sm, const u8 *addr)
 	peer->chan_switch_enabled = 0;
 	return 0;
 }
+#endif /* __rtems__ && CONFIG_TDLS */
diff --git a/freebsd/contrib/wpa/wpa_supplicant/wnm_sta.c b/freebsd/contrib/wpa/wpa_supplicant/wnm_sta.c
index ea737e31..34332e2a 100644
--- a/freebsd/contrib/wpa/wpa_supplicant/wnm_sta.c
+++ b/freebsd/contrib/wpa/wpa_supplicant/wnm_sta.c
@@ -26,6 +26,7 @@
 #define MAX_TFS_IE_LEN  1024
 #define WNM_MAX_NEIGHBOR_REPORT 10
 
+#if defined(__rtems__) && defined(CONFIG_WNM)
 
 /* get the TFS IE from driver */
 static int ieee80211_11_get_tfs_ie(struct wpa_supplicant *wpa_s, u8 *buf,
@@ -1148,3 +1149,4 @@ void ieee802_11_rx_wnm_action(struct wpa_supplicant *wpa_s,
 		break;
 	}
 }
+#endif /* __rtems__ && CONFIG_WNM */
diff --git a/libbsd.py b/libbsd.py
index cdfab399..cbf040f2 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -4054,9 +4054,15 @@ def usr_sbin_wpa_supplicant(mm):
             'contrib/wpa/src/ap/ieee802_11.h',
             'contrib/wpa/src/ap/ieee802_11_auth.h',
             'contrib/wpa/src/ap/p2p_hostapd.h',
+            'contrib/wpa/src/ap/pmksa_cache_auth.h',
             'contrib/wpa/src/ap/sta_info.h',
+            'contrib/wpa/src/ap/wpa_auth.h',
+            'contrib/wpa/src/ap/wpa_auth_i.h',
+            'contrib/wpa/src/ap/wpa_auth_ie.h',
+            'contrib/wpa/src/ap/wmm.h',
             'contrib/wpa/src/utils/includes.h',
             'contrib/wpa/src/utils/base64.h',
+            'contrib/wpa/src/utils/bitfield.h',
             'contrib/wpa/src/utils/build_config.h',
             'contrib/wpa/src/utils/common.h',
             'contrib/wpa/src/utils/eloop.h',
@@ -4122,6 +4128,7 @@ def usr_sbin_wpa_supplicant(mm):
             'contrib/wpa/src/crypto/ms_funcs.h',
             'contrib/wpa/src/crypto/aes.h',
             'contrib/wpa/src/crypto/sha256_i.h',
+            'contrib/wpa/src/eapol_auth/eapol_auth_sm.h',
             'contrib/wpa/src/eapol_supp/eapol_supp_sm.h',
             'contrib/wpa/src/eap_peer/eap_config.h',
             'contrib/wpa/src/eap_peer/eap.h',
@@ -4141,6 +4148,7 @@ def usr_sbin_wpa_supplicant(mm):
             'contrib/wpa/src/eap_common/eap_ttls.h',
             'contrib/wpa/src/eap_server/eap_methods.h',
             'contrib/wpa/src/eapol_supp/eapol_supp_sm.h',
+            'contrib/wpa/src/radius/radius.h',
             'contrib/wpa/src/tls/tlsv1_client.h',
             'contrib/wpa/src/tls/tlsv1_cred.h',
             'contrib/wpa/src/tls/tlsv1_server.h',
@@ -4166,12 +4174,15 @@ def usr_sbin_wpa_supplicant(mm):
             'contrib/wpa/wpa_supplicant/offchannel.c',
             'contrib/wpa/wpa_supplicant/scan.c',
             'contrib/wpa/wpa_supplicant/wmm_ac.c',
+            'contrib/wpa/wpa_supplicant/wnm_sta.c',
             'contrib/wpa/wpa_supplicant/wpa_supplicant.c',
             'contrib/wpa/wpa_supplicant/wpas_glue.c',
             'contrib/wpa/wpa_supplicant/wps_supplicant.c',
             'contrib/wpa/src/ap/ap_drv_ops.c',
             'contrib/wpa/src/ap/hs20.c',
             'contrib/wpa/src/ap/ieee802_11_shared.c',
+            'contrib/wpa/src/ap/wpa_auth.c',
+            'contrib/wpa/src/ap/wpa_auth_ft.c',
             'contrib/wpa/src/utils/base64.c',
             'contrib/wpa/src/utils/common.c',
             'contrib/wpa/src/utils/eloop.c',
@@ -4209,6 +4220,7 @@ def usr_sbin_wpa_supplicant(mm):
             'contrib/wpa/src/rsn_supp/peerkey.c',
             'contrib/wpa/src/rsn_supp/pmksa_cache.c',
             'contrib/wpa/src/rsn_supp/preauth.c',
+            'contrib/wpa/src/rsn_supp/tdls.c',
             'contrib/wpa/src/rsn_supp/wpa.c',
             'contrib/wpa/src/rsn_supp/wpa_ft.c',
             'contrib/wpa/src/rsn_supp/wpa_ie.c',
diff --git a/libbsd_waf.py b/libbsd_waf.py
index af29e074..c9d89a12 100644
--- a/libbsd_waf.py
+++ b/libbsd_waf.py
@@ -1409,6 +1409,8 @@ def build(bld):
     objs08_source = ['freebsd/contrib/wpa/src/ap/ap_drv_ops.c',
                      'freebsd/contrib/wpa/src/ap/hs20.c',
                      'freebsd/contrib/wpa/src/ap/ieee802_11_shared.c',
+                     'freebsd/contrib/wpa/src/ap/wpa_auth.c',
+                     'freebsd/contrib/wpa/src/ap/wpa_auth_ft.c',
                      'freebsd/contrib/wpa/src/common/gas.c',
                      'freebsd/contrib/wpa/src/common/hw_features_common.c',
                      'freebsd/contrib/wpa/src/common/ieee802_11_common.c',
@@ -1455,6 +1457,7 @@ def build(bld):
                      'freebsd/contrib/wpa/src/rsn_supp/peerkey.c',
                      'freebsd/contrib/wpa/src/rsn_supp/pmksa_cache.c',
                      'freebsd/contrib/wpa/src/rsn_supp/preauth.c',
+                     'freebsd/contrib/wpa/src/rsn_supp/tdls.c',
                      'freebsd/contrib/wpa/src/rsn_supp/wpa.c',
                      'freebsd/contrib/wpa/src/rsn_supp/wpa_ft.c',
                      'freebsd/contrib/wpa/src/rsn_supp/wpa_ie.c',
@@ -1498,6 +1501,7 @@ def build(bld):
                      'freebsd/contrib/wpa/wpa_supplicant/offchannel.c',
                      'freebsd/contrib/wpa/wpa_supplicant/scan.c',
                      'freebsd/contrib/wpa/wpa_supplicant/wmm_ac.c',
+                     'freebsd/contrib/wpa/wpa_supplicant/wnm_sta.c',
                      'freebsd/contrib/wpa/wpa_supplicant/wpa_supplicant.c',
                      'freebsd/contrib/wpa/wpa_supplicant/wpas_glue.c',
                      'freebsd/contrib/wpa/wpa_supplicant/wps_supplicant.c',