Commit graph

1948 commits

Author SHA1 Message Date
Henrik Johansson
52244230d3 hitag2 write (#310)
Usage is similar to hitagS write: lf hitag write 24 KEY pagenumber 32bitvalue
* added changlelog entry
2017-07-05 20:16:54 +02:00
marshmellow42
979c76556a fix some iclass reader bugs (#350)
endless loop in reader if no tag was found
button press on pm3 did not cancel.
led_b was left on in some cases
also moved 14b detection to last in hf search to help speed up the
command for the other tags.  14b is slow (does multiple tests)
Thanks to @Fl0-0 and @pwpiwi for their idenfication of some of the
issues.
2017-07-05 18:11:48 +02:00
Iceman
ebe9a3ba04 Merge pull request #347 from Fl0-0/master
LF EM410x bruteforce typo errors correction
2017-07-03 09:34:48 +02:00
Fl0-0
cea3dc4e9e Fix typo in helps 2017-07-03 09:16:28 +02:00
Fl0-0
e8e2cfd0f1 missing a c in the helptext sample 2017-07-03 08:56:36 +02:00
Iceman
fe8157d59e Merge pull request #343 from Fl0-0/master
LF EM410x bruteforcing function by simulating EM410x tags (1 UID/s)
2017-07-03 08:56:19 +02:00
Fl0-0
1dc0500b36 Update changelog 2017-07-03 08:04:24 +02:00
Fl0-0
2ed09d15e4 Merge remote-tracking branch 'upstream/master' 2017-07-02 17:54:35 +02:00
Fl0-0
c109ac9f65 Identation fix 2017-07-01 22:36:49 +02:00
Fl0-0
634a55aa17 Identation fix 2017-07-01 22:35:49 +02:00
Fl0-0
f800241260 Identation 2017-07-01 22:32:49 +02:00
Fl0-0
553bbf59b6 Use param_get32ex() and add c for clock parameter 2017-07-01 22:31:06 +02:00
Iceman
138927dd7b Merge pull request #345 from pwpiwi/hardnested_compress
hardnested: dramatically reduce required disk space for tables
2017-07-01 21:22:55 +02:00
Fl0-0
2e39af0739 Fix typo error 2017-07-01 19:49:02 +02:00
root
539337a7d2 EM410x bruteforcing changes: Load the whole file at once, pause delay as parameter, stop the execution on key press and EM410x conversion to signal function. 2017-07-01 17:53:06 +02:00
root
30e37e973d Merge remote-tracking branch 'upstream/master' 2017-07-01 13:57:30 +02:00
Iceman
1cbb352b71 Merge pull request #344 from pwpiwi/RasPi_fix
Fix issue #342
2017-07-01 08:08:45 +02:00
pwpiwi
4fed4488b1 Fix issue #342 2017-06-30 20:27:38 +02:00
Fl0-0
1ccba0b91b Indentation fix 2017-06-30 14:50:32 +02:00
Fl0-0
47af8c5fa9 Add EM410x bruteforcing error checks 2017-06-30 10:00:03 +02:00
Fl0-0
50acfd37e2 Add EM410x bruteforcing function by simulating EM410x tags (1 UID/s) 2017-06-30 09:17:31 +02:00
pwpiwi
7f9e4c257f hardnested: reduce disk space for tables (by > 700MBytes) and other minor changes
- compress tables
- minor changes to progress reporting
- free memory on aborts (@iceman1001)
2017-06-30 08:48:37 +02:00
marshmellow42
82e8eee62d Merge pull request #333 from micolous/osx-libedit
OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
2017-06-30 00:22:55 -04:00
Iceman
2a7861ef0a Update cmdhf14a.c
need include to detection function
2017-06-26 21:58:03 +02:00
Iceman
6100040454 Update hfsnoop.c (#338)
fix:  missed a include for usb_poll_validate_length
2017-06-26 08:37:32 +02:00
pwpiwi
893d0fcc49 Merge pull request #337 from Proxmark/iceman1001-patch-4
Iceman1001 patch 4
2017-06-26 07:50:57 +02:00
Iceman
d8e61a3004 Update aes.c (#336)
FIX:  coverity scan - improper use of sizeof
2017-06-26 00:52:09 +02:00
Iceman
06ed826c01 Update hfsnoop.c
chg:  enabled snooping function to break on receiving a usbpackage.
2017-06-25 19:39:45 +02:00
Iceman
e7fd9f5ff4 Update BigBuf.h
added the header definition
2017-06-25 19:35:59 +02:00
Iceman
f4329b1732 Update BigBuf.c
chg:  change from defines to booleans.
add: bigbuf_clear_em(),  empties the reserved emulator part only
2017-06-25 19:35:03 +02:00
Iceman
e702439e00 Update fpgaloader.c
CHG:  just making sure the bigbuff is cleared after the zlib played.  So we don't get the random noice that ppl are posting thinking they got a signal.
2017-06-25 19:30:07 +02:00
Michael Farrell
c39ce233fe OSX: delete another reference to readline 2017-06-25 21:44:08 +10:00
Michael Farrell
1a8cd8c7c4 OSX: Remove references to GNU readline as it will be no longer required 2017-06-25 12:38:42 +10:00
Michael Farrell
ed50f7f327 OSX: Disable GNU readline-specific hack when libedit is used (fixes #110) 2017-06-25 12:26:33 +10:00
Iceman
7f2114d845 Update cmdhfmfu.c (#332)
* Update cmdhfmfu.c

CHG:
   removed sniffed keys,  amiibo pwd gen algo is known.
   'hf mfu rdbl' - header output aligned
  'hf mfu dump' - header output aligned

* Update cmdhfmfu.c

chg: adjusted KEYS_PWD_COUNT accordingly
2017-06-24 11:54:42 +02:00
Iceman
b4d321bbf3 Merge pull request #330 from marshmellow42/master
bug fix for hf iclass reader and iclass detection
2017-06-23 20:25:51 +02:00
marshmellow42
34e2af02a4 bug fix for hf iclass reader and iclass detection
memory locations in code are now accurate and the CC output is not
corrupted by the config's crc.

also the looping and flags for what to read are now correctly
implemented in the code.
2017-06-23 13:50:25 -04:00
Iceman
c0a2ae50da Merge pull request #329 from marshmellow42/master
iclass - updates
2017-06-22 01:13:07 +02:00
marshmellow42
67e344df90 iclass - updates
clean up output
allow readblock without authenticating (can read blocks 0, 1, 2, 5
without authenticating.)
add Application Issuer Area to reader output and use it to attempt to
identify legacy vs NOT legacy.
2017-06-21 17:07:55 -04:00
marshmellow42
bf8243475b some coverity fixes plus fix fdx help (#328)
* coverity fixes

cmdhflegic- indications are the i in calls to data_buf[i] could = 1052
and overflow the array.
cmdhfmfhard - +1 to add space for string null terminator - should we add
the 0 terminator value too?
reveng.c - memory leak
util.c - fix potential overflow of array buf[]
util_posix.c - possible integer overflow

* fix help errors

* fix sprint_hex_ascii

again
and this function is not even used anywhere... yet...
2017-06-20 17:25:08 -05:00
marshmellow42
58c00ce7fc Merge pull request #322 from Proxmark/iceman1001-patch-2
Update 77-mm-usb-device-blacklist.rules
2017-06-19 09:01:44 -04:00
marshmellow42
0c29544f64 Merge pull request #321 from Proxmark/iceman1001-patch-1
BUG: 'hf mf mifare'
2017-06-16 14:46:50 -04:00
Iceman
513c6c98af Update 77-mm-usb-device-blacklist.rules
fix: updated the blacklist rules file with the updated usb_cdc vid/pid values
2017-06-16 19:48:18 +02:00
Iceman
84ca27b33a BUG: 'hf mf mifare'
BUG: 'hf mf mifare' ,  wrongly identify success when faulty key is found
https://github.com/Proxmark/proxmark3/issues/320
2017-06-16 14:43:53 +02:00
marshmellow42
e5a15888b6 Merge pull request #319 from Proxmark/iceman1001-patch-2
bug:  hf mf chk - wrong size
2017-06-13 17:23:24 -04:00
marshmellow42
0efcb69128 Merge pull request #317 from Proxmark/iceman1001-patch-1
bug;  Check keys params
2017-06-13 17:22:44 -04:00
Iceman
1e11e5d762 bug: hf mf chk - wrong size
bug:  'hf mf chk' - size of keycounter variable is too small for dictionary files larger than 256rows.
2017-06-12 15:07:00 +02:00
Iceman
4419118038 bug; Check keys params
CMD_MIFARE_CHKKEYS command has a different arg1, arg2 meaning nowdays.
Arg0  =  keytype << 8 | blockno 
arg1  = clear trace

In lua its name arg1, probably with lua's startindex is 1...
2017-06-12 12:21:01 +02:00
Iceman
8040afa5ba Merge pull request #315 from marshmellow42/master
fix compile issues on OS X 10.11
2017-06-09 15:50:55 +02:00
Iceman
3e7df26213 updated onlineshops
Updated the onlineshops,   same info here as on www.proxmark.org  order page. 
Two have been removed because of bad reviews and no lifesign.
2017-06-09 09:59:30 +02:00