cleanup

Author: =

changelog

@@ -1,6 +1,6 @@
 25.03.2026
 ==========
-hcxpcapngtool: added full conversion of FT-PSK EAPOL (hashcat mode 37100)
+hcxpcapngtool: added full conversion of FT-PSK PMKID and EAPOL(hashcat mode 37100)
 -f <file> : output WPA-PBKDF2-PMKID+EAPOL hash file (hashcat -m 37100)
             get full advantage of reuse of PBKDF2 on PMKID and EAPOL
 

hcxpcapngtool.c

@@ -35,8 +35,8 @@
 #define BIG_ENDIAN_HOST
 #endif
 
-#include "include/hcxpcapngtool.h"
 #include "include/ieee80211.c"
+#include "include/hcxpcapngtool.h"
 #include "include/strings.c"
 #include "include/byteops.c"
 #include "include/fileops.c"
@@ -3178,7 +3178,7 @@ if((fbsstseptr0->len == 0) || (fbsstseptr0->len >FTR0KHID_LEN)) return false;
 
 fbsstseptr1 = (fbsstse_t*)(ieptr + FBSST_SIZE + FBSSTSE_SIZE + fbsstseptr0->len);
 if(fbsstseptr1->id != 3) return false;
-if((fbsstseptr1->len == 0) || (fbsstseptr1->len > FTR1KHID_MAXLEN)) return false;
+if((fbsstseptr1->len == 0) || (fbsstseptr1->len > FTR1KHID_LEN_MAX)) return false;
 if(vendorlen < (int)(FBSST_SIZE + FBSSTSE_SIZE + fbsstseptr0->len + fbsstseptr1->len)) return false;
 
 zeiger->r0khidlen = fbsstseptr0->len;

include/hcxpcapngtool.h

@@ -96,7 +96,6 @@
 #define GHZ5				2
 /*===========================================================================*/
 /*===========================================================================*/
-#define RXHKID		0xff
 struct tags_s
 {
  uint8_t		channel;
@@ -131,9 +130,9 @@ struct tags_s
  uint8_t		mdidlen;
  uint16_t		mdid;
  uint8_t		r0khidlen;
- uint8_t		r0khid[RXHKID];
+ uint8_t		r0khid[FTR0KHID_LEN];
  uint8_t		r1khidlen;
- uint8_t		r1khid[RXHKID];
+ uint8_t		r1khid[FTR1KHID_LEN_MAX];
  uint8_t		wpsinfo;
  char			country[2];
  uint8_t		essidlen;
@@ -293,9 +292,9 @@ struct messagelist_s
  uint8_t		mdidlen;
  uint16_t		mdid;
  uint8_t		r0khidlen;
- uint8_t		r0khid[RXHKID];
+ uint8_t		r0khid[FTR0KHID_LEN];
  uint8_t		r1khidlen;
- uint8_t		r1khid[RXHKID];
+ uint8_t		r1khid[FTR1KHID_LEN_MAX];
  uint16_t		eapauthlen;
  uint8_t		eapol[EAPOL_AUTHLEN_MAX];
 
@@ -329,9 +328,9 @@ struct handshakelist_s
  uint8_t		mdidlen;
  uint16_t		mdid;
  uint8_t		r0khidlen;
- uint8_t		r0khid[RXHKID];
+ uint8_t		r0khid[FTR0KHID_LEN];
  uint8_t		r1khidlen;
- uint8_t		r1khid[RXHKID];
+ uint8_t		r1khid[FTR1KHID_LEN_MAX];
  uint16_t		eapauthlen;
  uint8_t		eapol[256];
 };
@@ -396,9 +395,9 @@ struct pmkidlist_s
  uint8_t		mdidlen;
  uint16_t		mdid;
  uint8_t		r0khidlen;
- uint8_t		r0khid[RXHKID];
+ uint8_t		r0khid[FTR0KHID_LEN];
  uint8_t		r1khidlen;
- uint8_t		r1khid[RXHKID];
+ uint8_t		r1khid[FTR1KHID_LEN_MAX];
 };
 typedef struct pmkidlist_s pmkidlist_t;
 #define	PMKIDLIST_SIZE (sizeof(pmkidlist_t))

include/ieee80211.h

@@ -464,7 +464,7 @@ typedef struct fbsst_tag fbsst_t;
 #define	FBSST_SIZE offsetof(fbsst_t, subelement)
 /*===========================================================================*/
 #define FTR0KHID_LEN		6
-#define FTR1KHID_MAXLEN		48
+#define FTR1KHID_LEN_MAX	48
 struct fbsstse_tag
 {
  uint8_t			id;