From: damien <damien@openbsd.org>
Date: Tue, 12 Aug 2008 19:34:35 +0000 (+0000)
Subject: v3 descriptors use AES Key Wrap too.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=35da4ec2f0e47234dd5d56018ec1d4338eaa2372;p=openbsd

v3 descriptors use AES Key Wrap too.
---

diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index f86e5ac4e9f..2d1f5bc4173 100644
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_pae_output.c,v 1.9 2008/08/12 19:29:07 damien Exp $	*/
+/*	$OpenBSD: ieee80211_pae_output.c,v 1.10 2008/08/12 19:34:35 damien Exp $	*/
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -112,7 +112,7 @@ ieee80211_send_eapol_key(struct ieee80211com *ic, struct mbuf *m,
 		}
 		ieee80211_eapol_key_encrypt(ic, key, ptk->kek);
 
-		if ((info & EAPOL_KEY_VERSION_MASK) == EAPOL_KEY_DESC_V2) {
+		if ((info & EAPOL_KEY_VERSION_MASK) != EAPOL_KEY_DESC_V1) {
 			/* AES Key Wrap adds 8 bytes + padding */
 			m->m_pkthdr.len = m->m_len =
 			    sizeof(*eh) + 4 + BE_READ_2(key->len);