fixed separator of 16801 (-Z) hash file - removed ESSID check, because we do not need an ESSID for this hashmode
@@ -1340,95 +1340,30 @@ if(hcpmkidboutname != NULL)
writtencount = 0;
zeiger = pmkidliste;
for(c = 0; c < pmkidcount; c++)
- {
- zeigeressid = apstaessidliste;
- essidchangecount = 0;
- memset(&essidold, 0,32);
- essidok = 0;
- for(d = 0; d < apstaessidcount; d++)
- {
- if((memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0) && (zeigeressid->status != 2))
- {
- if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
for(p = 0; p < 16; p++)
{
fprintf(fhoutlist, "%02x", zeiger->pmkid[p]);
}
- fprintf(fhoutlist, ":");
- for(p = 0; p < 6; p++)
- {
- fprintf(fhoutlist, "%02x", zeiger->mac_ap[p]);
- }
- fprintf(fhoutlist, ":");
- for(p = 0; p < 6; p++)
- {
- fprintf(fhoutlist, "%02x", zeiger->mac_sta[p]);
- }
- fprintf(fhoutlist, "\n");
- writtencount++;
- essidchangecount++;
- memset(&essidold, 0,32);
- memcpy(&essidold, zeigeressid->essid, zeigeressid->essidlen);
- essidok = 1;
- }
- }
- if(memcmp(zeigeressid->mac_ap, zeiger->mac_ap, 6) > 0)
- {
- break;
- }
- zeigeressid++;
- }
- if(essidok == 0)
- {
- zeigeressid = apstaessidliste;
- for(d = 0; d < apstaessidcount; d++)
- {
- if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
- {
- if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
- {
- for(p = 0; p < 16; p++)
- {
- fprintf(fhoutlist, "%02x", zeiger->pmkid[p]);
- }
- fprintf(fhoutlist, ":");
+ fprintf(fhoutlist, "*");
for(p = 0; p < 6; p++)
{
fprintf(fhoutlist, "%02x", zeiger->mac_ap[p]);
}
- fprintf(fhoutlist, ":");
+ fprintf(fhoutlist, "*");
for(p = 0; p < 6; p++)
{
fprintf(fhoutlist, "%02x", zeiger->mac_sta[p]);
}
fprintf(fhoutlist, "\n");
writtencount++;
- essidchangecount++;
- memset(&essidold, 0,32);
- memcpy(&essidold, zeigeressid->essid, zeigeressid->essidlen);
- }
- }
- if(memcmp(zeigeressid->mac_ap, zeiger->mac_ap, 6) > 0)
- {
- break;
- }
- zeigeressid++;
- }
- }
zeiger++;
}
fclose(fhoutlist);
removeemptyfile(hcpmkidboutname);
- if(essidchangecount > 1)
- {
- printf("%llu ESSID changes detected\n", essidchangecount);
- }
printf("%llu PMKID(s) written to %s\n", writtencount, hcpmkidboutname);
}
}
-
-
return;
}
/*===========================================================================*/
