Page MenuHomeFreeBSD
Files F112481850

D49392.id.diff
No OneTemporary
Actions

D49392.id.diff
View Options

diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.h
@@ -240,8 +240,24 @@
struct mbuf *, int, struct ieee80211_key **);
int ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
struct mbuf *, int);
-/*
- * Add any MIC.
+/**
+ * @brief Add any pre-fragmentation MIC to an MSDU.
+ *
+ * This is called /before/ defragmentation. Crypto types that implement
+ * a MIC/ICV check per MSDU will not implement this function.
+ *
+ * As an example, TKIP implements a Michael MIC check over the entire
+ * unencrypted MSDU before fragmenting it into MPDUs and passing each
+ * MPDU to be separately encrypted with their own MIC/ICV.
+ *
+ * Please see 802.11-2020 12.5.2.1.2 (TKIP cryptographic encapsulation)
+ * for more information.
+ *
+ * @param vap the current VAP
+ * @param k the current key
+ * @param m the mbuf representing the MSDU
+ * @param f set to 1 to force a MSDU MIC check, even if HW encrypted
+ * @returns 0 if error / MIC encap failed, 1 if OK
*/
static __inline int
ieee80211_crypto_enmic(struct ieee80211vap *vap,
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -773,8 +773,22 @@
#undef IEEE80211_WEP_HDRLEN
}
-/*
- * Check and remove any MIC.
+/**
+ * @brief Check and remove any post-defragmentation MIC from an MSDU.
+ *
+ * This is called /after/ defragmentation. Crypto types that implement
+ * a MIC/ICV check per MSDU will not implement this function.
+ *
+ * As an example, TKIP decapsulation covers both MIC/ICV checks per
+ * MPDU (the "WEP" ICV) and then a Michael MIC verification on the
+ * defragmented MSDU. Please see 802.11-2020 12.5.2.1.3 (TKIP decapsulation)
+ * for more information.
+ *
+ * @param vap the current VAP
+ * @param k the current key
+ * @param m the mbuf representing the MSDU
+ * @param f set to 1 to force a MSDU MIC check, even if HW decrypted
+ * @returns 0 if error / MIC check failed, 1 if OK
*/
int
ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 3:43 PM (17 m, 30 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17197421
Default Alt Text
D49392.id.diff (2 KB)

Event Timeline