skip raw detection of raw handshakes if no raw option is selected
bool hexmodeflag;
bool verboseflag;
bool fcsflag;
+bool wantrawflag;
unsigned long long int maxtvdiff;
unsigned long long int maxrcdiff;
@@ -143,6 +144,7 @@ pmkoutname = NULL;
identityoutname = NULL;
verboseflag = false;
hexmodeflag = false;
+wantrawflag = false;
maxtvdiff = MAX_TV_DIFF;
maxrcdiff = MAX_RC_DIFF;
@@ -1282,11 +1284,14 @@ for(c = 0; c < eapolcount; c++)
if((memcmp(zeigerea->mac_ap, zeigereo->mac_ap, 6) == 0) && (memcmp(zeigerea->mac_sta, zeigereo->mac_sta, 6) == 0))
{
addhandshake(lltimeea, zeigerea, lltimeeo, zeigereo, timegap, rcgap);
+ if(wantrawflag == true)
+ {
addrawhandshake(lltimeea, zeigerea, lltimeeo, zeigereo, timegap, rcgap);
}
}
}
}
+ }
for(d = 1; d < eapolcount -c; d++)
{
zeigereo = zeigerea +d;
@@ -1318,12 +1323,15 @@ for(c = 0; c < eapolcount; c++)
if((memcmp(zeigerea->mac_ap, zeigereo->mac_ap, 6) == 0) && (memcmp(zeigerea->mac_sta, zeigereo->mac_sta, 6) == 0))
{
addhandshake(lltimeea, zeigerea, lltimeeo, zeigereo, timegap, rcgap);
+ if(wantrawflag == true)
+ {
addrawhandshake(lltimeea, zeigerea, lltimeeo, zeigereo, timegap, rcgap);
}
}
}
}
}
+ }
zeigerea++;
}
@@ -2576,6 +2584,7 @@ while((auswahl = getopt_long (argc, argv, short_options, long_options, &index))
case HCXT_HCCAPX_OUT_RAW:
hccapxrawoutname = optarg;
verboseflag = true;
+ wantrawflag = true;
break;
case HCXT_HCCAP_OUT:
@@ -2586,6 +2595,7 @@ while((auswahl = getopt_long (argc, argv, short_options, long_options, &index))
case HCXT_HCCAP_OUT_RAW:
hccaprawoutname = optarg;
verboseflag = true;
+ wantrawflag = true;
break;
case HCXT_JOHN_OUT:
@@ -2596,6 +2606,7 @@ while((auswahl = getopt_long (argc, argv, short_options, long_options, &index))
case HCXT_JOHN_OUT_RAW:
johnrawoutname = optarg;
verboseflag = true;
+ wantrawflag = true;
break;
case HCXT_ESSID_OUT:
