[gPXE git] mainline commit to master: [wpa] Remove PMKID checking

[git at etherboot.org]

In the Main gPXE repository, branch master has been updated.
      adds  9b0e589 [wpa] Remove PMKID checking
      from  4c61f2a [comboot] Propagate carry flag from COMBOOT API

Summary of changes:
 src/net/80211/wpa.c |   64 ---------------------------------------------------
 1 files changed, 0 insertions(+), 64 deletions(-)


- Log -----------------------------------------------------------------
------
commit 9b0e589b0bd07b6fb6e79b7f536a9dda2245a232
Author: Joshua Oreman <oremanj at rwcr.net>
Date: Tue May 18 23:39:32 2010 -0400
Committer: Joshua Oreman <oremanj at rwcr.net>

[wpa] Remove PMKID checking

PMKID checking is an additional pre-check that helps detect invalid passphrases
before going through the full handshaking procedure. It takes up some amount of
code size, and is not necessary from a security perspective. It also is
implemented improperly by some routers, which was causing gPXE to give spurious
authentication errors. Remove it for these reasons.

Signed-off-by: Joshua Oreman <oremanj at rwcr.net>

diff --git a/src/net/80211/wpa.c b/src/net/80211/wpa.c
index 9bac8fe..2d74b85 100644
--- a/src/net/80211/wpa.c
+++ b/src/net/80211/wpa.c
@@ -269,44 +269,6 @@ void wpa_stop ( struct net80211_device *dev )
 
 
 /**
- * Check PMKID consistency
- *
- * @v ctx	WPA common context
- * @v pmkid	PMKID to check against (16 bytes long)
- * @ret rc	Zero if they match, or a negative error code if not
- */
-int wpa_check_pmkid ( struct wpa_common_ctx *ctx, const u8 *pmkid )
-{
-	u8 sha1_ctx[SHA1_CTX_SIZE];
-	u8 my_pmkid[SHA1_SIZE];
-	u8 pmk[ctx->pmk_len];
-	size_t pmk_len;
-	struct {
-		char name[8];
-		u8 aa[ETH_ALEN];
-		u8 spa[ETH_ALEN];
-	} __attribute__ (( packed )) pmkid_data;
-
-	memcpy ( pmk, ctx->pmk, ctx->pmk_len );
-	pmk_len = ctx->pmk_len;
-
-	memcpy ( pmkid_data.name, "PMK Name", 8 );
-	memcpy ( pmkid_data.aa, ctx->dev->bssid, ETH_ALEN );
-	memcpy ( pmkid_data.spa, ctx->dev->netdev->ll_addr, ETH_ALEN );
-
-	hmac_init ( &sha1_algorithm, sha1_ctx, pmk, &pmk_len );
-	hmac_update ( &sha1_algorithm, sha1_ctx, &pmkid_data,
-		      sizeof ( pmkid_data ) );
-	hmac_final ( &sha1_algorithm, sha1_ctx, pmk, &pmk_len, my_pmkid );
-
-	if ( memcmp ( my_pmkid, pmkid, WPA_PMKID_LEN ) != 0 )
-		return -EACCES;
-
-	return 0;
-}
-
-
-/**
  * Derive pairwise transient key
  *
  * @v ctx	WPA common context
@@ -546,8 +508,6 @@ static int wpa_handle_1_of_4 ( struct wpa_common_ctx *ctx,
 			       struct eapol_key_pkt *pkt, int is_rsn,
 			       struct wpa_kie *kie )
 {
-	int rc;
-
 	if ( ctx->state == WPA_WAITING )
 		return -EINVAL;
 
@@ -558,30 +518,6 @@ static int wpa_handle_1_of_4 ( struct wpa_common_ctx *ctx,
 		ctx->have_Snonce = 1;
 	}
 
-	if ( is_rsn && pkt->datalen ) {
-		union ieee80211_ie *ie = ( union ieee80211_ie * ) pkt->data;
-		void *ie_end = pkt->data + pkt->datalen;
-
-		if ( ! ieee80211_ie_bound ( ie, ie_end ) ) {
-			DBGC ( ctx, "WPA %p: malformed PMKID KDE\n", ctx );
-			return wpa_fail ( ctx, -EINVAL );
-		}
-
-		while ( ie ) {
-			if ( ie->id == IEEE80211_IE_VENDOR &&
-			     ie->vendor.oui == WPA_KDE_PMKID ) {
-				rc = wpa_check_pmkid ( ctx, ie->vendor.data );
-				if ( rc < 0 ) {
-					DBGC ( ctx, "WPA %p ALERT: PMKID "
-					       "mismatch in 1/4\n", ctx );
-					return wpa_fail ( ctx, rc );
-				}
-			}
-
-			ie = ieee80211_next_ie ( ie, ie_end );
-		}
-	}
-
 	DBGC ( ctx, "WPA %p: received 1/4, looks OK\n", ctx );
 
 	wpa_derive_ptk ( ctx );
-----------------------------------------------------------------------


-- 
Main gPXE repository