iceman1001
|
8c646cf1ca
|
Merge branch 'master' of github.com:RfidResearchGroup/proxmark3
|
2021-08-22 21:32:19 +02:00 |
|
iceman1001
|
e811b35a6f
|
ntag i2c 2k - fast write
|
2021-08-22 21:32:14 +02:00 |
|
merlokk
|
df0c24cfad
|
lsfiles fix
|
2021-08-22 22:29:21 +03:00 |
|
iceman1001
|
9c2cbe9fbb
|
ntag i2c 2k select sector annotation
|
2021-08-22 21:16:33 +02:00 |
|
iceman1001
|
edc300ea97
|
ntag i2c 2k - select sector annotation
|
2021-08-22 21:02:11 +02:00 |
|
İlteriş Eroğlu
|
fece7df0d7
|
Realign import order for compiling
This is needed for macports installations
|
2021-08-22 20:46:54 +03:00 |
|
Philippe Teuwen
|
a06765e5a8
|
fix missing NTAG sizes
|
2021-08-22 17:48:05 +02:00 |
|
Philippe Teuwen
|
fdba7c2ff8
|
Safe check in sprint_bytebits_bin_break
|
2021-08-22 17:02:44 +02:00 |
|
Philippe Teuwen
|
0d7f93a8e7
|
Fix sprint_bin usages in hf mfu and felica
|
2021-08-22 16:53:15 +02:00 |
|
iceman1001
|
3e6bad8b02
|
textual
|
2021-08-22 16:05:33 +02:00 |
|
Philippe Teuwen
|
b63dcb707e
|
rework desfire declarations
|
2021-08-22 13:56:35 +02:00 |
|
mindseyex2
|
4f7b8c5c05
|
Update cmdhfmfu.c
|
2021-08-21 20:32:54 -07:00 |
|
Philippe Teuwen
|
58dda7a809
|
rename static globals g_* as gs_*, keep g_ only for exported globals
|
2021-08-22 00:51:37 +02:00 |
|
Philippe Teuwen
|
ab450d6f57
|
add --mem to hf mf nested (brought from icopyx)
|
2021-08-21 23:56:54 +02:00 |
|
Philippe Teuwen
|
0f039582b3
|
icopyx retval, should be more generic...
|
2021-08-21 23:56:03 +02:00 |
|
Philippe Teuwen
|
e7a9ec6154
|
icopyx: mfu restore also pwd & pack
|
2021-08-21 23:55:21 +02:00 |
|
Philippe Teuwen
|
33edfbc0ad
|
icopyx disable em4x50 search
|
2021-08-21 23:54:42 +02:00 |
|
Philippe Teuwen
|
0384359aa4
|
icopyx bootloader safeguard
|
2021-08-21 23:52:15 +02:00 |
|
Philippe Teuwen
|
f6d88dced2
|
rename typedef structs
|
2021-08-21 22:09:42 +02:00 |
|
Philippe Teuwen
|
5fce6271ee
|
rename typedef struct pm3_device
|
2021-08-21 21:41:52 +02:00 |
|
Philippe Teuwen
|
bae5362656
|
rename typedef structs
|
2021-08-21 21:41:34 +02:00 |
|
Philippe Teuwen
|
dd3b63ae32
|
rename global session
|
2021-08-21 20:31:05 +02:00 |
|
Philippe Teuwen
|
6a2f2b3979
|
rename global conn
|
2021-08-21 20:21:08 +02:00 |
|
Philippe Teuwen
|
8280fc3c07
|
rename global version_information and its struct type
|
2021-08-21 20:11:22 +02:00 |
|
Philippe Teuwen
|
d88c98a786
|
Reduce scope of a number of globals:
APDUInFramingEnable atsFSC uid_label_map apdu_in_framing_enable uidmapping KENC_type KMAC_type jpeg_header jpeg2k_header *card_types card_app2_limit iclass_config_types jooks jooks_figures nfc_secret desdefaultkeys aesdefaultkeys k3kdefaultkeys CardAddresses default_3des_keys default_pwd_pack UL_TYPES_ARRAY UL_MEMORY_ARRAY fdxbCountryMapping translateTable invTranslateTable preamble paradox_lut pcf7931_config config DiArray FiArray FArray crc64_table signalprop
|
2021-08-21 19:56:07 +02:00 |
|
merlokk
|
b9300e94ce
|
make style
|
2021-08-21 19:14:18 +03:00 |
|
Oleg Moiseenko
|
6505f0cbf3
|
Merge pull request #1474 from merlokk/lrp_dump
Lrp dump command
|
2021-08-21 19:05:52 +03:00 |
|
merlokk
|
efece7a753
|
fix print bug
|
2021-08-21 19:00:27 +03:00 |
|
merlokk
|
c340e979a2
|
dump command works with more cases
|
2021-08-21 18:54:22 +03:00 |
|
Philippe Teuwen
|
ce57637c80
|
rename globals GraphTraceLen OddByteParity pm3_capabilities
|
2021-08-21 17:53:54 +02:00 |
|
Philippe Teuwen
|
6e0ce662c7
|
reduce scope of global ice
|
2021-08-21 17:49:14 +02:00 |
|
Philippe Teuwen
|
a8bb07db3a
|
remove unused global showDemod
|
2021-08-21 17:42:00 +02:00 |
|
Philippe Teuwen
|
f1f2389fb4
|
rename globals GraphBuffer
|
2021-08-21 17:39:17 +02:00 |
|
Philippe Teuwen
|
b02fef5c70
|
rename globals print_lock
|
2021-08-21 17:18:56 +02:00 |
|
Philippe Teuwen
|
faaa70c860
|
rename globals CursorCPos CursorDPos CursorScaleFactor CursorScaleFactorUnit GraphPixelsPerPoint GraphStart GraphStop GridLocked GridOffset PlotGridX PlotGridY PlotGridXdefault PlotGridYdefault
|
2021-08-21 17:12:50 +02:00 |
|
Philippe Teuwen
|
e4fbfe0f40
|
rename globals DemodBuffer and DemodBufferLen
|
2021-08-21 17:12:50 +02:00 |
|
Philippe Teuwen
|
45d4d361e9
|
reduce old_action scope to static global, rename for clarity
|
2021-08-21 17:12:50 +02:00 |
|
Philippe Teuwen
|
9726db7a41
|
Move mbedtls objs to subdir
|
2021-08-21 17:12:50 +02:00 |
|
merlokk
|
cc6837a9e4
|
CommitReaderID works via lrp and ev2 channel
|
2021-08-21 17:51:28 +03:00 |
|
merlokk
|
a78c6a7721
|
print transaction counter
|
2021-08-21 16:57:48 +03:00 |
|
merlokk
|
d3fbf3e596
|
add cmd to channel
|
2021-08-21 16:43:21 +03:00 |
|
merlokk
|
f645d053b9
|
355638
|
2021-08-21 16:22:51 +03:00 |
|
merlokk
|
77c801da33
|
354821
|
2021-08-21 16:21:13 +03:00 |
|
Oleg Moiseenko
|
582c9eeb7d
|
Merge pull request #1471 from merlokk/lrp_value
lrp value operations
|
2021-08-21 15:51:04 +03:00 |
|
merlokk
|
62d98f2218
|
added abort transaction to the channel
|
2021-08-21 15:45:17 +03:00 |
|
merlokk
|
a5668a91a2
|
fix setconfig
|
2021-08-21 15:42:28 +03:00 |
|
merlokk
|
aac6c7dea7
|
fix write iso mode
|
2021-08-21 15:38:19 +03:00 |
|
Philippe Teuwen
|
6197482b77
|
Make sure g_trace is null when not allocated
|
2021-08-21 14:34:20 +02:00 |
|
merlokk
|
0b04e2284c
|
fix read bug
|
2021-08-21 15:20:42 +03:00 |
|
merlokk
|
4ffddb3c6d
|
add hints
|
2021-08-21 15:09:13 +03:00 |
|
merlokk
|
3d82da8ebe
|
fix value operations in the encoded state
|
2021-08-21 14:52:45 +03:00 |
|
Philippe Teuwen
|
4087b5a288
|
Merge pull request #1469 from AxisRay/fix-double-free
Fix double free error #1467
|
2021-08-21 13:51:45 +02:00 |
|
merlokk
|
62a9a46cc7
|
make style
|
2021-08-21 14:28:40 +03:00 |
|
Oleg Moiseenko
|
f6cee14f14
|
Merge pull request #1468 from merlokk/lrp_read
Lrp data read/write commands
|
2021-08-21 14:22:40 +03:00 |
|
merlokk
|
db2c8776c0
|
clear record file works, lrp transaction check code
|
2021-08-21 14:12:49 +03:00 |
|
Ray Lee
|
fd314882b2
|
fix double free
|
2021-08-21 16:59:56 +08:00 |
|
merlokk
|
09b4c3eed1
|
rename
|
2021-08-21 00:05:04 +03:00 |
|
merlokk
|
10561e9969
|
move transaction counter
|
2021-08-20 23:59:11 +03:00 |
|
merlokk
|
f17dfa4e59
|
fix text. read/write/value commands works
|
2021-08-20 23:49:53 +03:00 |
|
merlokk
|
87c05faffd
|
add link
|
2021-08-20 23:02:52 +03:00 |
|
merlokk
|
1b0ffac589
|
createmacfile works, print lrp transaction counter
|
2021-08-20 22:57:07 +03:00 |
|
merlokk
|
9d15190832
|
some help
|
2021-08-20 20:05:01 +03:00 |
|
merlokk
|
b6118cbde9
|
add iso chaining options
|
2021-08-20 20:00:13 +03:00 |
|
merlokk
|
f47b6f05d0
|
fix mode
|
2021-08-20 19:47:06 +03:00 |
|
merlokk
|
e3a7b4ad1f
|
fix header length behavior
|
2021-08-20 19:46:21 +03:00 |
|
merlokk
|
6516cfd665
|
create transaction mac file 1-byte command sketch
|
2021-08-20 19:25:44 +03:00 |
|
merlokk
|
534201b6d1
|
lrp delete file works. value operations in the plain mode works too
|
2021-08-20 18:53:56 +03:00 |
|
merlokk
|
f3b368ebb6
|
value operations plain get works
|
2021-08-20 18:48:24 +03:00 |
|
merlokk
|
32ad6ef945
|
lrp write works
|
2021-08-20 18:25:15 +03:00 |
|
merlokk
|
9d6567edce
|
plain read works
|
2021-08-20 17:36:43 +03:00 |
|
Philippe Teuwen
|
365adf0e77
|
Merge pull request #1459 from AxisRay/fix-filename-problem
fix naming convertion messes up
|
2021-08-20 09:29:52 +02:00 |
|
merlokk
|
a7b132a620
|
read pm3 command
|
2021-08-19 20:11:10 +03:00 |
|
merlokk
|
88c16d2868
|
read2 commands
|
2021-08-19 20:10:50 +03:00 |
|
merlokk
|
35bea0fbaa
|
make style
|
2021-08-19 19:55:03 +03:00 |
|
merlokk
|
533ee8ebd3
|
fix mf select if
|
2021-08-19 19:43:53 +03:00 |
|
merlokk
|
42b28500f4
|
fix session key print
|
2021-08-19 19:38:08 +03:00 |
|
merlokk
|
a567eb9506
|
change key works with lrp
|
2021-08-19 19:32:07 +03:00 |
|
merlokk
|
cf089b2087
|
coverity
|
2021-08-19 19:01:27 +03:00 |
|
merlokk
|
faf4c449fc
|
coverity 354842 355562
|
2021-08-19 19:00:01 +03:00 |
|
merlokk
|
d0c69519ee
|
add d40 mode
|
2021-08-19 18:54:16 +03:00 |
|
merlokk
|
be038225e1
|
set configuration
|
2021-08-19 18:53:11 +03:00 |
|
merlokk
|
9b6d162f0d
|
change file settings
|
2021-08-19 18:38:55 +03:00 |
|
merlokk
|
54aff03196
|
get key version
|
2021-08-19 17:57:18 +03:00 |
|
merlokk
|
ac8e667c05
|
remove set iv
|
2021-08-19 17:26:00 +03:00 |
|
merlokk
|
035e2701a5
|
iso file id create application
|
2021-08-19 17:22:57 +03:00 |
|
merlokk
|
bac1cfb5b5
|
create files iso file id byte order fix
|
2021-08-19 17:17:32 +03:00 |
|
merlokk
|
674568dfd9
|
lrp encode channel rx works, get uid works
|
2021-08-19 17:06:35 +03:00 |
|
merlokk
|
e021870ed8
|
lrp maced channel fully works
|
2021-08-19 16:43:28 +03:00 |
|
merlokk
|
4ae1912772
|
lrp maced tx works
|
2021-08-19 16:38:19 +03:00 |
|
merlokk
|
8bd14245c6
|
lrp cmac protocol level
|
2021-08-19 16:37:55 +03:00 |
|
merlokk
|
e55c8f969a
|
refactoring and lsfiles
|
2021-08-19 16:16:18 +03:00 |
|
merlokk
|
a9dd8aceb5
|
text
|
2021-08-19 15:26:39 +03:00 |
|
merlokk
|
2ee99ed1eb
|
get file settings
|
2021-08-19 15:18:34 +03:00 |
|
merlokk
|
1677df863d
|
get file id / iso id works
|
2021-08-19 15:03:19 +03:00 |
|
merlokk
|
6543a498b0
|
make style
|
2021-08-19 13:24:29 +03:00 |
|
merlokk
|
1ebeb9b151
|
remove debug
|
2021-08-19 00:44:26 +03:00 |
|
merlokk
|
afadc088d7
|
non first lrp authenticate works
|
2021-08-19 00:40:30 +03:00 |
|
merlokk
|
df8f5c4655
|
LRP auth works
|
2021-08-18 19:44:48 +03:00 |
|
merlokk
|
1c3f4d7e22
|
fix page
|
2021-08-18 19:07:22 +03:00 |
|
merlokk
|
10457726f1
|
test and remove debug
|
2021-08-18 19:06:41 +03:00 |
|
merlokk
|
67d198d946
|
LRPSessionKeys and TestLRPSessionKeys
|
2021-08-18 19:05:28 +03:00 |
|
merlokk
|
a6a80bf952
|
set config text
|
2021-08-18 13:16:15 +03:00 |
|
merlokk
|
8aaeb6b542
|
lrp cmac 8
|
2021-08-18 13:15:20 +03:00 |
|
merlokk
|
e28b6cfe83
|
set config works auth lrp checks
|
2021-08-17 23:31:42 +03:00 |
|
merlokk
|
b2022b1721
|
fix auth select and iso select
|
2021-08-17 19:19:50 +03:00 |
|
merlokk
|
627d775331
|
info fix
|
2021-08-17 18:03:54 +03:00 |
|
merlokk
|
2f3c9969aa
|
fix info, fix select
|
2021-08-17 18:00:22 +03:00 |
|
merlokk
|
af26a397a7
|
add select way commands
|
2021-08-17 17:59:53 +03:00 |
|
merlokk
|
b9108d5453
|
add iso file id to default parameters, add select/no file to iso select
|
2021-08-17 17:22:06 +03:00 |
|
Ray Lee
|
11afbdfba3
|
make style
|
2021-08-17 20:27:04 +08:00 |
|
Ray Lee
|
d3232a5ebd
|
rm stupid code
|
2021-08-17 20:23:31 +08:00 |
|
merlokk
|
95ed9c3543
|
add lrp channel
|
2021-08-17 15:06:04 +03:00 |
|
Ray Lee
|
5e22345111
|
work around
|
2021-08-17 18:15:15 +08:00 |
|
Ray Lee
|
0b01b060cf
|
fix naming convertion messes up
|
2021-08-17 13:02:22 +08:00 |
|
merlokk
|
220749eebe
|
anticollision instead of select aid=0, printfilesettings formatting fix
|
2021-08-16 20:22:29 +03:00 |
|
merlokk
|
48da8970b1
|
fix 14a exchange
|
2021-08-16 20:21:42 +03:00 |
|
merlokk
|
c8330b13d2
|
cov 354842
|
2021-08-16 19:30:28 +03:00 |
|
merlokk
|
13963593a2
|
cov 354821
|
2021-08-16 19:11:14 +03:00 |
|
micsen
|
595f47cc7e
|
Added keys from norwegian building site cards
The sectors contain Name, Birthdate, Org no, Org name. etc
|
2021-08-16 16:16:52 +02:00 |
|
merlokk
|
7ce190593c
|
make style
|
2021-08-16 17:08:33 +03:00 |
|
merlokk
|
9f0e973ad5
|
fix multi-block cmac, remove debug
|
2021-08-16 15:32:53 +03:00 |
|
merlokk
|
8558ba639f
|
fix block length = 16 case
|
2021-08-16 14:55:26 +03:00 |
|
merlokk
|
ad4c3d5a90
|
add corner case cmac test
|
2021-08-16 14:37:40 +03:00 |
|
merlokk
|
faa6571e9c
|
add subkeys test
|
2021-08-16 13:51:28 +03:00 |
|
merlokk
|
0f987a73cf
|
cmac one case works
|
2021-08-16 13:36:01 +03:00 |
|
merlokk
|
3c6fdffed3
|
LRP subkeys works
|
2021-08-16 12:43:46 +03:00 |
|
merlokk
|
5fac4cf114
|
cov 354821
|
2021-08-15 15:21:29 +03:00 |
|
merlokk
|
20a3bca524
|
LRPDecode
|
2021-08-14 13:24:59 +03:00 |
|
merlokk
|
b8968e2835
|
TestLRPEncode
|
2021-08-14 13:09:57 +03:00 |
|
merlokk
|
e56243501e
|
LRPEncode ok
|
2021-08-14 12:41:09 +03:00 |
|
merlokk
|
ae3ba512f0
|
LRPIncCounter
|
2021-08-14 11:52:32 +03:00 |
|
merlokk
|
c8813a0123
|
LRPEvalLRP ok
|
2021-08-14 09:27:03 +03:00 |
|
merlokk
|
5df6732a1b
|
LRPGenerateUpdatedKeys ok
|
2021-08-14 00:34:38 +03:00 |
|
merlokk
|
442bbd38b5
|
TestLRPPlaintexts
|
2021-08-14 00:22:18 +03:00 |
|
merlokk
|
99bc47c1ac
|
add module
|
2021-08-13 21:27:46 +03:00 |
|
merlokk
|
652c76b68b
|
text fix
|
2021-08-13 16:44:15 +03:00 |
|
merlokk
|
8ae01aa180
|
make style and (c)
|
2021-08-13 13:58:35 +03:00 |
|
merlokk
|
a8f583af4d
|
add hint
|
2021-08-13 00:47:22 +03:00 |
|
merlokk
|
35a3064799
|
decode
|
2021-08-13 00:38:16 +03:00 |
|
merlokk
|
6275c137f3
|
text
|
2021-08-13 00:01:03 +03:00 |
|
merlokk
|
8d3cb46a39
|
test
|
2021-08-13 00:00:49 +03:00 |
|
merlokk
|
9e79326eed
|
test session keys
|
2021-08-13 00:00:24 +03:00 |
|
merlokk
|
707f436cac
|
fix bugs in write
|
2021-08-12 19:30:44 +03:00 |
|
merlokk
|
69bc17a3c0
|
add commitreaderid to write
|
2021-08-12 19:09:41 +03:00 |
|
merlokk
|
e8c3211f25
|
fix commit transaction
|
2021-08-12 19:09:21 +03:00 |
|
merlokk
|
20fd5e42c4
|
add cmd to channel
|
2021-08-12 19:08:53 +03:00 |
|
merlokk
|
66d3aa52e3
|
DesfireCommitReaderID command
|
2021-08-12 18:07:15 +03:00 |
|
merlokk
|
e7c0caabcf
|
add verbosity
|
2021-08-12 17:28:29 +03:00 |
|
merlokk
|
9e18f74811
|
fix reassign of the commit
|
2021-08-12 16:31:29 +03:00 |
|
merlokk
|
d0621a1f0b
|
fix text
|
2021-08-12 16:25:52 +03:00 |
|