merlokk 03ed6a8f05 Merge branch 'master' of https://github.com/merlokk/proxmark3i into desfire4 ...

# Conflicts:
#	client/src/mifare/desfiresecurechan.c

2021-07-08 17:46:06 +03:00

..

android

forgot to push some android adaptions

2021-07-05 13:45:45 +02:00

cmdscripts

text

2021-04-16 00:15:43 +02:00

deps

make style

2021-07-08 09:53:50 +02:00

dictionaries

Update t55xx_default_pwds.dic

2021-07-05 17:27:05 -04:00

experimental_client_with_swig

py scripts

2020-11-14 00:44:18 +01:00

experimental_lib

Isolate ISO7816 select & exchange from EMVcore

2021-06-04 21:58:38 +02:00

include

make style (linux)

2020-11-29 00:28:56 +01:00

lualibs

hf 14b got some love

2021-04-23 22:25:58 +02:00

luascripts

hf_mfu_magicwrite -c: add version info

2021-07-01 22:00:57 +02:00

pyscripts

Add code to automatically create and update command help text JSON.

2021-06-04 21:58:38 +02:00

resources

added dorma kaba entry

2021-06-21 16:33:56 +02:00

src

Merge branch 'master' of https://github.com/merlokk/proxmark3i into desfire4

2021-07-08 17:46:06 +03:00

CMakeLists.txt

create new desfirecrypto

2021-07-06 12:39:06 +03:00

default_keys_dic2lua.awk

…

emojis_scrap_github.py

…

gen_pm3mfsim_script.sh

rework hf mf chk and cliparser for hf mf fchk

2021-02-13 21:03:57 -05:00

Makefile

create new desfirecrypto

2021-07-06 12:39:06 +03:00

pm3_cmd_h2lua.awk

…

README-bitlib

…