merlokk
|
3926874995
|
fix pse channels
|
2018-12-28 20:48:45 +02:00 |
|
merlokk
|
376ead028a
|
added tests
|
2018-12-28 20:33:38 +02:00 |
|
merlokk
|
7401d51ebf
|
roca works
|
2018-12-28 20:33:24 +02:00 |
|
merlokk
|
e315328625
|
works
|
2018-12-28 20:06:18 +02:00 |
|
merlokk
|
44343d806f
|
add some debug
|
2018-12-28 19:25:19 +02:00 |
|
merlokk
|
05814fbe75
|
added mpi print
|
2018-12-28 19:06:51 +02:00 |
|
merlokk
|
f1cd108b1a
|
move g_one to cycle
|
2018-12-28 18:09:20 +02:00 |
|
merlokk
|
5eafc491ec
|
small add
|
2018-12-28 18:00:37 +02:00 |
|
merlokk
|
404f23ddbd
|
small fix
|
2018-12-28 17:50:51 +02:00 |
|
merlokk
|
18225c7c7f
|
some fix
|
2018-12-28 17:48:52 +02:00 |
|
merlokk
|
6afda099db
|
added test/ not works
|
2018-12-28 17:46:57 +02:00 |
|
merlokk
|
625b696291
|
roca works
|
2018-12-28 17:25:11 +02:00 |
|
merlokk
|
67b7edeb44
|
extract keys works
|
2018-12-28 17:07:58 +02:00 |
|
merlokk
|
b0c1828c1d
|
load params
|
2018-12-28 16:58:11 +02:00 |
|
merlokk
|
8e5133582d
|
emv roca select app
|
2018-12-28 16:43:15 +02:00 |
|
merlokk
|
ab41b4a991
|
emv_rocacheck
|
2018-12-28 16:40:53 +02:00 |
|
merlokk
|
9804526dca
|
small fix for unsigned int
|
2018-12-28 14:52:24 +02:00 |
|
merlokk
|
b1145ba577
|
mpi_get_uint
|
2018-12-28 14:50:23 +02:00 |
|
merlokk
|
88d42a1af5
|
make
|
2018-12-28 13:46:52 +02:00 |
|
iceman1001
|
92fadc2a9f
|
ADD: 'amiitool' - Added @socram8888 's great tool for manipulating amiibo tags. The idea is to build it in the pm3 client. It compiles as is, but the hookup in client is not done. *WORK IN PROGRESS*
|
2018-12-27 19:45:53 +01:00 |
|
Chris
|
c6089d7fdb
|
chg: more definitions
|
2018-12-26 17:54:29 +01:00 |
|
Chris
|
ed68068107
|
chg: 'emv roca' -now compiles
|
2018-12-26 12:50:11 +01:00 |
|
Chris
|
33f6439d38
|
add 'emv roca' - new command, will be able to test for ROCA
|
2018-12-26 11:02:00 +01:00 |
|
Chris
|
ab9048f7c5
|
CHG: 'sc brute' loop 31, 255
|
2018-12-25 18:18:48 +01:00 |
|
Chris
|
ddfe584582
|
CHG: 'sc brute' - nicer output, rearrange code
|
2018-12-25 18:16:47 +01:00 |
|
Chris
|
5140db2ac6
|
CHG: some more descriptions
|
2018-12-25 18:13:41 +01:00 |
|
iceman1001
|
acb41a7376
|
CHG: 'sc brute' - now is interruptable, optional tlv decode,
|
2018-12-23 09:48:46 +01:00 |
|
Oleg Moiseenko
|
a47fa470c1
|
Merge branch 'master' into atrzerocheck
|
2018-12-20 23:07:30 +02:00 |
|
merlokk
|
d64a48b7fc
|
added check Fi and Di
|
2018-12-20 23:05:02 +02:00 |
|
iceman1001
|
ddb4fc33c9
|
CHG: 'sc info' - textual
|
2018-12-19 23:46:19 +01:00 |
|
iceman1001
|
a9b3fd7138
|
chg: 'sc brute' - now works :)
|
2018-12-19 23:21:59 +01:00 |
|
iceman1001
|
0143d3f0e0
|
chg: 'sc raw' - some more love
|
2018-12-19 22:50:32 +01:00 |
|
merlokk
|
f0c3482799
|
add T=0 to sc raw command
|
2018-12-19 20:31:20 +02:00 |
|
iceman1001
|
e567b74fa0
|
chg...
|
2018-12-19 08:57:59 +01:00 |
|
iceman1001
|
94e0d43502
|
CHG: coloring of ERR
|
2018-12-18 18:43:49 +01:00 |
|
iceman1001
|
4ef59c3771
|
CHG: uniform output.
|
2018-12-18 18:43:27 +01:00 |
|
Iceman
|
c0b72bb95c
|
Merge pull request #72 from merlokk/le_fix
fix sending Le over 7816 T=0
|
2018-12-18 18:03:10 +01:00 |
|
iceman1001
|
60b7dbe525
|
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
|
2018-12-18 17:57:56 +01:00 |
|
iceman1001
|
5489d4e552
|
add: magic uid 15 helper script
chg: keys
|
2018-12-18 17:57:22 +01:00 |
|
merlokk
|
b42709837f
|
fix sending Le over 7816 T=0
|
2018-12-18 18:55:46 +02:00 |
|
merlokk
|
8ab9b6d0ea
|
sw 0x6cxx works
|
2018-12-18 16:14:52 +02:00 |
|
merlokk
|
f32088e25c
|
fix states and get rid of INS code in receive (that code checks by controller)
|
2018-12-18 14:33:28 +02:00 |
|
merlokk
|
a759e94af0
|
add client side and get rid of reset
|
2018-12-17 23:48:56 +02:00 |
|
iceman1001
|
a963a7834c
|
FIX: 'mem load' - bad memory allocation
CHG: calloc fixes
|
2018-12-17 14:01:18 +01:00 |
|
iceman1001
|
cecf709fe7
|
chg: 'script run mifare_ad' - minor fix
|
2018-12-14 20:27:11 +01:00 |
|
mazodude
|
d36f3d876b
|
Remove unneeded function and place code in main
|
2018-12-14 20:14:47 +10:00 |
|
mazodude
|
f77bb94a86
|
Add changes to script as per iceman's suggestions
|
2018-12-14 16:57:51 +10:00 |
|
mazodude
|
edcb029af3
|
Add script to test for MADs
|
2018-12-14 15:31:50 +10:00 |
|
iceman1001
|
1ffddb2578
|
CHG: 'hf mfu dump' - simplify bin saving and added JSON dump format
|
2018-12-13 23:34:30 +01:00 |
|
merlokk
|
b06054732b
|
code format
|
2018-12-10 15:04:03 +02:00 |
|
merlokk
|
ec17cade36
|
added TA1 decoding
|
2018-12-10 15:01:00 +02:00 |
|
iceman1001
|
16bfd49b8d
|
CHG: 'hf 14a' - update to vendors list. (thanks to @horrordash for pointing it out)
See also:
http://isotc.iso.org/livelink/livelink?func=ll&objId=10432471&objAction=Open&nexturl=%2Flivelink%2Flivelink%3Ffunc%3Dll%26objId%3D8915579%26objAction%3Dbrowse%26viewType%3D1
|
2018-12-10 08:48:39 +01:00 |
|
Chris
|
7ceac11308
|
chg: Added some more Mifare sector trailer decoding (@Fl0-0)
|
2018-12-07 20:11:40 +01:00 |
|
RFID Research Group
|
749f0f6f3a
|
Merge pull request #68 from merlokk/sc_atr
added basic atr decode
|
2018-12-07 19:19:23 +01:00 |
|
merlokk
|
384a277b43
|
added basic atr decode
|
2018-12-07 19:58:22 +02:00 |
|
RFID Research Group
|
04b7860096
|
Update default_pwd.dic
from https://github.com/Proxmark/proxmark3/pull/735/
|
2018-12-07 17:36:50 +01:00 |
|
merlokk
|
80d07bcaac
|
added code if AIP not found
|
2018-12-06 20:04:28 +02:00 |
|
merlokk
|
17d0194aea
|
small fix and block scan command
|
2018-12-06 19:47:57 +02:00 |
|
merlokk
|
34b53a5b48
|
exchange works
|
2018-12-06 14:44:55 +02:00 |
|
merlokk
|
ec3acc7d8a
|
some of emv commands works in test mode
|
2018-12-05 19:23:13 +02:00 |
|
merlokk
|
312ec79e48
|
added sketch sc apdu
|
2018-12-05 17:27:28 +02:00 |
|
merlokk
|
4c7e5757f3
|
added channel parameter
|
2018-12-03 19:29:31 +02:00 |
|
merlokk
|
01a10bade7
|
Mastercard compute cryptographic checksum result will print anyway
|
2018-12-03 18:49:54 +02:00 |
|
merlokk
|
2245673262
|
fix search big loop
|
2018-12-03 18:46:11 +02:00 |
|
merlokk
|
e8671e6c18
|
fix emv command's help
|
2018-12-03 18:21:05 +02:00 |
|
merlokk
|
47d954c79f
|
move emv commands to root
|
2018-12-03 18:16:25 +02:00 |
|
iceman1001
|
259dbadbe9
|
chg: output unified
|
2018-12-02 10:05:31 +01:00 |
|
iceman1001
|
2eee1663df
|
chg: iso15693 small fix...
|
2018-11-30 21:04:32 +01:00 |
|
iceman1001
|
0372cb8a04
|
chg: iso15693 lua lib works.
|
2018-11-30 20:58:47 +01:00 |
|
merlokk
|
7c8377839e
|
4k fix
|
2018-11-30 20:33:46 +02:00 |
|
merlokk
|
2d932e49ac
|
https://github.com/Proxmark/proxmark3/pull/725
|
2018-11-30 20:28:34 +02:00 |
|
merlokk
|
9f77f2741f
|
added trailer decoding
|
2018-11-30 14:16:34 +02:00 |
|
iceman1001
|
a5898158c5
|
FIX: basic fixes for lua reader14a, reader14b, reader15
ADD: utils got iso15693 crc support
|
2018-11-30 01:41:39 +01:00 |
|
iceman1001
|
ccb0cd23f5
|
FIX: 'lua calc of iso15692 crc' - works better now
|
2018-11-30 01:19:57 +01:00 |
|
iceman1001
|
bd7ac487cd
|
FIX: 'hf mf hardnested' - output misalignment
|
2018-11-29 23:44:50 +01:00 |
|
merlokk
|
9584074c00
|
fix memory error
|
2018-11-29 22:06:49 +02:00 |
|
iceman1001
|
0b5ee43392
|
FIX: remove linker directive warnings used with compiler in CLANG, OS X.
|
2018-11-29 17:59:46 +01:00 |
|
iceman1001
|
3c88bb5e59
|
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
|
2018-11-29 17:53:57 +01:00 |
|
iceman1001
|
b64fdafc40
|
ADD: basic iso15693 comms in lua support. Not fully functional
|
2018-11-29 17:53:24 +01:00 |
|
Iceman
|
55dff20530
|
Merge pull request #54 from merlokk/json_loclass
`hf mf csave` and `hf mf cload` works with json.
|
2018-11-29 16:50:27 +01:00 |
|
merlokk
|
4dece3e30d
|
del line
|
2018-11-29 17:13:00 +02:00 |
|
merlokk
|
efabdde248
|
small fixes. done
|
2018-11-29 17:09:37 +02:00 |
|
merlokk
|
6baf579fe0
|
hf mf cload works
|
2018-11-29 16:56:57 +02:00 |
|
merlokk
|
955ced6c28
|
hf mf csave works
|
2018-11-29 16:05:57 +02:00 |
|
merlokk
|
e6d7a05721
|
csave works
|
2018-11-29 13:42:07 +02:00 |
|
merlokk
|
0ffddd8470
|
raw load file
|
2018-11-29 13:21:38 +02:00 |
|
merlokk
|
5d5e273982
|
jansson update. 2.11 to 2.12
fix warnings
|
2018-11-29 12:00:23 +02:00 |
|
iceman1001
|
91809c6d94
|
FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0)
CHG: remove some warnings when compiling on 32/64 bit systems. Messy messy
|
2018-11-28 23:53:31 +01:00 |
|
merlokk
|
21118ed6b8
|
Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass
|
2018-11-28 00:09:11 +02:00 |
|
merlokk
|
04b436ce5e
|
del annoying comment
|
2018-11-27 19:44:03 +02:00 |
|
merlokk
|
f8cac71aa0
|
Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass
|
2018-11-27 19:40:30 +02:00 |
|
Oleg Moiseenko
|
4e89ef7c24
|
Merge branch 'master' into fido2
|
2018-11-27 19:37:08 +02:00 |
|
merlokk
|
c51e0a58f4
|
added allowList to authenticatorGetAssertion command
|
2018-11-27 19:33:51 +02:00 |
|
merlokk
|
305c0c099b
|
refactoring
|
2018-11-27 15:59:28 +02:00 |
|
merlokk
|
d253364d2c
|
added numberOfCredentials
|
2018-11-27 15:47:17 +02:00 |
|
merlokk
|
ac5448a117
|
GetAssertion works
|
2018-11-27 14:57:00 +02:00 |
|
merlokk
|
a0a979abc6
|
added show GetAssertion results
|
2018-11-27 14:34:51 +02:00 |
|
merlokk
|
f26d3396e8
|
get credential
|
2018-11-27 14:01:47 +02:00 |
|
merlokk
|
317ea30529
|
refactoring and GetAssertion works
|
2018-11-27 13:45:29 +02:00 |
|
merlokk
|
26cf350713
|
refactoring
|
2018-11-27 12:34:28 +02:00 |
|
merlokk
|
a9be05dbf7
|
refactoring
|
2018-11-27 12:31:39 +02:00 |
|
merlokk
|
5efc2eced6
|
refactoring
|
2018-11-27 12:28:36 +02:00 |
|
merlokk
|
ee92b8a097
|
refactoring make credentials and add some sketch to get assertion
|
2018-11-27 12:24:55 +02:00 |
|
merlokk
|
bad7b80036
|
added file name to fido2 command
|
2018-11-27 12:07:33 +02:00 |
|
merlokk
|
fc9558b18f
|
get assertion command sketch
|
2018-11-27 00:18:44 +02:00 |
|
merlokk
|
890173a623
|
verify signature OK,
added some logging options
|
2018-11-27 00:11:53 +02:00 |
|
merlokk
|
66d994920f
|
added command and some parameters
|
2018-11-26 20:17:50 +02:00 |
|
merlokk
|
d36bfd5829
|
add some cose key checks
|
2018-11-26 19:49:41 +02:00 |
|
merlokk
|
065773377d
|
get cose public key and fix some printing
|
2018-11-26 19:42:37 +02:00 |
|
merlokk
|
0a2f874ac3
|
added cose_key descriptions
|
2018-11-26 19:22:44 +02:00 |
|
merlokk
|
f7354c705d
|
extract some descriptions from cose_key
|
2018-11-26 19:16:47 +02:00 |
|
merlokk
|
56c9270574
|
added json save values
|
2018-11-26 18:57:44 +02:00 |
|
merlokk
|
1f3086a028
|
added json save
|
2018-11-26 18:39:31 +02:00 |
|
merlokk
|
b0e0ccb05f
|
added showCBOR
|
2018-11-26 18:37:21 +02:00 |
|
merlokk
|
b9c4bd1e0c
|
added showing cose_key in cbor text type
|
2018-11-26 18:30:14 +02:00 |
|
merlokk
|
44ed826840
|
added hints
|
2018-11-26 17:54:50 +02:00 |
|
merlokk
|
705d0b7a6b
|
added signature verify
|
2018-11-26 17:52:02 +02:00 |
|
merlokk
|
b67bcac28e
|
check rpIdHash and unpack signature ok
|
2018-11-26 17:38:45 +02:00 |
|
merlokk
|
1099c6923d
|
added COSE algorithms
|
2018-11-26 16:12:28 +02:00 |
|
Chris
|
bf7f33b0a7
|
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
|
2018-11-25 14:36:19 +01:00 |
|
Chris
|
3beb14a25c
|
chg: 'hf iclass lookup' - its not an online command...
|
2018-11-25 14:35:47 +01:00 |
|
merlokk
|
9e89da3c0c
|
remove debug
|
2018-11-25 00:12:06 +02:00 |
|
merlokk
|
1a0f7e93de
|
refactoring and some functions in cbortools
|
2018-11-24 23:36:02 +02:00 |
|
merlokk
|
6c63e74ffb
|
decode DER certificate
|
2018-11-24 15:05:08 +02:00 |
|
merlokk
|
376abd2d92
|
get DER works
|
2018-11-24 14:57:55 +02:00 |
|
merlokk
|
0bbdc7f150
|
added CborGetArrayBinStringValue
|
2018-11-24 14:57:36 +02:00 |
|
merlokk
|
c57a2c2c41
|
added map credential parsing. not completed
|
2018-11-23 19:48:17 +02:00 |
|
merlokk
|
a37082a825
|
added some cbor tools
|
2018-11-23 19:47:30 +02:00 |
|
Jean-Michel Picod
|
7943ba7d91
|
Fix logic op being used instead of bitwise op
|
2018-11-22 23:57:30 +01:00 |
|
merlokk
|
156f9b677c
|
refactoring
|
2018-11-22 13:41:44 +02:00 |
|
merlokk
|
7bb24819ad
|
small fix
|
2018-11-21 20:39:26 +02:00 |
|
merlokk
|
e33ddad40c
|
added options and some refactoring
|
2018-11-21 20:35:57 +02:00 |
|
merlokk
|
979a14d978
|
added CBOR description for queries
|
2018-11-21 20:11:41 +02:00 |
|
merlokk
|
f705402b7a
|
make credentional command works. and refactoring
|
2018-11-21 19:46:57 +02:00 |
|
merlokk
|
da45b1db39
|
added jsontocbor function
|
2018-11-21 19:46:09 +02:00 |
|
merlokk
|
dae4ecc60f
|
removed ismap and added not-writable parameters
|
2018-11-21 19:45:11 +02:00 |
|
merlokk
|
7b943a4a16
|
add check string - if string is hex
|
2018-11-21 19:44:31 +02:00 |
|
merlokk
|
ea3472b0e0
|
load json OK
|
2018-11-20 19:31:08 +02:00 |
|
merlokk
|
38e0d7de32
|
add load json
|
2018-11-20 19:21:36 +02:00 |
|
merlokk
|
9df1d14ca4
|
printandlogex in hf emv commands
|
2018-11-20 17:29:17 +02:00 |
|
merlokk
|
d7d681ab51
|
cmdhf apdu move to argtable
|
2018-11-20 17:28:41 +02:00 |
|
merlokk
|
6d896ca603
|
cmdemv merge
|
2018-11-20 16:26:54 +02:00 |
|
merlokk
|
fb14d665dd
|
emvcore
|
2018-11-20 16:26:35 +02:00 |
|
merlokk
|
b1091c486b
|
emv_pki
|
2018-11-20 16:25:54 +02:00 |
|
merlokk
|
e3aebd7985
|
get card data
|
2018-11-20 16:25:19 +02:00 |
|
Chris
|
f8c33af1da
|
CHG: FPC connector tests. Device -> Client communications works.
Adjust armsrc/Makefile and client/Makefile to include the -DWITH_FPC flag to compile with FPC enabled.
|
2018-11-20 10:58:32 +01:00 |
|
merlokk
|
6d4552540b
|
added fido2 test json
|
2018-11-18 19:18:18 +02:00 |
|
merlokk
|
dcfd75d1d0
|
added command sketch
|
2018-11-18 00:03:28 +02:00 |
|
merlokk
|
dc9b3c3a0e
|
added fido2 base commands
|
2018-11-17 23:52:36 +02:00 |
|
merlokk
|
12b1289191
|
fido info command completed
|
2018-11-17 18:39:21 +02:00 |
|