wlan: Add field to RSN IE when PMF is enabled
When Protected Management Frames (PMF, 802.11w)
is enabled on a connection, then there is a field added
to the RSN IE, the Group Management Cipher Suite
field. This field is placed in the RSN IE by the supplicant.
But, when LFR is enabled, the host driver constructs
the RSN IE for Assoc Req itself. This change modifies
the driver so that this new field is added to the RSN IE
when PMF is enabled for the connection.
Change-Id: I815f0ddff70a1190745f4545e364ae79f2ad84f8
CRs-Fixed: 452558
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index b45c087..2a6bc63 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -3743,6 +3743,9 @@
tCsrRSNCapabilities RSNCapabilities;
tCsrRSNPMKIe *pPMK;
tANI_U8 PMKId[CSR_RSN_PMKID_SIZE];
+#ifdef WLAN_FEATURE_11W
+ tANI_U8 *pGroupMgmtCipherSuite;
+#endif
tDot11fBeaconIEs *pIesLocal = pIes;
smsLog(pMac, LOGW, "%s called...", __func__);
@@ -3802,10 +3805,20 @@
pPMK->cPMKIDs = 0;
}
+#ifdef WLAN_FEATURE_11W
+ if ( pProfile->MFPEnabled )
+ {
+ pGroupMgmtCipherSuite = (tANI_U8 *) pPMK + sizeof ( tANI_U16 ) +
+ ( pPMK->cPMKIDs * CSR_RSN_PMKID_SIZE );
+ palCopyMemory( pMac->hHdd, pGroupMgmtCipherSuite, csrRSNOui[07], CSR_WPA_OUI_SIZE );
+ }
+#endif
+
// Add in the fixed fields plus 1 Unicast cypher, less the IE Header length
// Add in the size of the Auth suite (count plus a single OUI)
// Add in the RSN caps field.
// Add PMKID count and PMKID (if any)
+ // Add group management cipher suite
pRSNIe->IeHeader.Length = (tANI_U8) (sizeof( *pRSNIe ) - sizeof ( pRSNIe->IeHeader ) +
sizeof( *pAuthSuite ) +
sizeof( tCsrRSNCapabilities ));
@@ -3814,6 +3827,15 @@
pRSNIe->IeHeader.Length += (tANI_U8)(sizeof( tANI_U16 ) +
(pPMK->cPMKIDs * CSR_RSN_PMKID_SIZE));
}
+#ifdef WLAN_FEATURE_11W
+ if ( pProfile->MFPEnabled )
+ {
+ if ( 0 == pPMK->cPMKIDs )
+ pRSNIe->IeHeader.Length += sizeof( tANI_U16 );
+ pRSNIe->IeHeader.Length += CSR_WPA_OUI_SIZE;
+ }
+#endif
+
// return the size of the IE header (total) constructed...
cbRSNIe = pRSNIe->IeHeader.Length + sizeof( pRSNIe->IeHeader );