Author: colin Date: 2009-12-29 03:40:21 +0100 (Tue, 29 Dec 2009) New Revision: 34796 Changeset: http://dev.haiku-os.org/changeset/34796/haiku Modified: haiku/trunk/src/libs/compat/freebsd_wlan/net80211/Jamfile haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.c haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.h Log: Adding crypto support for tkip (aka WPA) to the wlan stack. Modified: haiku/trunk/src/libs/compat/freebsd_wlan/net80211/Jamfile =================================================================== --- haiku/trunk/src/libs/compat/freebsd_wlan/net80211/Jamfile 2009-12-29 02:35:59 UTC (rev 34795) +++ haiku/trunk/src/libs/compat/freebsd_wlan/net80211/Jamfile 2009-12-29 02:40:21 UTC (rev 34796) @@ -24,6 +24,7 @@ ieee80211_amrr.c ieee80211_crypto.c ieee80211_crypto_none.c + ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_dfs.c ieee80211_haiku.c @@ -46,7 +47,6 @@ # NOT SUPPORTED YET ieee80211_acl.c # NOT SUPPORTED YET ieee80211_crypto_ccmp.c - # NOT SUPPORTED YET ieee80211_crypto_tkip.c # NOT SUPPORTED YET ieee80211_ddb.c # NOT SUPPORTED YET ieee80211_hwmp.c # NOT SUPPORTED YET ieee80211_mesh.c Modified: haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.c =================================================================== --- haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.c 2009-12-29 02:35:59 UTC (rev 34795) +++ haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.c 2009-12-29 02:40:21 UTC (rev 34796) @@ -142,6 +142,7 @@ /* NB: we assume everything is pre-zero'd */ ciphers[IEEE80211_CIPHER_NONE] = &ieee80211_cipher_none; #if defined(__HAIKU__) + ieee80211_crypto_tkip_load(); ieee80211_crypto_wep_load(); #endif } @@ -153,6 +154,7 @@ ieee80211_crypto_detach(struct ieee80211com *ic) { #if defined(__HAIKU__) + ieee80211_crypto_tkip_unload(); ieee80211_crypto_wep_unload(); #endif } Modified: haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.h =================================================================== --- haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.h 2009-12-29 02:35:59 UTC (rev 34795) +++ haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_crypto.h 2009-12-29 02:40:21 UTC (rev 34796) @@ -160,6 +160,8 @@ void ieee80211_crypto_reload_keys(struct ieee80211com *); #if defined (__HAIKU__) +void ieee80211_crypto_tkip_load(void); +void ieee80211_crypto_tkip_unload(void); void ieee80211_crypto_wep_load(void); void ieee80211_crypto_wep_unload(void); #endif