diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-08-12 19:29:08 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-08-12 19:29:08 +0000 |
| commit | 8972bfc0d22e8b7c5ba29982fdd4256f124523f9 (patch) | |
| tree | b13e2085afaeef5975e7c034baefef0e733194b2 /sys/net80211/ieee80211_output.c | |
| parent | 5c58008f09042dd846a8f0fc982fa2920754ac6c (diff) | |
new SHA-256 based AKMPs.
Diffstat (limited to 'sys/net80211/ieee80211_output.c')
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index b794ced62fb..8202ae6a7ad 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.68 2008/08/12 19:21:04 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.69 2008/08/12 19:29:07 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -867,7 +867,7 @@ ieee80211_add_rsn_body(u_int8_t *frm, struct ieee80211com *ic, pcount = frm; frm += 2; count = 0; /* write AKM Suite List (see Table 20dc) */ - if (ni->ni_rsnakms & IEEE80211_AKM_IEEE8021X) { + if (ni->ni_rsnakms & IEEE80211_AKM_8021X) { memcpy(frm, oui, 3); frm += 3; *frm++ = 1; count++; @@ -877,6 +877,16 @@ ieee80211_add_rsn_body(u_int8_t *frm, struct ieee80211com *ic, *frm++ = 2; count++; } + if (ni->ni_rsnakms & IEEE80211_AKM_SHA256_8021X) { + memcpy(frm, oui, 3); frm += 3; + *frm++ = 5; + count++; + } + if (ni->ni_rsnakms & IEEE80211_AKM_SHA256_PSK) { + memcpy(frm, oui, 3); frm += 3; + *frm++ = 6; + count++; + } /* write AKM Suite List Count field */ LE_WRITE_2(pcount, count); |