Philippe Teuwen
3c47e78597
cppcheck remove redundant assignment
2021-09-04 00:54:59 +02:00
Philippe Teuwen
0c810ff4fd
cppcheck Returning an integer in a function with pointer return type is not portable
2021-09-04 00:54:59 +02:00
Philippe Teuwen
ba6ef2a1bc
cppcheck redundant assignment
2021-09-04 00:54:59 +02:00
Philippe Teuwen
971c0126de
cppcheck clarify mix of boolean and bitwise ops
2021-09-04 00:54:59 +02:00
Philippe Teuwen
d3c6c430a8
cppcheck avoid dereferencing potentially null pointer
2021-09-04 00:54:59 +02:00
Philippe Teuwen
0830cfcf1c
style to prevent cppcheck duplicate assignment warning
2021-09-04 00:54:59 +02:00
Philippe Teuwen
0db962640c
cppcheck fix memleak
2021-09-04 00:54:59 +02:00
iceman1001
38694a3fea
text
2021-09-03 21:19:12 +02:00
iceman1001
b8a04d6d69
text
2021-09-03 21:12:02 +02:00
Philippe Teuwen
ce8cd5983b
update emojis
2021-09-02 21:10:31 +02:00
Adam Hořčica
0d589b75d7
typo in mfu rdbl command help
2021-08-31 23:41:13 +02:00
merlokk
cd4ea58449
hf mfp
fix texts
2021-08-30 12:26:09 +03:00
Philippe Teuwen
8a925b496a
Merge pull request #1487 from rknoll/fix-pac-checksum
...
Fix PAC/Stanley checksum calculation
2021-08-28 19:48:19 +02:00
Philippe Teuwen
f31e94e618
Merge pull request #1480 from linuxgemini/macports-support-add
...
Improve MacPorts Support
2021-08-28 19:12:26 +02:00
Richard Knoll
7a6f503161
Fix PAC/Stanley checksum calculation
...
The parity bit needs to be discarded when calculating the final
checksum byte value of PAC/Stanley card IDs. Verified by scanning
a tag which is now correctly identified.
2021-08-28 14:28:06 +01:00
merlokk
d46d23d079
make style
2021-08-25 14:44:06 +03:00
Oleg Moiseenko
143d0140db
Merge pull request #1483 from merlokk/lrp_detect
...
hf mfdes detect with lrp mode and hf mfdes info updates
2021-08-25 14:24:35 +03:00
merlokk
13b0dc73d5
fix
2021-08-25 14:15:48 +03:00
Philippe Teuwen
2938baaed6
text
2021-08-25 12:58:00 +02:00
merlokk
81343f0ec1
fix info, add there desfire light tests
2021-08-25 13:57:35 +03:00
merlokk
4bf3c43c7f
fix select command via iso channel (with wrapper)
2021-08-25 13:28:39 +03:00
Philippe Teuwen
2b3cd6e604
Remove PACKED on internal client struct containing pointers, it can break mem alignment
2021-08-25 11:02:17 +02:00
Philippe Teuwen
ba7f1b93b9
Remove PACKED on internal client struct containing pointers, it breaks mem alignment on clang-13 MacOSX
2021-08-25 10:49:47 +02:00
Philippe Teuwen
3cadd2906e
Fix clang-13 warnings about unused variables
2021-08-25 10:10:46 +02:00
Philippe Teuwen
ce4eed2acf
Merge pull request #1484 from AxisRay/fix-dynamic-stack-buffer-overflow
...
fix dynamic-stack-buffer-overflow
2021-08-24 16:50:55 +02:00
Ray Lee
8998b0b46c
fix dynamic-stack-buffer-overflow
2021-08-24 22:36:59 +08:00
merlokk
fddf7cf6b8
desfire info updates
2021-08-24 13:11:52 +03:00
merlokk
46f2defcd3
add auto select channel to lrp
2021-08-24 12:47:29 +03:00
Ray Lee
3c51ee4547
make style
2021-08-24 16:22:55 +08:00
Ray Lee
cc3e2cc3a9
use memcmp
2021-08-24 14:23:32 +08:00
Ray Lee
7b59029cdb
maybe better
2021-08-24 13:22:50 +08:00
Ray Lee
d6145d76e7
fix buffer overflow
2021-08-24 10:43:32 +08:00
Philippe Teuwen
1cdddc270f
typo
2021-08-23 11:06:38 +02:00
iceman1001
8edcfb925b
text
2021-08-23 07:25:25 +02:00
merlokk
d716971430
detect lrp authentication
2021-08-22 23:12:16 +03:00
iceman1001
23190a0070
wrong size
2021-08-22 21:35:02 +02:00
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
merlokk
24665367ea
make style
2021-08-12 16:04:46 +03:00
merlokk
24b5bb56ba
speed-up mad command
2021-08-12 15:31:32 +03:00
merlokk
a8e2e912b7
add text
2021-08-12 15:05:24 +03:00
merlokk
9bf80a5017
print holder info
2021-08-12 14:54:32 +03:00
merlokk
bea7856c3e
print card holder/publisher files
2021-08-12 14:32:53 +03:00
merlokk
ec8d23d6bc
add reading card holder and card publisher sectors
2021-08-12 13:57:37 +03:00
merlokk
8c00ce7185
print MAD version
2021-08-12 13:44:34 +03:00
merlokk
fbd298850a
text
2021-08-12 13:44:01 +03:00
merlokk
df20f2dbee
print mad app
2021-08-12 13:26:24 +03:00
merlokk
82d0cc3dbf
mad command
2021-08-12 11:05:32 +03:00
merlokk
15faee341e
fix
2021-08-12 11:05:16 +03:00
merlokk
00e3f22ecc
remove debug and save to default
2021-08-11 20:36:22 +03:00
merlokk
705f7a698f
works
2021-08-11 20:28:59 +03:00
merlokk
2acbd67900
add a key
2021-08-11 16:03:01 +03:00
merlokk
b5f323672f
detect command and detect type of the key
2021-08-11 15:48:46 +03:00
Michael Huebler
1b5c28b590
Update cmdhfmf.c
...
Changed `hf mf sim -h` output, changed `-- crack` example to `-x`.
2021-08-10 18:27:57 +02:00
merlokk
9d6ebf2e58
add keys to dic
2021-08-09 23:50:21 +03:00
merlokk
716a3dad05
fix cov 354645
2021-08-09 23:15:24 +03:00
merlokk
1051bd2b92
remove old
2021-08-09 23:12:37 +03:00
merlokk
3db68e42b3
fix
2021-08-09 20:48:20 +03:00
merlokk
a22e162ce9
remove old crypto file
2021-08-09 20:23:07 +03:00
merlokk
61419f2e44
text
2021-08-09 20:17:49 +03:00
merlokk
d9c8d86863
remove globals
2021-08-09 20:10:42 +03:00
merlokk
aca059b06c
remove old code
2021-08-09 20:07:36 +03:00
merlokk
db1780fbc1
chk works
2021-08-09 20:06:10 +03:00
merlokk
882fa2334e
set keys wo clear context
2021-08-09 20:05:42 +03:00
merlokk
6799626eaf
phase 1 of keys check
2021-08-09 19:32:14 +03:00
merlokk
311edff6c7
remove old commands from top level
2021-08-09 18:28:40 +03:00
merlokk
09320b911e
the last part
2021-08-09 15:46:44 +03:00
merlokk
d939d025b0
fix
2021-08-09 15:44:13 +03:00
Oleg Moiseenko
c614565cbe
Merge branch 'master' into hex_cli
2021-08-09 15:39:08 +03:00
merlokk
530c0d7336
part 2
2021-08-09 15:36:31 +03:00
merlokk
1865b60374
part 1
2021-08-09 15:19:31 +03:00
merlokk
f50b98ece5
isoid
2021-08-09 15:12:07 +03:00
merlokk
282ea59cc6
file id
2021-08-09 15:05:44 +03:00
merlokk
33c79942c9
CmdHF14ADesValueOperations
2021-08-09 14:48:42 +03:00
merlokk
8bed10029e
cli update
2021-08-09 14:46:02 +03:00
merlokk
a06376a7f6
added file iso id to select command
2021-08-09 13:35:21 +03:00
merlokk
4e6a59f169
fix iso id byte order
2021-08-09 13:19:28 +03:00
merlokk
16781248cb
cov 354644
2021-08-09 12:00:55 +03:00
merlokk
c38109ef09
hf 14a reader fix
2021-08-09 00:31:14 +03:00
merlokk
28dc6c717b
make style
2021-08-09 00:12:01 +03:00
Oleg Moiseenko
1d695ef777
Merge pull request #1432 from merlokk/auth_ref
...
desfire authentication refactoring
2021-08-09 00:06:10 +03:00
merlokk
c4d35700a1
fix some kdf parts
2021-08-08 23:48:07 +03:00
merlokk
ccf31fef90
get uid for kdf
2021-08-08 23:02:45 +03:00
merlokk
f9b8ef5a6d
move kdf part
2021-08-08 22:42:15 +03:00
merlokk
797d878eb4
remove desfire_crypto
2021-08-08 19:31:08 +03:00
merlokk
9e3cc6826c
add AID for kdf
2021-08-08 19:27:31 +03:00
merlokk
0ef41b7b78
add masterkey for kdf
2021-08-08 19:15:06 +03:00
merlokk
455b9a4e38
an10922 3tdea works
2021-08-08 18:42:54 +03:00
merlokk
a86f332263
cmac 2tdea works
2021-08-08 18:33:35 +03:00
merlokk
e4a72b11e8
cmac add minimum len
2021-08-08 17:54:16 +03:00
iceman1001
d0c1492a46
textual changes, UID/ID -> EM Tag ID. Clarify number of hex symbols in error msg, thanks @clach04
2021-08-08 15:24:31 +02:00
Iceman
4c54d09894
Merge pull request #1435 from AxisRay/fix-cmd-error
...
bugfix: hf mfu dump not working
2021-08-08 15:08:14 +02:00
iceman1001
346db39b48
tripple question marks annoys c compiler
2021-08-08 15:06:55 +02:00
Ray Lee
5e1cfa56c0
bugfix: hf mfu dump not working
2021-08-08 20:34:36 +08:00
Adam Hořčica
5f561de4cb
Add Suica card IC Type
2021-08-08 13:34:42 +02:00
merlokk
94bb6d389b
add source
2021-08-07 22:07:24 +03:00
merlokk
2fb3385d90
test subkeys - 2tdea, 3tdea
2021-08-07 22:03:48 +03:00
merlokk
4a2a23c6e2
kdf an10922 test
2021-08-07 20:26:49 +03:00
merlokk
7aad008762
fix key path for cmac subkeys
2021-08-07 16:27:39 +03:00
merlokk
02194f3e43
aes cmac subkeys test
2021-08-07 16:16:41 +03:00
merlokk
7ea7e4b364
fix
2021-08-07 14:53:23 +03:00
merlokk
ce39985d19
remove debug
2021-08-07 13:57:50 +03:00
merlokk
88756eef79
auth concet
2021-08-07 13:54:43 +03:00
merlokk
efd3a887ae
remove some old cryto code
2021-08-07 13:42:47 +03:00
merlokk
e21010905c
add crytolib
2021-08-07 12:54:59 +03:00
merlokk
ee7438bfc1
move functions, get rid of some deendences
2021-08-07 12:20:05 +03:00
merlokk
9b999b7d2c
remove old session key gen
2021-08-07 11:53:34 +03:00
merlokk
84f470a596
remove subkey gen
2021-08-07 11:45:09 +03:00
merlokk
e822cf5b1e
make style
2021-08-06 23:45:53 +03:00
Oleg Moiseenko
86d8c5ff42
Merge pull request #1428 from craftbyte/master
...
Fix DESfire DF search and assignment to AID
2021-08-06 23:34:33 +03:00
Oleg Moiseenko
e176993097
Merge pull request #1429 from merlokk/desf_iso
...
Desfire iso commands
2021-08-06 23:20:43 +03:00
merlokk
ac7be1c4f4
remove todo
2021-08-06 23:10:40 +03:00
merlokk
53874fcd24
add help
2021-08-06 23:09:27 +03:00
merlokk
39be125df3
write binary works
2021-08-06 21:38:13 +03:00
merlokk
6c3cac9c63
fix buffer length
2021-08-06 20:31:12 +03:00
merlokk
d92c8f1bff
iso mac calculation
2021-08-06 20:27:04 +03:00
merlokk
0d551b3940
todo
2021-08-06 20:03:49 +03:00
merlokk
1b6531f50e
text fix
2021-08-06 20:02:49 +03:00
merlokk
130ab34ab6
read record
2021-08-06 20:01:13 +03:00
merlokk
92cb18e7d2
read binary works
2021-08-06 19:47:12 +03:00
merlokk
d7aa4feae8
iso select rework
2021-08-06 19:46:49 +03:00
Iceman
3ac294e0c4
Merge pull request #1430 from AxisRay/new-tag
...
Add support for Shanghai Feiju NTAG213
2021-08-06 18:10:04 +02:00
Ray Lee
67bfeeed3a
add support for Shanghai Feiju NTAG213
2021-08-06 22:32:45 +08:00
merlokk
b2ebbf3ed0
fix. remove todo)
2021-08-06 14:56:10 +03:00
merlokk
409fb65a3f
add iso to read command and read bin file
2021-08-06 14:52:58 +03:00
merlokk
c27100295a
fix iso command data
2021-08-06 14:52:33 +03:00
Philippe Teuwen
46c9b06538
Merge pull request #1423 from AxisRay/ui-improve
...
Improve user experience
2021-08-06 08:35:02 +02:00
Ray Lee
7c921c1e6e
De-redundancy
2021-08-06 11:13:15 +08:00
merlokk
18e2d55c57
remove debug & cov 354623 )
2021-08-05 20:26:27 +03:00
merlokk
f1c48db6bd
added iso commands and read sketch
2021-08-05 20:03:07 +03:00
Anže Jenšterle
51d3618d24
Merge branch 'RfidResearchGroup:master' into master
2021-08-05 18:53:58 +02:00
Anze Jensterle
c71f93687d
Fix DESfire DF search and assignment to AID
2021-08-05 18:45:50 +02:00
merlokk
3945e1e7f4
added iso channel checks
2021-08-05 19:06:53 +03:00
Oleg Moiseenko
3609f8fb36
Merge pull request #1427 from merlokk/hlp
...
setconfig help
2021-08-05 18:38:55 +03:00
merlokk
7a6766a2a3
setconfig help
2021-08-05 18:38:32 +03:00
Anže Jenšterle
d74b9f8cbe
fix json
2021-08-05 15:51:35 +02:00
Anže Jenšterle
4f33d201a9
Added LEAF identity MAD entry
2021-08-05 15:47:32 +02:00
merlokk
6e5240056e
changekey ev2 works
2021-08-05 12:32:08 +03:00
Ray Lee
457483eafe
ui improve
2021-08-05 11:03:30 +08:00
merlokk
09bb3f62a1
make style
2021-08-05 00:01:53 +03:00
Oleg Moiseenko
a6d8b2edee
Merge pull request #1420 from merlokk/desf_setconf
...
Desfire setconfig d40/ev1/ev2
2021-08-04 23:54:59 +03:00
merlokk
91b1026f6d
remove comments
2021-08-04 23:51:09 +03:00
merlokk
2432908e08
ev2 enc with padding - ok
2021-08-04 23:39:25 +03:00
Philippe Teuwen
8c140a8912
Merge pull request #1418 from RfidResearchGroup/electra
...
Electra branch
2021-08-04 22:32:16 +02:00
merlokk
7046675403
d40 fix
2021-08-04 23:13:57 +03:00
merlokk
c125c10e31
d40 + padding
2021-08-04 22:36:38 +03:00
merlokk
e78c563e45
encode with padding sketch
2021-08-04 20:01:11 +03:00
Oleg Moiseenko
d847aed5a6
Merge pull request #1419 from merlokk/desf_ev2
...
Desfire ev2 channel
2021-08-04 19:44:56 +03:00
merlokk
6388384393
cov 354477
2021-08-04 19:41:04 +03:00
iceman1001
d992ce73c3
re-added the old checksum bits but guarded them as debug prints
2021-08-04 18:25:23 +02:00
iceman1001
7e8ffc3e0c
string formatter
2021-08-04 18:17:16 +02:00
merlokk
7b79bd375f
move plain mode to mac mode
2021-08-04 19:12:44 +03:00