github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 18:48:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sha

Browse source
This commit is contained in:
Iceman 2022-02-25 11:42:20 +01:00 • committed by GitHub
commit 1c6abece54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 726 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/mfd_aes_brute/mfd_multi_brute.c
View file

@ -365,6 +365,13 @@ int main(int argc, char *argv[]) {
}
uint8_t g_idx = atoi(argv[2]);
// -2 (zero index and last item is NULL);
if (g_idx > ARRAYLEN(generators) - 2) {
printf("generator index is out-of-range\n");
return 1;
}
uint64_t start_time = atoi(argv[3]);
const bool support_aesni = platform_aes_hw_available();

2
tools/pm3_tests.sh
View file

@ -445,7 +445,7 @@ while true; do
"Indala (len 224) Raw: 80000001b23523a6c2e31eba3cbee4afb3c6ad1fcf649393928c14e5"; then break; fi
if ! CheckExecute slow "lf T55 io test" "$CLIENTBIN -c 'data load -f traces/lf_ATA5577_io.pm3; lf search -1'" "IO Prox ID found"; then break; fi
if ! CheckExecute slow "lf T55 io test2" "$CLIENTBIN -c 'data load -f traces/lf_ATA5577_io.pm3; lf io demod'" \
"IO Prox - XSF(01)01:01337, Raw: 007840603059cf3f (ok)"; then break; fi
"IO Prox - XSF(01)01:01337, Raw: 007840603059cf3f ( ok )"; then break; fi
if ! CheckExecute slow "lf T55 jablotron test" "$CLIENTBIN -c 'data load -f traces/lf_ATA5577_jablotron.pm3; lf search -1'" "Jablotron ID found"; then break; fi
if ! CheckExecute slow "lf T55 jablotron test2" "$CLIENTBIN -c 'data load -f traces/lf_ATA5577_jablotron.pm3; lf jablotron demod'" \
"Printed: 1410-00-0011-2233"; then break; fi