jarjar/mfoc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -C option

Browse Source
This commit is contained in:
Daniel Seiller 2019-08-14 00:31:41 +02:00
parent 27c8490fd2
commit 64069b3231
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mfoc.c
View File

@ -132,7 +132,7 @@ int main(int argc, char *const argv[])
char line[20]; char line[20];
char * read; char * read;
bool do_clear=false; bool use_default_key=true;
//Regexp declarations //Regexp declarations
static const char *regex = "([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])"; static const char *regex = "([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])";
struct slre_cap caps[2]; struct slre_cap caps[2];
@ -141,8 +141,7 @@ int main(int argc, char *const argv[])
while ((ch = getopt(argc, argv, "hCD:s:BP:T:S:O:k:t:f")) != -1) { while ((ch = getopt(argc, argv, "hCD:s:BP:T:S:O:k:t:f")) != -1) {
switch (ch) { switch (ch) {
case 'C': case 'C':
defKeys=malloc(0); use_default_key=false;
defKeys_len=0;
break; break;
case 'P': case 'P':
// Number of probes // Number of probes
@ -349,6 +348,9 @@ int main(int argc, char *const argv[])
memcpy(mp.mpa.abtAuthUid, t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, sizeof(mp.mpa.abtAuthUid)); memcpy(mp.mpa.abtAuthUid, t.nt.nti.nai.abtUid + t.nt.nti.nai.szUidLen - 4, sizeof(mp.mpa.abtAuthUid));
// Iterate over all keys (n = number of keys) // Iterate over all keys (n = number of keys)
n = sizeof(defaultKeys) / sizeof(defaultKeys[0]); n = sizeof(defaultKeys) / sizeof(defaultKeys[0]);
if (!use_default_key) {
n=0;
}
size_t defKey_bytes_todo = defKeys_len; size_t defKey_bytes_todo = defKeys_len;
key = 0; key = 0;
while (key < n || defKey_bytes_todo) { while (key < n || defKey_bytes_todo) {