|
@@ -138,6 +138,8 @@
|
138
|
138
|
# include <byteswap.h>
|
139
|
139
|
#endif
|
140
|
140
|
|
|
141
|
+#include "log.h"
|
|
142
|
+
|
141
|
143
|
#if defined (__GNUC__)
|
142
|
144
|
# define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__ * 10)
|
143
|
145
|
# if GCC_VERSION >= 430
|
|
@@ -652,6 +654,7 @@ static uint32_t mfcuk_key_recovery_block(nfc_device *pnd, uint32_t uiUID, uint64
|
652
|
654
|
crypto1_get_lfsr(current_state, &key_recovered);
|
653
|
655
|
|
654
|
656
|
if (bfOpts['v'] && (verboseLevel > 1)) {
|
|
657
|
+ log_key(uiBlock, key_recovered);
|
655
|
658
|
printf("\nINFO: block %d recovered KEY: %012"PRIx64"\n", uiBlock, key_recovered);
|
656
|
659
|
}
|
657
|
660
|
|
|
@@ -1650,7 +1653,9 @@ int main(int argc, char *argv[])
|
1650
|
1653
|
mfcuk_darkside_select_tag(pnd, iSleepAtFieldOFF, iSleepAfterFieldON, &ti.nti);
|
1651
|
1654
|
|
1652
|
1655
|
// Print usefull/useless info (sort-of "Let me entertain you!")
|
1653
|
|
- if (bfOpts['v'] && (verboseLevel > 2)) {
|
|
1656
|
+ log_progress(tag_recover_verify.uid, tag_recover_verify.type,
|
|
1657
|
+ crntRecovKey, block, numSpoofEntries, numAuthAttempts);
|
|
1658
|
+ if (bfOpts['v'] && (verboseLevel > 3)) {
|
1654
|
1659
|
printf("\n-----------------------------------------------------\n");
|
1655
|
1660
|
printf("Let me entertain you!\n");
|
1656
|
1661
|
printf(" uid: %08x\n", tag_recover_verify.uid);
|