ie: Move AKM suite converter from netdev
PATCH 1/6 ie: Move AKM suite converter from netdev
It is more logical to host this function inside ie.c than netdev.c. Particularly since ie_rsn_cipher_suite_to_cipher is already present in ie.c.
--- src/ie.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/ie.h | 2 ++ src/netdev.c | 47 +---------------------------------------------- 3 files changed, 49 insertions(+), 46 deletions(-)
src/ie.c +46 -0
@@ -481,6 +481,52 @@ const char *ie_rsn_cipher_suite_to_string(enum ie_rsn_cipher_suite suite)return NULL ; } +uint32_t ie_rsn_akm_suite_to_akm (enum ie_rsn_akm_suite akm) +{ +switch (akm) { +case IE_RSN_AKM_SUITE_8021X : +return CRYPTO_AKM_8021X ; +case IE_RSN_AKM_SUITE_PSK : +return CRYPTO_AKM_PSK ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X : +return CRYPTO_AKM_FT_OVER_8021X ; +case IE_RSN_AKM_SUITE_FT_USING_PSK : +return CRYPTO_AKM_FT_USING_PSK ; +case IE_RSN_AKM_SUITE_8021X_SHA256 : +return CRYPTO_AKM_8021X_SHA256 ; +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return CRYPTO_AKM_PSK_SHA256 ; +case IE_RSN_AKM_SUITE_TDLS : +return CRYPTO_AKM_TDLS ; +case IE_RSN_AKM_SUITE_SAE_SHA256 : +return CRYPTO_AKM_SAE_SHA256 ; +case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : +return CRYPTO_AKM_FT_OVER_SAE_SHA256 ; +case IE_RSN_AKM_SUITE_AP_PEER_KEY_SHA256 : +return CRYPTO_AKM_AP_PEER_KEY_SHA256 ; +case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256 : +return CRYPTO_AKM_8021X_SUITE_B_SHA256 ; +case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384 : +return CRYPTO_AKM_8021X_SUITE_B_SHA384 ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : +return CRYPTO_AKM_FT_OVER_8021X_SHA384 ; +case IE_RSN_AKM_SUITE_FILS_SHA256 : +return CRYPTO_AKM_FILS_SHA256 ; +case IE_RSN_AKM_SUITE_FILS_SHA384 : +return CRYPTO_AKM_FILS_SHA384 ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 : +return CRYPTO_AKM_FT_OVER_FILS_SHA256 ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : +return CRYPTO_AKM_FT_OVER_FILS_SHA384 ; +case IE_RSN_AKM_SUITE_OWE : +return CRYPTO_AKM_OWE ; +case IE_RSN_AKM_SUITE_OSEN : +return CRYPTO_AKM_OSEN ; + } + +return 0 ; +} +/* 802.11, Section 8.4.2.27.2 */ static bool ie_parse_cipher_suite (const uint8_t *data,enum ie_rsn_cipher_suite *out)
src/ie.h +2 -0
@@ -621,6 +621,8 @@ unsigned char *ie_tlv_builder_finalize(struct ie_tlv_builder *builder,uint32_t ie_rsn_cipher_suite_to_cipher (enum ie_rsn_cipher_suite suite);const char *ie_rsn_cipher_suite_to_string (enum ie_rsn_cipher_suite suite); +uint32_t ie_rsn_akm_suite_to_akm (enum ie_rsn_akm_suite akm); +int ie_parse_rsne (struct ie_tlv_iter *iter,struct ie_rsn_info *info);int ie_parse_rsne_from_data (const uint8_t *data,size_t len,struct ie_rsn_info *info);
src/netdev.c +1 -46
59 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH 2/6 nl80211util: Move nl80211_append_rsn_attributes
--- Makefile.am | 1 + src/netdev.c | 43 ++----------------------------------------- src/nl80211util.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/nl80211util.h | 4 ++++ 4 files changed, 47 insertions(+), 41 deletions(-)
Makefile.am +1 -0
@@ -407,6 +407,7 @@ tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \ src/storage.h src/storage.c \ src/common.h src/common.c \ src/band.h src/band.c \ + src/ie.h src/ie.c \ src/crypto.h src/crypto.c tools_hwsim_LDADD = $(ell_ldadd)
src/netdev.c +2 -41
61 lines not on this page · raw message
src/nl80211util.c +40 -0
@@ -32,6 +32,8 @@#include "src/nl80211util.h" #include "src/band.h" +#include "src/ie.h" +#include "src/handshake.h" #include "src/util.h" typedef bool (*attr_handler )(const void *data,uint16_t len,void *o);
@@ -687,3 +689,41 @@ int nl80211_parse_supported_frequencies(struct l_genl_attr *band_freqs,return 0 ; } + +void nl80211_append_rsn_attributes (struct l_genl_msg *msg, +struct handshake_state *hs) +{ +uint32_t nl_cipher; +uint32_t nl_akm; +uint32_t wpa_version; + + nl_cipher =ie_rsn_cipher_suite_to_cipher (hs->pairwise_cipher); +L_WARN_ON (!nl_cipher); +l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITES_PAIRWISE , +4 , &nl_cipher); + + nl_cipher =ie_rsn_cipher_suite_to_cipher (hs->group_cipher); +L_WARN_ON (!nl_cipher); +l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITE_GROUP , +4 , &nl_cipher); + +if (hs->mfp) { +uint32_t use_mfp =NL80211_MFP_REQUIRED ; + +l_genl_msg_append_attr (msg,NL80211_ATTR_USE_MFP ,4 , &use_mfp); + } + + nl_akm =ie_rsn_akm_suite_to_akm (hs->akm_suite); +L_WARN_ON (!nl_akm); +l_genl_msg_append_attr (msg,NL80211_ATTR_AKM_SUITES ,4 , &nl_akm); + +if (IE_AKM_IS_SAE (hs->akm_suite)) + wpa_version =NL80211_WPA_VERSION_3 ; +else if (hs->wpa_ie) + wpa_version =NL80211_WPA_VERSION_1 ; +else + wpa_version =NL80211_WPA_VERSION_2 ; + +l_genl_msg_append_attr (msg,NL80211_ATTR_WPA_VERSIONS , +4 , &wpa_version); +}
src/nl80211util.h +4 -0
@@ -25,6 +25,7 @@struct band_chandef ;struct scan_freq_set ;struct band_freq_attrs ; +struct handshake_state ;int nl80211_parse_attrs (struct l_genl_msg *msg,int tag, ...);
@@ -90,3 +91,6 @@ int nl80211_parse_supported_frequencies(struct l_genl_attr *band_freqs,struct scan_freq_set *supported_list, struct band_freq_attrs *list, size_t num_channels); + +void nl80211_append_rsn_attributes (struct l_genl_msg *msg, +struct handshake_state *hs);
Signature · 1 line
2.42.0
PATCH 3/6 netdev: Don't duplicate vendor_ies
In reply to Denis Kenziorvendor_ies stored in handshake_state are already added as part of netdev_populate_common_ies(), which is already invoked by netdev_build_cmd_connect().
Normally vendor_ies is NULL for OWE connections, so no IEs are duplicated as a result.
--- src/netdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
src/netdev.c +1 -6
@@ -2561,16 +2561,11 @@ static void netdev_cmd_connect_cb(struct l_genl_msg *msg, void *user_data)static bool netdev_retry_owe (struct netdev *netdev) { -struct iovec iov; -if (!owe_next_group (netdev->owe_sm))return false; - iov.iov_base = netdev->handshake->vendor_ies; - iov.iov_len = netdev->handshake->vendor_ies_len; - netdev->connect_cmd =netdev_build_cmd_connect (netdev, - netdev->handshake,NULL , &iov,1 ); + netdev->handshake,NULL ,NULL ,0 ); netdev->connect_cmd_id = l_genl_family_send(nl80211, netdev->connect_cmd,
Signature · 1 line
2.42.0
PATCH 4/6 netdev: Do not leak l_genl_msg on error
In reply to Denis KenziorIn netdev_retry_owe, if l_gen_family_send fails, the connect_cmd is never freed or reset. Fix that.
While here, use a stack variable instead of netdev member, since the use of such a member is unnecessary and confusing.
--- src/netdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
src/netdev.c +7 -6
@@ -2561,10 +2561,12 @@ static void netdev_cmd_connect_cb(struct l_genl_msg *msg, void *user_data)static bool netdev_retry_owe (struct netdev *netdev) { +struct l_genl_msg *connect_cmd; +if (!owe_next_group (netdev->owe_sm))return false; - netdev->connect_cmd =netdev_build_cmd_connect (netdev, + connect_cmd =netdev_build_cmd_connect (netdev, netdev->handshake,NULL ,NULL ,0 ); netdev->connect_cmd_id = l_genl_family_send(nl80211,
@@ -2572,12 +2574,11 @@ static bool netdev_retry_owe(struct netdev *netdev) netdev_cmd_connect_cb, netdev, NULL); -if (!netdev->connect_cmd_id) -return false; - - netdev->connect_cmd =NULL ; +if (netdev->connect_cmd_id >0 ) +return true; -return true; +l_genl_msg_unref (connect_cmd); +return false; }static void netdev_connect_event (struct l_genl_msg *msg,struct netdev *netdev)
Signature · 1 line
2.42.0
Re: [PATCH 4/6] netdev: Do not leak l_genl_msg on error
Quoted 2 lines
netdev->connect_cmd_id= l_genl_family_send(nl80211,
The send needs to also use connect_cmd, not netdev->connect_cmd. Fixed in v2.
PATCH 5/6 netdev: Fix buffer overflow with 32 character ssids
In reply to Denis Kenziorssid is declared as a 32 byte field in handshake_state, hence using it as a string which is assumed to be nul-terminated will fail for SSIDs that are 32 bytes long.
--- src/netdev.c | 3 ++- src/wiphy.c | 5 +++-- src/wiphy.h | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-)
src/netdev.c +2 -1
@@ -3527,7 +3527,8 @@ static int netdev_start_powered_mac_change(struct netdev *netdev)/* No address set in handshake, use per-network MAC generation */ if (l_memeqzero (netdev->handshake->spa,ETH_ALEN ))wiphy_generate_address_from_ssid (netdev->wiphy, - (const char *)netdev->handshake->ssid, + netdev->handshake->ssid, + netdev->handshake->ssid_len, new_addr);else memcpy (new_addr, netdev->handshake->spa,ETH_ALEN );
src/wiphy.c +3 -2
@@ -796,12 +796,13 @@ void wiphy_generate_random_address(struct wiphy *wiphy, uint8_t addr[static 6])wiphy_address_constrain (wiphy, addr); } -void wiphy_generate_address_from_ssid (struct wiphy *wiphy,const char *ssid, +void wiphy_generate_address_from_ssid (struct wiphy *wiphy, +const uint8_t *ssid,size_t ssid_len,uint8_t addr[static 6 ]) {struct l_checksum *sha =l_checksum_new (L_CHECKSUM_SHA256 ); -l_checksum_update (sha, ssid,strlen (ssid)); +l_checksum_update (sha, ssid, ssid_len);l_checksum_update (sha, wiphy->permanent_addr,sizeof (wiphy->permanent_addr));l_checksum_get_digest (sha, addr, mac_randomize_bytes);
src/wiphy.h +2 -1
@@ -146,7 +146,8 @@ const uint8_t *wiphy_get_ht_capabilities(const struct wiphy *wiphy,enum band_freq band, size_t *size);void wiphy_generate_random_address (struct wiphy *wiphy,uint8_t addr[static 6 ]); -void wiphy_generate_address_from_ssid (struct wiphy *wiphy,const char *ssid, +void wiphy_generate_address_from_ssid (struct wiphy *wiphy, +const uint8_t *ssid,size_t ssid_len,uint8_t addr[static 6 ]); int wiphy_estimate_data_rate(struct wiphy *wiphy,
Signature · 1 line
2.42.0
PATCH 6/6 erp: Fix buffer overflow for 32 byte SSIDs
In reply to Denis Kenziorssid is declared as a 32 byte field in handshake_state, hence using it as a string which is assumed to be nul-terminated will fail for SSIDs that are 32 bytes long.
--- src/eapol.c | 2 +- src/erp.c | 10 ++++++++-- src/erp.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-)
src/eapol.c +1 -1
@@ -2531,7 +2531,7 @@ static void eapol_eap_results_cb(const uint8_t *msk_data, size_t msk_len,if (sm->handshake->support_fils && emsk_data && session_id)erp_cache_add (eap_get_identity (sm->eap), session_id, session_len, emsk_data, emsk_len, - (const char *)sm->handshake->ssid); + sm->handshake->ssid, sm->handshake->ssid_len);return ;
src/erp.c +8 -2
@@ -160,13 +160,19 @@ static void erp_cache_entry_destroy(void *data)void erp_cache_add (const char *id,const void *session_id,size_t session_len,const void *emsk,size_t emsk_len, -const char *ssid) +const uint8_t *ssid,size_t ssid_len) {struct erp_cache_entry *entry;if (!unlikely (id || session_id || emsk))return ; +if (!util_ssid_is_utf8 (ssid_len, ssid)) +return ; + +if (util_ssid_is_hidden (ssid_len, ssid)) +return ; + entry = l_new(struct erp_cache_entry, 1); entry->id =l_strdup (id);
@@ -174,7 +180,7 @@ void erp_cache_add(const char *id, const void *session_id, entry->emsk_len = emsk_len; entry->session_id =l_memdup (session_id, session_len); entry->session_len = session_len; - entry->ssid =l_strdup (ssid); + entry->ssid =l_strndup ((char *) ssid, ssid_len); entry->expire_time =l_time_offset (l_time_now (),ERP_DEFAULT_KEY_LIFETIME_US );
src/erp.h +1 -1
@@ -43,7 +43,7 @@ const void *erp_get_rmsk(struct erp_state *erp, size_t *rmsk_len);void erp_cache_add (const char *id,const void *session_id,size_t session_len,const void *emsk,size_t emsk_len, -const char *ssid); +const uint8_t *ssid,size_t ssid_len);void erp_cache_remove (const char *id);
Signature · 1 line
2.42.0