From e1f2336eb3199b622ef2922cefa00bcddd456f87 Mon Sep 17 00:00:00 2001 From: damien Date: Tue, 12 Aug 2008 18:41:18 +0000 Subject: [PATCH] the only integrity group cipher currently supported is AES-128-CMAC. --- sys/net80211/ieee80211_crypto.c | 5 ++++- sys/net80211/ieee80211_node.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 688190082e5..743d16cde8f 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_crypto.c,v 1.47 2008/08/12 18:01:41 damien Exp $ */ +/* $OpenBSD: ieee80211_crypto.c,v 1.48 2008/08/12 18:41:18 damien Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini @@ -67,6 +67,7 @@ ieee80211_crypto_attach(struct ifnet *ifp) ic->ic_rsnciphers = IEEE80211_CIPHER_TKIP | IEEE80211_CIPHER_CCMP; ic->ic_rsngroupcipher = IEEE80211_CIPHER_TKIP; + ic->ic_rsngroupmgmtcipher = IEEE80211_CIPHER_AES128_CMAC; } ic->ic_set_key = ieee80211_set_key; ic->ic_delete_key = ieee80211_delete_key; @@ -103,6 +104,8 @@ ieee80211_cipher_keylen(enum ieee80211_cipher cipher) return 16; case IEEE80211_CIPHER_WEP104: return 13; + case IEEE80211_CIPHER_AES128_CMAC: + return 16; default: /* unknown cipher */ return 0; } diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index cbae4d9d602..ee8b5d78420 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.c,v 1.40 2008/08/12 18:37:23 damien Exp $ */ +/* $OpenBSD: ieee80211_node.c,v 1.41 2008/08/12 18:41:18 damien Exp $ */ /* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */ /*- @@ -313,6 +313,7 @@ ieee80211_create_ibss(struct ieee80211com* ic, struct ieee80211_channel *chan) ni->ni_rsnakms = ic->ic_rsnakms; ni->ni_rsnciphers = ic->ic_rsnciphers; ni->ni_rsngroupcipher = ic->ic_rsngroupcipher; + ni->ni_rsngroupmgmtcipher = ic->ic_rsngroupmgmtcipher; ni->ni_rsncaps = 0; ic->ic_def_txkey = 1; -- 2.20.1