Skip to content

Commit 2188231

Browse files
author
=
committed
better explanation of M1M2 E2 and M2M3 E2
1 parent bddf38b commit 2188231

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

hcxhashtool.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1368,8 +1368,8 @@ if(zeiger->type == HCX_TYPE_EAPOL)
13681368
else fprintf(fh_pmkideapol, "NC INFO....: NC not detected\n");
13691369
keyinfo = (getkeyinfo(ntohs(wpak->keyinfo)));
13701370
fprintf(fh_pmkideapol, "EAPOL MSG..: %d\n", keyinfo);
1371-
if((zeiger->mp & 0x07) == 0x00) fprintf(fh_pmkideapol, "MP M1M2 E2.: challenge\n");
1372-
if((zeiger->mp & 0x07) == 0x02) fprintf(fh_pmkideapol, "MP M2M3 E2.: challenge / authorized (depends on RC value & sequence number)\n");
1371+
if((zeiger->mp & 0x07) == 0x00) fprintf(fh_pmkideapol, "MP M1M2 E2.: challenge - ANONCE from M1\n");
1372+
if((zeiger->mp & 0x07) == 0x02) fprintf(fh_pmkideapol, "MP M2M3 E2.: authorized - ANONCE from M3)\n");
13731373
if((zeiger->mp & 0x07) == 0x01) fprintf(fh_pmkideapol, "MP M1M4 E4.: authorized\n");
13741374
if((zeiger->mp & 0x07) == 0x03) fprintf(fh_pmkideapol, "MP M2M3 E3.: authorized\n");
13751375
if((zeiger->mp & 0x07) == 0x04) fprintf(fh_pmkideapol, "MP M3M4 E3.: authorized\n");

hcxpcapngtool.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,8 @@ if(eapolwrittenhcpxcountdeprecated > 0) fprintf(stdout, "EAPOL pairs written to
865865
if(eapolncwrittenhcpxcountdeprecated > 0) fprintf(stdout, "EAPOL pairs written to old format hccapx.: %ld (RC not checked)\n", eapolncwrittenhcpxcountdeprecated);
866866
if(eapolwrittenhcpcountdeprecated > 0) fprintf(stdout, "EAPOL pairs written to old format hccap..: %ld (RC checked)\n", eapolwrittenhcpcountdeprecated);
867867
if(eapolwrittenjcountdeprecated > 0) fprintf(stdout, "EAPOL pairs written to old format JtR....: %ld (RC checked)\n", eapolwrittenjcountdeprecated);
868-
if(eapolm12e2count > 0) fprintf(stdout, "EAPOL M12E2 (challenge)..................: %ld\n", eapolm12e2count);
869-
if(eapolm32e2count > 0) fprintf(stdout, "EAPOL M32E2 (challenge / authorized).....: %ld (depends on RC value & sequence number)\n", eapolm32e2count);
868+
if(eapolm12e2count > 0) fprintf(stdout, "EAPOL M12E2 (challenge - ANONCE from M1).: %ld\n", eapolm12e2count);
869+
if(eapolm32e2count > 0) fprintf(stdout, "EAPOL M32E2 (authorized - ANONCE from M3): %ld\n", eapolm32e2count);
870870
if(eapolm14e4count > 0) fprintf(stdout, "EAPOL M14E4 (authorized).................: %ld\n", eapolm14e4count);
871871
if(eapolm32e3count > 0) fprintf(stdout, "EAPOL M32E3 (authorized).................: %ld\n", eapolm32e3count);
872872
if(eapolm34e3count > 0) fprintf(stdout, "EAPOL M34E3 (authorized).................: %ld\n", eapolm34e3count);
@@ -6342,9 +6342,9 @@ fprintf(stdout, "--prefix=<file> : convert everything to list
63426342
"\n"
63436343
"bitmask of EAPOL hash line (WPA*02) message pair field:\n"
63446344
"2,1,0:\n"
6345-
" 000 = M1+M2, EAPOL from M2 (challenge)\n"
6345+
" 000 = M1+M2, EAPOL from M2 (challenge - ANONCE from M1)\n"
63466346
" 001 = M1+M4, EAPOL from M4 (authorized) - usable if NONCE_CLIENT is not zeroed \n"
6347-
" 010 = M2+M3, EAPOL from M2 (challenge / authorized depending on RC value & sequence number)\n"
6347+
" 010 = M2+M3, EAPOL from M2 (authorized - ANONCE from M3)\n"
63486348
" 011 = M2+M3, EAPOL from M3 (authorized) - usable by option --all\n"
63496349
" 100 = M3+M4, EAPOL from M3 (authorized) - usable by option --all\n"
63506350
" 101 = M3+M4, EAPOL from M4 (authorized) - usable if NONCE_CLIENT is not zeroed\n"

0 commit comments

Comments
 (0)