From 81bc0bc2b95e3be3e792ad54ade4a34d84657169 Mon Sep 17 00:00:00 2001 From: Bjoern Kerler Date: Thu, 16 Apr 2020 10:25:29 +0200 Subject: [PATCH] Reorder client src directories --- client/Makefile | 31 ++++++++-------- client/{ => deps}/amiitool/LICENSE | 0 client/{ => deps}/amiitool/Makefile | 6 ++-- client/{ => deps}/amiitool/amiibo.c | 0 client/{ => deps}/amiitool/amiibo.h | 0 client/{ => deps}/amiitool/amiitool.c | 2 +- client/{ => deps}/amiitool/drbg.c | 0 client/{ => deps}/amiitool/drbg.h | 0 client/{ => deps}/amiitool/key_retail.bin | Bin client/{ => deps}/amiitool/keygen.c | 0 client/{ => deps}/amiitool/keygen.h | 0 client/{ => deps}/cliparser/README.md | 0 client/{ => deps}/cliparser/argtable3.c | 0 client/{ => deps}/cliparser/argtable3.h | 0 client/{ => deps}/cliparser/cliparser.c | 0 client/{ => deps}/cliparser/cliparser.h | 0 client/{ => deps}/cliparser/getopt.h | 0 .../hardnested/hardnested_bf_core.c | 4 +-- .../hardnested/hardnested_bf_core.h | 0 .../hardnested/hardnested_bitarray_core.c | 0 .../hardnested/hardnested_bitarray_core.h | 0 .../hardnested/hardnested_bruteforce.c | 0 .../hardnested/hardnested_bruteforce.h | 28 ++++++++++++++- .../{ => deps}/hardnested/hardnested_tables.c | 0 client/{ => deps}/jansson/Makefile | 2 +- client/{ => deps}/jansson/dump.c | 0 client/{ => deps}/jansson/error.c | 0 client/{ => deps}/jansson/hashtable.c | 2 +- client/{ => deps}/jansson/hashtable.h | 0 client/{ => deps}/jansson/hashtable_seed.c | 0 client/{ => deps}/jansson/jansson.def | 0 client/{ => deps}/jansson/jansson.h | 0 client/{ => deps}/jansson/jansson_config.h | 0 client/{ => deps}/jansson/jansson_config.h.in | 0 client/{ => deps}/jansson/jansson_private.h | 0 client/{ => deps}/jansson/load.c | 0 client/{ => deps}/jansson/lookup3.h | 0 client/{ => deps}/jansson/memory.c | 0 client/{ => deps}/jansson/pack_unpack.c | 0 client/{ => deps}/jansson/path.c | 2 +- client/{ => deps}/jansson/strbuffer.c | 0 client/{ => deps}/jansson/strbuffer.h | 0 client/{ => deps}/jansson/strconv.c | 0 client/{ => deps}/jansson/utf.c | 0 client/{ => deps}/jansson/utf.h | 0 client/{ => deps}/jansson/value.c | 0 client/{ => deps}/liblua/Makefile | 2 +- client/{ => deps}/liblua/lapi.c | 0 client/{ => deps}/liblua/lapi.h | 0 client/{ => deps}/liblua/lauxlib.c | 0 client/{ => deps}/liblua/lauxlib.h | 0 client/{ => deps}/liblua/lbaselib.c | 0 client/{ => deps}/liblua/lbitlib.c | 0 client/{ => deps}/liblua/lcode.c | 0 client/{ => deps}/liblua/lcode.h | 0 client/{ => deps}/liblua/lcorolib.c | 0 client/{ => deps}/liblua/lctype.c | 0 client/{ => deps}/liblua/lctype.h | 0 client/{ => deps}/liblua/ldblib.c | 0 client/{ => deps}/liblua/ldebug.c | 0 client/{ => deps}/liblua/ldebug.h | 0 client/{ => deps}/liblua/ldo.c | 0 client/{ => deps}/liblua/ldo.h | 0 client/{ => deps}/liblua/ldump.c | 0 client/{ => deps}/liblua/lfunc.c | 0 client/{ => deps}/liblua/lfunc.h | 0 client/{ => deps}/liblua/lgc.c | 0 client/{ => deps}/liblua/lgc.h | 0 client/{ => deps}/liblua/linit.c | 0 client/{ => deps}/liblua/liolib.c | 0 client/{ => deps}/liblua/llex.c | 0 client/{ => deps}/liblua/llex.h | 0 client/{ => deps}/liblua/llimits.h | 0 client/{ => deps}/liblua/lmathlib.c | 0 client/{ => deps}/liblua/lmem.c | 0 client/{ => deps}/liblua/lmem.h | 0 client/{ => deps}/liblua/loadlib.c | 0 client/{ => deps}/liblua/lobject.c | 0 client/{ => deps}/liblua/lobject.h | 0 client/{ => deps}/liblua/lopcodes.c | 0 client/{ => deps}/liblua/lopcodes.h | 0 client/{ => deps}/liblua/loslib.c | 0 client/{ => deps}/liblua/lparser.c | 0 client/{ => deps}/liblua/lparser.h | 0 client/{ => deps}/liblua/lstate.c | 0 client/{ => deps}/liblua/lstate.h | 0 client/{ => deps}/liblua/lstring.c | 0 client/{ => deps}/liblua/lstring.h | 0 client/{ => deps}/liblua/lstrlib.c | 0 client/{ => deps}/liblua/ltable.c | 0 client/{ => deps}/liblua/ltable.h | 0 client/{ => deps}/liblua/ltablib.c | 0 client/{ => deps}/liblua/ltm.c | 0 client/{ => deps}/liblua/ltm.h | 0 client/{ => deps}/liblua/lua.c | 0 client/{ => deps}/liblua/lua.h | 0 client/{ => deps}/liblua/lua.hpp | 0 client/{ => deps}/liblua/luac.c | 0 client/{ => deps}/liblua/luaconf.h | 0 client/{ => deps}/liblua/lualib.h | 0 client/{ => deps}/liblua/lundump.c | 0 client/{ => deps}/liblua/lundump.h | 0 client/{ => deps}/liblua/lvm.c | 0 client/{ => deps}/liblua/lvm.h | 0 client/{ => deps}/liblua/lzio.c | 0 client/{ => deps}/liblua/lzio.h | 0 client/{ => deps}/reveng/Makefile | 2 +- client/{ => deps}/reveng/bmpbit.c | 0 client/{ => deps}/reveng/cli.c | 0 client/{ => deps}/reveng/config.h | 0 client/{ => deps}/reveng/getopt.c | 0 client/{ => deps}/reveng/getopt.h | 0 client/{ => deps}/reveng/model.c | 0 client/{ => deps}/reveng/poly.c | 0 client/{ => deps}/reveng/preset.c | 0 client/{ => deps}/reveng/reveng.c | 0 client/{ => deps}/reveng/reveng.h | 0 client/{ => deps}/tinycbor/Makefile | 2 +- client/{ => deps}/tinycbor/cbor.h | 0 client/{ => deps}/tinycbor/cborencoder.c | 0 .../cborencoder_close_container_checked.c | 0 client/{ => deps}/tinycbor/cborerrorstrings.c | 0 client/{ => deps}/tinycbor/cborinternal_p.h | 0 client/{ => deps}/tinycbor/cborjson.h | 0 client/{ => deps}/tinycbor/cborparser.c | 0 .../tinycbor/cborparser_dup_string.c | 0 client/{ => deps}/tinycbor/cborpretty.c | 0 client/{ => deps}/tinycbor/cborpretty_stdio.c | 0 client/{ => deps}/tinycbor/cbortojson.c | 0 client/{ => deps}/tinycbor/cborvalidation.c | 0 .../{ => deps}/tinycbor/compilersupport_p.h | 0 client/{ => deps}/tinycbor/open_memstream.c | 0 client/{ => deps}/tinycbor/tinycbor-version.h | 0 client/{ => deps}/tinycbor/utf8_p.h | 0 client/{ => src}/aidsearch.c | 0 client/{ => src}/aidsearch.h | 0 client/{ => src}/cmdanalyse.c | 0 client/{ => src}/cmdanalyse.h | 0 client/{ => src}/cmdcrc.c | 0 client/{ => src}/cmdcrc.h | 0 client/{ => src}/cmddata.c | 2 +- client/{ => src}/cmddata.h | 0 client/{ => src}/cmdflashmem.c | 0 client/{ => src}/cmdflashmem.h | 0 client/{ => src}/cmdflashmemspiffs.c | 0 client/{ => src}/cmdflashmemspiffs.h | 0 client/{ => src}/cmdhf.c | 2 +- client/{ => src}/cmdhf.h | 0 client/{ => src}/cmdhf14a.c | 0 client/{ => src}/cmdhf14a.h | 0 client/{ => src}/cmdhf14b.c | 0 client/{ => src}/cmdhf14b.h | 0 client/{ => src}/cmdhf15.c | 2 +- client/{ => src}/cmdhf15.h | 0 client/{ => src}/cmdhfcryptorf.c | 0 client/{ => src}/cmdhfcryptorf.h | 0 client/{ => src}/cmdhfepa.c | 0 client/{ => src}/cmdhfepa.h | 0 client/{ => src}/cmdhffelica.c | 0 client/{ => src}/cmdhffelica.h | 0 client/{ => src}/cmdhffido.c | 4 +-- client/{ => src}/cmdhffido.h | 0 client/{ => src}/cmdhficlass.c | 8 ++--- client/{ => src}/cmdhficlass.h | 0 client/{ => src}/cmdhflegic.c | 0 client/{ => src}/cmdhflegic.h | 0 client/{ => src}/cmdhflist.c | 0 client/{ => src}/cmdhflist.h | 0 client/{ => src}/cmdhflto.c | 0 client/{ => src}/cmdhflto.h | 0 client/{ => src}/cmdhfmf.c | 1 + client/{ => src}/cmdhfmf.h | 0 client/{ => src}/cmdhfmfdes.c | 2 +- client/{ => src}/cmdhfmfdes.h | 0 client/{ => src}/cmdhfmfdesfire_disabled.c | 0 client/{ => src}/cmdhfmfdesfire_disabled.h | 0 client/{ => src}/cmdhfmfhard.c | 2 +- client/{ => src}/cmdhfmfhard.h | 27 -------------- client/{ => src}/cmdhfmfp.c | 2 +- client/{ => src}/cmdhfmfp.h | 0 client/{ => src}/cmdhfmfu.c | 2 +- client/{ => src}/cmdhfmfu.h | 0 client/{ => src}/cmdhfthinfilm.c | 0 client/{ => src}/cmdhfthinfilm.h | 0 client/{ => src}/cmdhftopaz.c | 0 client/{ => src}/cmdhftopaz.h | 0 client/{ => src}/cmdhw.c | 0 client/{ => src}/cmdhw.h | 0 client/{ => src}/cmdlf.c | 0 client/{ => src}/cmdlf.h | 0 client/{ => src}/cmdlfawid.c | 0 client/{ => src}/cmdlfawid.h | 0 client/{ => src}/cmdlfcotag.c | 0 client/{ => src}/cmdlfcotag.h | 0 client/{ => src}/cmdlfem4x.c | 0 client/{ => src}/cmdlfem4x.h | 0 client/{ => src}/cmdlffdx.c | 0 client/{ => src}/cmdlffdx.h | 0 client/{ => src}/cmdlfgallagher.c | 0 client/{ => src}/cmdlfgallagher.h | 0 client/{ => src}/cmdlfguard.c | 0 client/{ => src}/cmdlfguard.h | 0 client/{ => src}/cmdlfhid.c | 0 client/{ => src}/cmdlfhid.h | 0 client/{ => src}/cmdlfhitag.c | 0 client/{ => src}/cmdlfhitag.h | 0 client/{ => src}/cmdlfindala.c | 0 client/{ => src}/cmdlfindala.h | 0 client/{ => src}/cmdlfio.c | 0 client/{ => src}/cmdlfio.h | 0 client/{ => src}/cmdlfjablotron.c | 0 client/{ => src}/cmdlfjablotron.h | 0 client/{ => src}/cmdlfkeri.c | 0 client/{ => src}/cmdlfkeri.h | 0 client/{ => src}/cmdlfmotorola.c | 0 client/{ => src}/cmdlfmotorola.h | 0 client/{ => src}/cmdlfnedap.c | 0 client/{ => src}/cmdlfnedap.h | 0 client/{ => src}/cmdlfnexwatch.c | 0 client/{ => src}/cmdlfnexwatch.h | 0 client/{ => src}/cmdlfnoralsy.c | 0 client/{ => src}/cmdlfnoralsy.h | 0 client/{ => src}/cmdlfpac.c | 0 client/{ => src}/cmdlfpac.h | 0 client/{ => src}/cmdlfparadox.c | 0 client/{ => src}/cmdlfparadox.h | 0 client/{ => src}/cmdlfpcf7931.c | 0 client/{ => src}/cmdlfpcf7931.h | 0 client/{ => src}/cmdlfpresco.c | 0 client/{ => src}/cmdlfpresco.h | 0 client/{ => src}/cmdlfpyramid.c | 0 client/{ => src}/cmdlfpyramid.h | 0 client/{ => src}/cmdlfsecurakey.c | 0 client/{ => src}/cmdlfsecurakey.h | 0 client/{ => src}/cmdlft55xx.c | 0 client/{ => src}/cmdlft55xx.h | 0 client/{ => src}/cmdlfti.c | 0 client/{ => src}/cmdlfti.h | 0 client/{ => src}/cmdlfverichip.c | 0 client/{ => src}/cmdlfverichip.h | 0 client/{ => src}/cmdlfviking.c | 0 client/{ => src}/cmdlfviking.h | 0 client/{ => src}/cmdlfvisa2000.c | 0 client/{ => src}/cmdlfvisa2000.h | 0 client/{ => src}/cmdmain.c | 0 client/{ => src}/cmdmain.h | 0 client/{ => src}/cmdparser.c | 0 client/{ => src}/cmdparser.h | 0 client/{ => src}/cmdscript.c | 0 client/{ => src}/cmdscript.h | 0 client/{ => src}/cmdsmartcard.c | 2 +- client/{ => src}/cmdsmartcard.h | 0 client/{ => src}/cmdtrace.c | 0 client/{ => src}/cmdtrace.h | 0 client/{ => src}/cmdusart.c | 0 client/{ => src}/cmdusart.h | 0 client/{ => src}/cmdwiegand.c | 0 client/{ => src}/cmdwiegand.h | 0 client/{ => src}/comms.c | 0 client/{ => src}/comms.h | 0 client/{ => src}/crypto/asn1dump.c | 0 client/{ => src}/crypto/asn1dump.h | 0 client/{ => src}/crypto/asn1utils.c | 0 client/{ => src}/crypto/asn1utils.h | 0 client/{ => src}/crypto/libpcrypto.c | 0 client/{ => src}/crypto/libpcrypto.h | 0 client/{ => src}/elf.h | 0 client/{ => src}/emojis.h | 0 client/{ => src}/emojis_alt.h | 0 client/{ => src}/emv/apduinfo.c | 0 client/{ => src}/emv/apduinfo.h | 0 client/{ => src}/emv/cmdemv.c | 0 client/{ => src}/emv/cmdemv.h | 0 client/{ => src}/emv/crypto.c | 0 client/{ => src}/emv/crypto.h | 0 client/{ => src}/emv/crypto_backend.h | 0 client/{ => src}/emv/crypto_polarssl.c | 0 client/{ => src}/emv/dol.c | 0 client/{ => src}/emv/dol.h | 0 client/{ => src}/emv/dump.c | 0 client/{ => src}/emv/dump.h | 0 client/{ => src}/emv/emv_pk.c | 0 client/{ => src}/emv/emv_pk.h | 0 client/{ => src}/emv/emv_pki.c | 0 client/{ => src}/emv/emv_pki.h | 0 client/{ => src}/emv/emv_pki_priv.c | 0 client/{ => src}/emv/emv_pki_priv.h | 0 client/{ => src}/emv/emv_roca.c | 0 client/{ => src}/emv/emv_roca.h | 0 client/{ => src}/emv/emv_tags.c | 0 client/{ => src}/emv/emv_tags.h | 0 client/{ => src}/emv/emvcore.c | 0 client/{ => src}/emv/emvcore.h | 0 client/{ => src}/emv/emvjson.c | 0 client/{ => src}/emv/emvjson.h | 0 client/{ => src}/emv/test/cda_test.c | 0 client/{ => src}/emv/test/cda_test.h | 0 client/{ => src}/emv/test/crypto_test.c | 0 client/{ => src}/emv/test/crypto_test.h | 0 client/{ => src}/emv/test/cryptotest.c | 0 client/{ => src}/emv/test/cryptotest.h | 0 client/{ => src}/emv/test/dda_test.c | 0 client/{ => src}/emv/test/dda_test.h | 0 client/{ => src}/emv/test/sda_test.c | 0 client/{ => src}/emv/test/sda_test.h | 0 client/{ => src}/emv/tlv.c | 0 client/{ => src}/emv/tlv.h | 0 client/{ => src}/fido/additional_ca.c | 0 client/{ => src}/fido/additional_ca.h | 0 client/{ => src}/fido/cbortools.c | 0 client/{ => src}/fido/cbortools.h | 0 client/{ => src}/fido/cose.c | 0 client/{ => src}/fido/cose.h | 0 client/{ => src}/fido/fido2.json | 0 client/{ => src}/fido/fidocore.c | 0 client/{ => src}/fido/fidocore.h | 0 client/{ => src}/fileutils.c | 0 client/{ => src}/fileutils.h | 0 client/{ => src}/flash.c | 0 client/{ => src}/flash.h | 0 client/{ => src}/graph.c | 0 client/{ => src}/graph.h | 0 client/{ => src}/guidummy.cpp | 0 client/{ => src}/loclass/cipher.c | 0 client/{ => src}/loclass/cipher.h | 0 client/{ => src}/loclass/cipherutils.c | 0 client/{ => src}/loclass/cipherutils.h | 0 client/{ => src}/loclass/elite_crack.c | 0 client/{ => src}/loclass/elite_crack.h | 0 client/{ => src}/loclass/hash1_brute.c | 0 client/{ => src}/loclass/hash1_brute.h | 0 client/{ => src}/loclass/ikeys.c | 0 client/{ => src}/loclass/ikeys.h | 0 client/{ => src}/mifare/desfire_crypto.c | 34 +----------------- client/{ => src}/mifare/desfire_crypto.h | 4 +-- client/{ => src}/mifare/mad.c | 0 client/{ => src}/mifare/mad.h | 0 client/{ => src}/mifare/mfkey.c | 0 client/{ => src}/mifare/mfkey.h | 0 client/{ => src}/mifare/mifare4.c | 0 client/{ => src}/mifare/mifare4.h | 0 client/{ => src}/mifare/mifaredefault.c | 0 client/{ => src}/mifare/mifaredefault.h | 0 client/{ => src}/mifare/mifarehost.c | 0 client/{ => src}/mifare/mifarehost.h | 0 client/{ => src}/mifare/ndef.c | 0 client/{ => src}/mifare/ndef.h | 0 client/{ => src}/pm3_binlib.c | 0 client/{ => src}/pm3_binlib.h | 0 client/{ => src}/pm3_bit_limits.h | 0 client/{ => src}/pm3_bitlib.c | 0 client/{ => src}/pm3_bitlib.h | 0 client/{ => src}/polarssl_config.h | 0 client/{ => src}/preferences.c | 0 client/{ => src}/preferences.h | 0 client/{ => src}/prng.c | 0 client/{ => src}/prng.h | 0 client/{ => src}/proxendian.h | 0 client/{ => src}/proxgui.cpp | 0 client/{ => src}/proxgui.h | 0 client/{ => src}/proxguiqt.cpp | 0 client/{ => src}/proxguiqt.h | 0 client/{ => src}/proxmark3.c | 0 client/{ => src}/proxmark3.h | 0 client/{ => src}/scandir.c | 0 client/{ => src}/scandir.h | 0 client/{ => src}/scripting.c | 0 client/{ => src}/scripting.h | 0 client/{ => src}/tea.c | 0 client/{ => src}/tea.h | 0 client/{ => src}/uart/README.md | 0 client/{ => src}/uart/uart.h | 0 client/{ => src}/uart/uart_posix.c | 0 client/{ => src}/uart/uart_win32.c | 0 client/{ => src}/ui.c | 0 client/{ => src}/ui.h | 0 client/{ => src}/ui/overlays.ui | 0 client/{ => src}/util.c | 0 client/{ => src}/util.h | 0 client/{ => src}/util_darwin.h | 0 client/{ => src}/util_darwin.m | 0 client/{ => src}/whereami.c | 2 +- client/{ => src}/whereami.h | 0 client/{ => src}/wiegand_formats.c | 0 client/{ => src}/wiegand_formats.h | 0 client/{ => src}/wiegand_formatutils.c | 0 client/{ => src}/wiegand_formatutils.h | 0 387 files changed, 73 insertions(+), 106 deletions(-) rename client/{ => deps}/amiitool/LICENSE (100%) rename client/{ => deps}/amiitool/Makefile (51%) rename client/{ => deps}/amiitool/amiibo.c (100%) rename client/{ => deps}/amiitool/amiibo.h (100%) rename client/{ => deps}/amiitool/amiitool.c (99%) rename client/{ => deps}/amiitool/drbg.c (100%) rename client/{ => deps}/amiitool/drbg.h (100%) rename client/{ => deps}/amiitool/key_retail.bin (100%) rename client/{ => deps}/amiitool/keygen.c (100%) rename client/{ => deps}/amiitool/keygen.h (100%) rename client/{ => deps}/cliparser/README.md (100%) rename client/{ => deps}/cliparser/argtable3.c (100%) rename client/{ => deps}/cliparser/argtable3.h (100%) rename client/{ => deps}/cliparser/cliparser.c (100%) rename client/{ => deps}/cliparser/cliparser.h (100%) rename client/{ => deps}/cliparser/getopt.h (100%) rename client/{ => deps}/hardnested/hardnested_bf_core.c (99%) rename client/{ => deps}/hardnested/hardnested_bf_core.h (100%) rename client/{ => deps}/hardnested/hardnested_bitarray_core.c (100%) rename client/{ => deps}/hardnested/hardnested_bitarray_core.h (100%) rename client/{ => deps}/hardnested/hardnested_bruteforce.c (100%) rename client/{ => deps}/hardnested/hardnested_bruteforce.h (71%) rename client/{ => deps}/hardnested/hardnested_tables.c (100%) rename client/{ => deps}/jansson/Makefile (90%) rename client/{ => deps}/jansson/dump.c (100%) rename client/{ => deps}/jansson/error.c (100%) rename client/{ => deps}/jansson/hashtable.c (99%) rename client/{ => deps}/jansson/hashtable.h (100%) rename client/{ => deps}/jansson/hashtable_seed.c (100%) rename client/{ => deps}/jansson/jansson.def (100%) rename client/{ => deps}/jansson/jansson.h (100%) rename client/{ => deps}/jansson/jansson_config.h (100%) rename client/{ => deps}/jansson/jansson_config.h.in (100%) rename client/{ => deps}/jansson/jansson_private.h (100%) rename client/{ => deps}/jansson/load.c (100%) rename client/{ => deps}/jansson/lookup3.h (100%) rename client/{ => deps}/jansson/memory.c (100%) rename client/{ => deps}/jansson/pack_unpack.c (100%) rename client/{ => deps}/jansson/path.c (99%) rename client/{ => deps}/jansson/strbuffer.c (100%) rename client/{ => deps}/jansson/strbuffer.h (100%) rename client/{ => deps}/jansson/strconv.c (100%) rename client/{ => deps}/jansson/utf.c (100%) rename client/{ => deps}/jansson/utf.h (100%) rename client/{ => deps}/jansson/value.c (100%) rename client/{ => deps}/liblua/Makefile (97%) rename client/{ => deps}/liblua/lapi.c (100%) rename client/{ => deps}/liblua/lapi.h (100%) rename client/{ => deps}/liblua/lauxlib.c (100%) rename client/{ => deps}/liblua/lauxlib.h (100%) rename client/{ => deps}/liblua/lbaselib.c (100%) rename client/{ => deps}/liblua/lbitlib.c (100%) rename client/{ => deps}/liblua/lcode.c (100%) rename client/{ => deps}/liblua/lcode.h (100%) rename client/{ => deps}/liblua/lcorolib.c (100%) rename client/{ => deps}/liblua/lctype.c (100%) rename client/{ => deps}/liblua/lctype.h (100%) rename client/{ => deps}/liblua/ldblib.c (100%) rename client/{ => deps}/liblua/ldebug.c (100%) rename client/{ => deps}/liblua/ldebug.h (100%) rename client/{ => deps}/liblua/ldo.c (100%) rename client/{ => deps}/liblua/ldo.h (100%) rename client/{ => deps}/liblua/ldump.c (100%) rename client/{ => deps}/liblua/lfunc.c (100%) rename client/{ => deps}/liblua/lfunc.h (100%) rename client/{ => deps}/liblua/lgc.c (100%) rename client/{ => deps}/liblua/lgc.h (100%) rename client/{ => deps}/liblua/linit.c (100%) rename client/{ => deps}/liblua/liolib.c (100%) rename client/{ => deps}/liblua/llex.c (100%) rename client/{ => deps}/liblua/llex.h (100%) rename client/{ => deps}/liblua/llimits.h (100%) rename client/{ => deps}/liblua/lmathlib.c (100%) rename client/{ => deps}/liblua/lmem.c (100%) rename client/{ => deps}/liblua/lmem.h (100%) rename client/{ => deps}/liblua/loadlib.c (100%) rename client/{ => deps}/liblua/lobject.c (100%) rename client/{ => deps}/liblua/lobject.h (100%) rename client/{ => deps}/liblua/lopcodes.c (100%) rename client/{ => deps}/liblua/lopcodes.h (100%) rename client/{ => deps}/liblua/loslib.c (100%) rename client/{ => deps}/liblua/lparser.c (100%) rename client/{ => deps}/liblua/lparser.h (100%) rename client/{ => deps}/liblua/lstate.c (100%) rename client/{ => deps}/liblua/lstate.h (100%) rename client/{ => deps}/liblua/lstring.c (100%) rename client/{ => deps}/liblua/lstring.h (100%) rename client/{ => deps}/liblua/lstrlib.c (100%) rename client/{ => deps}/liblua/ltable.c (100%) rename client/{ => deps}/liblua/ltable.h (100%) rename client/{ => deps}/liblua/ltablib.c (100%) rename client/{ => deps}/liblua/ltm.c (100%) rename client/{ => deps}/liblua/ltm.h (100%) rename client/{ => deps}/liblua/lua.c (100%) rename client/{ => deps}/liblua/lua.h (100%) rename client/{ => deps}/liblua/lua.hpp (100%) rename client/{ => deps}/liblua/luac.c (100%) rename client/{ => deps}/liblua/luaconf.h (100%) rename client/{ => deps}/liblua/lualib.h (100%) rename client/{ => deps}/liblua/lundump.c (100%) rename client/{ => deps}/liblua/lundump.h (100%) rename client/{ => deps}/liblua/lvm.c (100%) rename client/{ => deps}/liblua/lvm.h (100%) rename client/{ => deps}/liblua/lzio.c (100%) rename client/{ => deps}/liblua/lzio.h (100%) rename client/{ => deps}/reveng/Makefile (95%) rename client/{ => deps}/reveng/bmpbit.c (100%) rename client/{ => deps}/reveng/cli.c (100%) rename client/{ => deps}/reveng/config.h (100%) rename client/{ => deps}/reveng/getopt.c (100%) rename client/{ => deps}/reveng/getopt.h (100%) rename client/{ => deps}/reveng/model.c (100%) rename client/{ => deps}/reveng/poly.c (100%) rename client/{ => deps}/reveng/preset.c (100%) rename client/{ => deps}/reveng/reveng.c (100%) rename client/{ => deps}/reveng/reveng.h (100%) rename client/{ => deps}/tinycbor/Makefile (93%) rename client/{ => deps}/tinycbor/cbor.h (100%) rename client/{ => deps}/tinycbor/cborencoder.c (100%) rename client/{ => deps}/tinycbor/cborencoder_close_container_checked.c (100%) rename client/{ => deps}/tinycbor/cborerrorstrings.c (100%) rename client/{ => deps}/tinycbor/cborinternal_p.h (100%) rename client/{ => deps}/tinycbor/cborjson.h (100%) rename client/{ => deps}/tinycbor/cborparser.c (100%) rename client/{ => deps}/tinycbor/cborparser_dup_string.c (100%) rename client/{ => deps}/tinycbor/cborpretty.c (100%) rename client/{ => deps}/tinycbor/cborpretty_stdio.c (100%) rename client/{ => deps}/tinycbor/cbortojson.c (100%) rename client/{ => deps}/tinycbor/cborvalidation.c (100%) rename client/{ => deps}/tinycbor/compilersupport_p.h (100%) rename client/{ => deps}/tinycbor/open_memstream.c (100%) rename client/{ => deps}/tinycbor/tinycbor-version.h (100%) rename client/{ => deps}/tinycbor/utf8_p.h (100%) rename client/{ => src}/aidsearch.c (100%) rename client/{ => src}/aidsearch.h (100%) rename client/{ => src}/cmdanalyse.c (100%) rename client/{ => src}/cmdanalyse.h (100%) rename client/{ => src}/cmdcrc.c (100%) rename client/{ => src}/cmdcrc.h (100%) rename client/{ => src}/cmddata.c (99%) rename client/{ => src}/cmddata.h (100%) rename client/{ => src}/cmdflashmem.c (100%) rename client/{ => src}/cmdflashmem.h (100%) rename client/{ => src}/cmdflashmemspiffs.c (100%) rename client/{ => src}/cmdflashmemspiffs.h (100%) rename client/{ => src}/cmdhf.c (99%) rename client/{ => src}/cmdhf.h (100%) rename client/{ => src}/cmdhf14a.c (100%) rename client/{ => src}/cmdhf14a.h (100%) rename client/{ => src}/cmdhf14b.c (100%) rename client/{ => src}/cmdhf14b.h (100%) rename client/{ => src}/cmdhf15.c (99%) rename client/{ => src}/cmdhf15.h (100%) rename client/{ => src}/cmdhfcryptorf.c (100%) rename client/{ => src}/cmdhfcryptorf.h (100%) rename client/{ => src}/cmdhfepa.c (100%) rename client/{ => src}/cmdhfepa.h (100%) rename client/{ => src}/cmdhffelica.c (100%) rename client/{ => src}/cmdhffelica.h (100%) rename client/{ => src}/cmdhffido.c (99%) rename client/{ => src}/cmdhffido.h (100%) rename client/{ => src}/cmdhficlass.c (99%) rename client/{ => src}/cmdhficlass.h (100%) rename client/{ => src}/cmdhflegic.c (100%) rename client/{ => src}/cmdhflegic.h (100%) rename client/{ => src}/cmdhflist.c (100%) rename client/{ => src}/cmdhflist.h (100%) rename client/{ => src}/cmdhflto.c (100%) rename client/{ => src}/cmdhflto.h (100%) rename client/{ => src}/cmdhfmf.c (99%) rename client/{ => src}/cmdhfmf.h (100%) rename client/{ => src}/cmdhfmfdes.c (99%) rename client/{ => src}/cmdhfmfdes.h (100%) rename client/{ => src}/cmdhfmfdesfire_disabled.c (100%) rename client/{ => src}/cmdhfmfdesfire_disabled.h (100%) rename client/{ => src}/cmdhfmfhard.c (99%) rename client/{ => src}/cmdhfmfhard.h (58%) rename client/{ => src}/cmdhfmfp.c (99%) rename client/{ => src}/cmdhfmfp.h (100%) rename client/{ => src}/cmdhfmfu.c (99%) rename client/{ => src}/cmdhfmfu.h (100%) rename client/{ => src}/cmdhfthinfilm.c (100%) rename client/{ => src}/cmdhfthinfilm.h (100%) rename client/{ => src}/cmdhftopaz.c (100%) rename client/{ => src}/cmdhftopaz.h (100%) rename client/{ => src}/cmdhw.c (100%) rename client/{ => src}/cmdhw.h (100%) rename client/{ => src}/cmdlf.c (100%) rename client/{ => src}/cmdlf.h (100%) rename client/{ => src}/cmdlfawid.c (100%) rename client/{ => src}/cmdlfawid.h (100%) rename client/{ => src}/cmdlfcotag.c (100%) rename client/{ => src}/cmdlfcotag.h (100%) rename client/{ => src}/cmdlfem4x.c (100%) rename client/{ => src}/cmdlfem4x.h (100%) rename client/{ => src}/cmdlffdx.c (100%) rename client/{ => src}/cmdlffdx.h (100%) rename client/{ => src}/cmdlfgallagher.c (100%) rename client/{ => src}/cmdlfgallagher.h (100%) rename client/{ => src}/cmdlfguard.c (100%) rename client/{ => src}/cmdlfguard.h (100%) rename client/{ => src}/cmdlfhid.c (100%) rename client/{ => src}/cmdlfhid.h (100%) rename client/{ => src}/cmdlfhitag.c (100%) rename client/{ => src}/cmdlfhitag.h (100%) rename client/{ => src}/cmdlfindala.c (100%) rename client/{ => src}/cmdlfindala.h (100%) rename client/{ => src}/cmdlfio.c (100%) rename client/{ => src}/cmdlfio.h (100%) rename client/{ => src}/cmdlfjablotron.c (100%) rename client/{ => src}/cmdlfjablotron.h (100%) rename client/{ => src}/cmdlfkeri.c (100%) rename client/{ => src}/cmdlfkeri.h (100%) rename client/{ => src}/cmdlfmotorola.c (100%) rename client/{ => src}/cmdlfmotorola.h (100%) rename client/{ => src}/cmdlfnedap.c (100%) rename client/{ => src}/cmdlfnedap.h (100%) rename client/{ => src}/cmdlfnexwatch.c (100%) rename client/{ => src}/cmdlfnexwatch.h (100%) rename client/{ => src}/cmdlfnoralsy.c (100%) rename client/{ => src}/cmdlfnoralsy.h (100%) rename client/{ => src}/cmdlfpac.c (100%) rename client/{ => src}/cmdlfpac.h (100%) rename client/{ => src}/cmdlfparadox.c (100%) rename client/{ => src}/cmdlfparadox.h (100%) rename client/{ => src}/cmdlfpcf7931.c (100%) rename client/{ => src}/cmdlfpcf7931.h (100%) rename client/{ => src}/cmdlfpresco.c (100%) rename client/{ => src}/cmdlfpresco.h (100%) rename client/{ => src}/cmdlfpyramid.c (100%) rename client/{ => src}/cmdlfpyramid.h (100%) rename client/{ => src}/cmdlfsecurakey.c (100%) rename client/{ => src}/cmdlfsecurakey.h (100%) rename client/{ => src}/cmdlft55xx.c (100%) rename client/{ => src}/cmdlft55xx.h (100%) rename client/{ => src}/cmdlfti.c (100%) rename client/{ => src}/cmdlfti.h (100%) rename client/{ => src}/cmdlfverichip.c (100%) rename client/{ => src}/cmdlfverichip.h (100%) rename client/{ => src}/cmdlfviking.c (100%) rename client/{ => src}/cmdlfviking.h (100%) rename client/{ => src}/cmdlfvisa2000.c (100%) rename client/{ => src}/cmdlfvisa2000.h (100%) rename client/{ => src}/cmdmain.c (100%) rename client/{ => src}/cmdmain.h (100%) rename client/{ => src}/cmdparser.c (100%) rename client/{ => src}/cmdparser.h (100%) rename client/{ => src}/cmdscript.c (100%) rename client/{ => src}/cmdscript.h (100%) rename client/{ => src}/cmdsmartcard.c (99%) rename client/{ => src}/cmdsmartcard.h (100%) rename client/{ => src}/cmdtrace.c (100%) rename client/{ => src}/cmdtrace.h (100%) rename client/{ => src}/cmdusart.c (100%) rename client/{ => src}/cmdusart.h (100%) rename client/{ => src}/cmdwiegand.c (100%) rename client/{ => src}/cmdwiegand.h (100%) rename client/{ => src}/comms.c (100%) rename client/{ => src}/comms.h (100%) rename client/{ => src}/crypto/asn1dump.c (100%) rename client/{ => src}/crypto/asn1dump.h (100%) rename client/{ => src}/crypto/asn1utils.c (100%) rename client/{ => src}/crypto/asn1utils.h (100%) rename client/{ => src}/crypto/libpcrypto.c (100%) rename client/{ => src}/crypto/libpcrypto.h (100%) rename client/{ => src}/elf.h (100%) rename client/{ => src}/emojis.h (100%) rename client/{ => src}/emojis_alt.h (100%) rename client/{ => src}/emv/apduinfo.c (100%) rename client/{ => src}/emv/apduinfo.h (100%) rename client/{ => src}/emv/cmdemv.c (100%) rename client/{ => src}/emv/cmdemv.h (100%) rename client/{ => src}/emv/crypto.c (100%) rename client/{ => src}/emv/crypto.h (100%) rename client/{ => src}/emv/crypto_backend.h (100%) rename client/{ => src}/emv/crypto_polarssl.c (100%) rename client/{ => src}/emv/dol.c (100%) rename client/{ => src}/emv/dol.h (100%) rename client/{ => src}/emv/dump.c (100%) rename client/{ => src}/emv/dump.h (100%) rename client/{ => src}/emv/emv_pk.c (100%) rename client/{ => src}/emv/emv_pk.h (100%) rename client/{ => src}/emv/emv_pki.c (100%) rename client/{ => src}/emv/emv_pki.h (100%) rename client/{ => src}/emv/emv_pki_priv.c (100%) rename client/{ => src}/emv/emv_pki_priv.h (100%) rename client/{ => src}/emv/emv_roca.c (100%) rename client/{ => src}/emv/emv_roca.h (100%) rename client/{ => src}/emv/emv_tags.c (100%) rename client/{ => src}/emv/emv_tags.h (100%) rename client/{ => src}/emv/emvcore.c (100%) rename client/{ => src}/emv/emvcore.h (100%) rename client/{ => src}/emv/emvjson.c (100%) rename client/{ => src}/emv/emvjson.h (100%) rename client/{ => src}/emv/test/cda_test.c (100%) rename client/{ => src}/emv/test/cda_test.h (100%) rename client/{ => src}/emv/test/crypto_test.c (100%) rename client/{ => src}/emv/test/crypto_test.h (100%) rename client/{ => src}/emv/test/cryptotest.c (100%) rename client/{ => src}/emv/test/cryptotest.h (100%) rename client/{ => src}/emv/test/dda_test.c (100%) rename client/{ => src}/emv/test/dda_test.h (100%) rename client/{ => src}/emv/test/sda_test.c (100%) rename client/{ => src}/emv/test/sda_test.h (100%) rename client/{ => src}/emv/tlv.c (100%) rename client/{ => src}/emv/tlv.h (100%) rename client/{ => src}/fido/additional_ca.c (100%) rename client/{ => src}/fido/additional_ca.h (100%) rename client/{ => src}/fido/cbortools.c (100%) rename client/{ => src}/fido/cbortools.h (100%) rename client/{ => src}/fido/cose.c (100%) rename client/{ => src}/fido/cose.h (100%) rename client/{ => src}/fido/fido2.json (100%) rename client/{ => src}/fido/fidocore.c (100%) rename client/{ => src}/fido/fidocore.h (100%) rename client/{ => src}/fileutils.c (100%) rename client/{ => src}/fileutils.h (100%) rename client/{ => src}/flash.c (100%) rename client/{ => src}/flash.h (100%) rename client/{ => src}/graph.c (100%) rename client/{ => src}/graph.h (100%) rename client/{ => src}/guidummy.cpp (100%) rename client/{ => src}/loclass/cipher.c (100%) rename client/{ => src}/loclass/cipher.h (100%) rename client/{ => src}/loclass/cipherutils.c (100%) rename client/{ => src}/loclass/cipherutils.h (100%) rename client/{ => src}/loclass/elite_crack.c (100%) rename client/{ => src}/loclass/elite_crack.h (100%) rename client/{ => src}/loclass/hash1_brute.c (100%) rename client/{ => src}/loclass/hash1_brute.h (100%) rename client/{ => src}/loclass/ikeys.c (100%) rename client/{ => src}/loclass/ikeys.h (100%) rename client/{ => src}/mifare/desfire_crypto.c (97%) rename client/{ => src}/mifare/desfire_crypto.h (97%) rename client/{ => src}/mifare/mad.c (100%) rename client/{ => src}/mifare/mad.h (100%) rename client/{ => src}/mifare/mfkey.c (100%) rename client/{ => src}/mifare/mfkey.h (100%) rename client/{ => src}/mifare/mifare4.c (100%) rename client/{ => src}/mifare/mifare4.h (100%) rename client/{ => src}/mifare/mifaredefault.c (100%) rename client/{ => src}/mifare/mifaredefault.h (100%) rename client/{ => src}/mifare/mifarehost.c (100%) rename client/{ => src}/mifare/mifarehost.h (100%) rename client/{ => src}/mifare/ndef.c (100%) rename client/{ => src}/mifare/ndef.h (100%) rename client/{ => src}/pm3_binlib.c (100%) rename client/{ => src}/pm3_binlib.h (100%) rename client/{ => src}/pm3_bit_limits.h (100%) rename client/{ => src}/pm3_bitlib.c (100%) rename client/{ => src}/pm3_bitlib.h (100%) rename client/{ => src}/polarssl_config.h (100%) rename client/{ => src}/preferences.c (100%) rename client/{ => src}/preferences.h (100%) rename client/{ => src}/prng.c (100%) rename client/{ => src}/prng.h (100%) rename client/{ => src}/proxendian.h (100%) rename client/{ => src}/proxgui.cpp (100%) rename client/{ => src}/proxgui.h (100%) rename client/{ => src}/proxguiqt.cpp (100%) rename client/{ => src}/proxguiqt.h (100%) rename client/{ => src}/proxmark3.c (100%) rename client/{ => src}/proxmark3.h (100%) rename client/{ => src}/scandir.c (100%) rename client/{ => src}/scandir.h (100%) rename client/{ => src}/scripting.c (100%) rename client/{ => src}/scripting.h (100%) rename client/{ => src}/tea.c (100%) rename client/{ => src}/tea.h (100%) rename client/{ => src}/uart/README.md (100%) rename client/{ => src}/uart/uart.h (100%) rename client/{ => src}/uart/uart_posix.c (100%) rename client/{ => src}/uart/uart_win32.c (100%) rename client/{ => src}/ui.c (100%) rename client/{ => src}/ui.h (100%) rename client/{ => src}/ui/overlays.ui (100%) rename client/{ => src}/util.c (100%) rename client/{ => src}/util.h (100%) rename client/{ => src}/util_darwin.h (100%) rename client/{ => src}/util_darwin.m (100%) rename client/{ => src}/whereami.c (99%) rename client/{ => src}/whereami.h (100%) rename client/{ => src}/wiegand_formats.c (100%) rename client/{ => src}/wiegand_formats.h (100%) rename client/{ => src}/wiegand_formatutils.c (100%) rename client/{ => src}/wiegand_formatutils.h (100%) diff --git a/client/Makefile b/client/Makefile index 79c0a101b..0be82d040 100644 --- a/client/Makefile +++ b/client/Makefile @@ -17,7 +17,7 @@ include ../Makefile.defs INSTALLBIN = proxmark3 INSTALLSHARE = cmdscripts lualibs luascripts resources dictionaries -VPATH = ../common uart +VPATH = ../common src/uart src deps vpath %.dic dictionaries OBJDIR = obj @@ -32,15 +32,15 @@ ifneq ($(platform),Darwin) endif # local libraries -LUALIBPATH = ./liblua +LUALIBPATH = ./deps/liblua LUALIB = $(LUALIBPATH)/liblua.a -JANSSONLIBPATH = ./jansson +JANSSONLIBPATH = ./deps/jansson JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a -CBORLIBPATH = ./tinycbor +CBORLIBPATH = ./deps/tinycbor CBORLIB = $(CBORLIBPATH)/tinycbor.a -REVENGPATH = ./reveng +REVENGPATH = ./deps/reveng REVENGLIB = $(REVENGPATH)/libreveng.a -AMIIBOLIBPATH = ./amiitool +AMIIBOLIBPATH = ./deps/amiitool AMIIBOLIB = $(AMIIBOLIBPATH)/libamiibo.a # common libraries @@ -50,7 +50,7 @@ ZLIBPATH = ../common/zlib ZLIB = $(OBJDIR)/libz.a LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -INCLUDES_CLIENT = -I. -I../include -I../common -Iuart $(LIBS) +INCLUDES_CLIENT = -I./src -I./deps -I../include -I../common -I./deps/cliparser -I./src/uart $(LIBS) CFLAGS ?= -Wall -Werror -g -O3 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) @@ -59,7 +59,7 @@ ifneq (,$(findstring MINGW,$(platform))) PM3CFLAGS += -mno-ms-bitfields -fexec-charset=cp850 endif CXXFLAGS ?= -Wall -Werror -O3 -PM3CXXFLAGS = $(CXXFLAGS) -I../include +PM3CXXFLAGS = $(CXXFLAGS) -I../include -I/.deps/cliparser LUAPLATFORM = generic ifneq (,$(findstring MINGW,$(platform))) @@ -130,6 +130,7 @@ CORESRCS = uart_posix.c \ util_posix.c \ scandir.c \ crc16.c \ + crc32.c \ comms.c CMDSRCS = crapto1/crapto1.c \ @@ -200,7 +201,7 @@ CMDSRCS = crapto1/crapto1.c \ cmdhfmfu.c \ cmdhfmfp.c \ cmdhfmfhard.c \ - hardnested/hardnested_bruteforce.c \ + deps/hardnested/hardnested_bruteforce.c \ cmdhfmfdes.c \ cmdhftopaz.c \ cmdhffido.c \ @@ -258,13 +259,13 @@ CMDSRCS = crapto1/crapto1.c \ cpu_arch = $(shell uname -m) ifneq ($(findstring 86, $(cpu_arch)), ) - MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c + MULTIARCHSRCS = deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c endif ifneq ($(findstring amd64, $(cpu_arch)), ) - MULTIARCHSRCS = hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c + MULTIARCHSRCS = deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c endif ifeq ($(MULTIARCHSRCS), ) - CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c + CMDSRCS += deps/hardnested/hardnested_bf_core.c deps/hardnested/hardnested_bitarray_core.c endif @@ -310,13 +311,13 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(info [=] LD $@) $(Q)$(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(LDLIBS) -o $@ -proxgui.cpp: ui/ui_overlays.h +src/proxgui.cpp: src/ui/ui_overlays.h -proxguiqt.moc.cpp: proxguiqt.h +src/proxguiqt.moc.cpp: src/proxguiqt.h $(info [-] MOC $@) $(Q)$(MOC) -o$@ $^ -ui/ui_overlays.h: ui/overlays.ui +src/ui/ui_overlays.h: src/ui/overlays.ui $(info [-] UIC $@) $(Q)$(UIC) $^ > $@ diff --git a/client/amiitool/LICENSE b/client/deps/amiitool/LICENSE similarity index 100% rename from client/amiitool/LICENSE rename to client/deps/amiitool/LICENSE diff --git a/client/amiitool/Makefile b/client/deps/amiitool/Makefile similarity index 51% rename from client/amiitool/Makefile rename to client/deps/amiitool/Makefile index c473f58ee..6926c12c6 100644 --- a/client/amiitool/Makefile +++ b/client/deps/amiitool/Makefile @@ -1,5 +1,5 @@ MYSRCPATHS = -MYINCLUDES = -I. -I.. -I../jansson -I../../common/ -I../../include/ +MYINCLUDES = -I. -I.. -I../jansson -I../../../common -I../../../include MYCFLAGS = -std=c99 -D_ISOC99_SOURCE MYDEFS = MYSRCS = \ @@ -9,11 +9,11 @@ MYSRCS = \ LIB_A = libamiibo.a -include ../../Makefile.host +include ../../../Makefile.host # just for testing amiitool before complete migration into a lib: amiitool: gcc $(CFLAGS) \ - amiitool.c $(MYSRCS) ../../common/commonutil.c ../ui.c -lreadline -lm ../../common/mbedtls/libmbedtls.a \ + amiitool.c $(MYSRCS) ../../../common/commonutil.c ../ui.c -lreadline -lm ../../../common/mbedtls/libmbedtls.a \ -o amiitool diff --git a/client/amiitool/amiibo.c b/client/deps/amiitool/amiibo.c similarity index 100% rename from client/amiitool/amiibo.c rename to client/deps/amiitool/amiibo.c diff --git a/client/amiitool/amiibo.h b/client/deps/amiitool/amiibo.h similarity index 100% rename from client/amiitool/amiibo.h rename to client/deps/amiitool/amiibo.h diff --git a/client/amiitool/amiitool.c b/client/deps/amiitool/amiitool.c similarity index 99% rename from client/amiitool/amiitool.c rename to client/deps/amiitool/amiitool.c index ca34a5c6a..2c5c4ddc2 100644 --- a/client/amiitool/amiitool.c +++ b/client/deps/amiitool/amiitool.c @@ -7,7 +7,7 @@ #include #include -#include "fileutils.h" +#include "src/fileutils.h" #include "amiibo.h" #include "getopt.h" diff --git a/client/amiitool/drbg.c b/client/deps/amiitool/drbg.c similarity index 100% rename from client/amiitool/drbg.c rename to client/deps/amiitool/drbg.c diff --git a/client/amiitool/drbg.h b/client/deps/amiitool/drbg.h similarity index 100% rename from client/amiitool/drbg.h rename to client/deps/amiitool/drbg.h diff --git a/client/amiitool/key_retail.bin b/client/deps/amiitool/key_retail.bin similarity index 100% rename from client/amiitool/key_retail.bin rename to client/deps/amiitool/key_retail.bin diff --git a/client/amiitool/keygen.c b/client/deps/amiitool/keygen.c similarity index 100% rename from client/amiitool/keygen.c rename to client/deps/amiitool/keygen.c diff --git a/client/amiitool/keygen.h b/client/deps/amiitool/keygen.h similarity index 100% rename from client/amiitool/keygen.h rename to client/deps/amiitool/keygen.h diff --git a/client/cliparser/README.md b/client/deps/cliparser/README.md similarity index 100% rename from client/cliparser/README.md rename to client/deps/cliparser/README.md diff --git a/client/cliparser/argtable3.c b/client/deps/cliparser/argtable3.c similarity index 100% rename from client/cliparser/argtable3.c rename to client/deps/cliparser/argtable3.c diff --git a/client/cliparser/argtable3.h b/client/deps/cliparser/argtable3.h similarity index 100% rename from client/cliparser/argtable3.h rename to client/deps/cliparser/argtable3.h diff --git a/client/cliparser/cliparser.c b/client/deps/cliparser/cliparser.c similarity index 100% rename from client/cliparser/cliparser.c rename to client/deps/cliparser/cliparser.c diff --git a/client/cliparser/cliparser.h b/client/deps/cliparser/cliparser.h similarity index 100% rename from client/cliparser/cliparser.h rename to client/deps/cliparser/cliparser.h diff --git a/client/cliparser/getopt.h b/client/deps/cliparser/getopt.h similarity index 100% rename from client/cliparser/getopt.h rename to client/deps/cliparser/getopt.h diff --git a/client/hardnested/hardnested_bf_core.c b/client/deps/hardnested/hardnested_bf_core.c similarity index 99% rename from client/hardnested/hardnested_bf_core.c rename to client/deps/hardnested/hardnested_bf_core.c index adc203f61..4e30dd894 100644 --- a/client/hardnested/hardnested_bf_core.c +++ b/client/deps/hardnested/hardnested_bf_core.c @@ -59,8 +59,8 @@ THE SOFTWARE. #include #include "crapto1/crapto1.h" #include "parity.h" -#include "util.h" -#include "common.h" +//#include "util.h" +//#include "common.h" // bitslice type // while AVX supports 256 bit vector floating point operations, we need integer operations for boolean logic diff --git a/client/hardnested/hardnested_bf_core.h b/client/deps/hardnested/hardnested_bf_core.h similarity index 100% rename from client/hardnested/hardnested_bf_core.h rename to client/deps/hardnested/hardnested_bf_core.h diff --git a/client/hardnested/hardnested_bitarray_core.c b/client/deps/hardnested/hardnested_bitarray_core.c similarity index 100% rename from client/hardnested/hardnested_bitarray_core.c rename to client/deps/hardnested/hardnested_bitarray_core.c diff --git a/client/hardnested/hardnested_bitarray_core.h b/client/deps/hardnested/hardnested_bitarray_core.h similarity index 100% rename from client/hardnested/hardnested_bitarray_core.h rename to client/deps/hardnested/hardnested_bitarray_core.h diff --git a/client/hardnested/hardnested_bruteforce.c b/client/deps/hardnested/hardnested_bruteforce.c similarity index 100% rename from client/hardnested/hardnested_bruteforce.c rename to client/deps/hardnested/hardnested_bruteforce.c diff --git a/client/hardnested/hardnested_bruteforce.h b/client/deps/hardnested/hardnested_bruteforce.h similarity index 71% rename from client/hardnested/hardnested_bruteforce.h rename to client/deps/hardnested/hardnested_bruteforce.h index 708d48b84..8766362d7 100644 --- a/client/hardnested/hardnested_bruteforce.h +++ b/client/deps/hardnested/hardnested_bruteforce.h @@ -19,7 +19,33 @@ #include #include -#include "cmdhfmfhard.h" + +#define NUM_SUMS 19 // number of possible sum property values + +typedef struct guess_sum_a8 { + float prob; + uint64_t num_states; + uint8_t sum_a8_idx; +} guess_sum_a8_t; + +typedef struct noncelistentry { + uint32_t nonce_enc; + uint8_t par_enc; + void *next; +} noncelistentry_t; + +typedef struct noncelist { + uint16_t num; + uint16_t Sum; + guess_sum_a8_t sum_a8_guess[NUM_SUMS]; + bool sum_a8_guess_dirty; + float expected_num_brute_force; + uint8_t BitFlips[0x400]; + uint32_t *states_bitarray[2]; + uint32_t num_states_bitarray[2]; + bool all_bitflips_dirty[2]; + noncelistentry_t *first; +} noncelist_t; typedef struct { uint32_t *states[2]; diff --git a/client/hardnested/hardnested_tables.c b/client/deps/hardnested/hardnested_tables.c similarity index 100% rename from client/hardnested/hardnested_tables.c rename to client/deps/hardnested/hardnested_tables.c diff --git a/client/jansson/Makefile b/client/deps/jansson/Makefile similarity index 90% rename from client/jansson/Makefile rename to client/deps/jansson/Makefile index dc4ae230b..1ef283bab 100644 --- a/client/jansson/Makefile +++ b/client/deps/jansson/Makefile @@ -18,4 +18,4 @@ MYSRCS = \ LIB_A = libjansson.a -include ../../Makefile.host +include ../../../Makefile.host diff --git a/client/jansson/dump.c b/client/deps/jansson/dump.c similarity index 100% rename from client/jansson/dump.c rename to client/deps/jansson/dump.c diff --git a/client/jansson/error.c b/client/deps/jansson/error.c similarity index 100% rename from client/jansson/error.c rename to client/deps/jansson/error.c diff --git a/client/jansson/hashtable.c b/client/deps/jansson/hashtable.c similarity index 99% rename from client/jansson/hashtable.c rename to client/deps/jansson/hashtable.c index 071ba585f..38c10a0c7 100644 --- a/client/jansson/hashtable.c +++ b/client/deps/jansson/hashtable.c @@ -16,7 +16,7 @@ #include #endif -#include /* for JSON_INLINE */ +#include "jansson_config.h" /* for JSON_INLINE */ #include "jansson_private.h" /* for container_of() */ #include "hashtable.h" diff --git a/client/jansson/hashtable.h b/client/deps/jansson/hashtable.h similarity index 100% rename from client/jansson/hashtable.h rename to client/deps/jansson/hashtable.h diff --git a/client/jansson/hashtable_seed.c b/client/deps/jansson/hashtable_seed.c similarity index 100% rename from client/jansson/hashtable_seed.c rename to client/deps/jansson/hashtable_seed.c diff --git a/client/jansson/jansson.def b/client/deps/jansson/jansson.def similarity index 100% rename from client/jansson/jansson.def rename to client/deps/jansson/jansson.def diff --git a/client/jansson/jansson.h b/client/deps/jansson/jansson.h similarity index 100% rename from client/jansson/jansson.h rename to client/deps/jansson/jansson.h diff --git a/client/jansson/jansson_config.h b/client/deps/jansson/jansson_config.h similarity index 100% rename from client/jansson/jansson_config.h rename to client/deps/jansson/jansson_config.h diff --git a/client/jansson/jansson_config.h.in b/client/deps/jansson/jansson_config.h.in similarity index 100% rename from client/jansson/jansson_config.h.in rename to client/deps/jansson/jansson_config.h.in diff --git a/client/jansson/jansson_private.h b/client/deps/jansson/jansson_private.h similarity index 100% rename from client/jansson/jansson_private.h rename to client/deps/jansson/jansson_private.h diff --git a/client/jansson/load.c b/client/deps/jansson/load.c similarity index 100% rename from client/jansson/load.c rename to client/deps/jansson/load.c diff --git a/client/jansson/lookup3.h b/client/deps/jansson/lookup3.h similarity index 100% rename from client/jansson/lookup3.h rename to client/deps/jansson/lookup3.h diff --git a/client/jansson/memory.c b/client/deps/jansson/memory.c similarity index 100% rename from client/jansson/memory.c rename to client/deps/jansson/memory.c diff --git a/client/jansson/pack_unpack.c b/client/deps/jansson/pack_unpack.c similarity index 100% rename from client/jansson/pack_unpack.c rename to client/deps/jansson/pack_unpack.c diff --git a/client/jansson/path.c b/client/deps/jansson/path.c similarity index 99% rename from client/jansson/path.c rename to client/deps/jansson/path.c index f9c3a9117..11964ec6e 100644 --- a/client/jansson/path.c +++ b/client/deps/jansson/path.c @@ -10,7 +10,7 @@ #include #include -#include +#include "jansson.h" #include "jansson_private.h" json_t *json_path_get(const json_t *json, const char *path) { diff --git a/client/jansson/strbuffer.c b/client/deps/jansson/strbuffer.c similarity index 100% rename from client/jansson/strbuffer.c rename to client/deps/jansson/strbuffer.c diff --git a/client/jansson/strbuffer.h b/client/deps/jansson/strbuffer.h similarity index 100% rename from client/jansson/strbuffer.h rename to client/deps/jansson/strbuffer.h diff --git a/client/jansson/strconv.c b/client/deps/jansson/strconv.c similarity index 100% rename from client/jansson/strconv.c rename to client/deps/jansson/strconv.c diff --git a/client/jansson/utf.c b/client/deps/jansson/utf.c similarity index 100% rename from client/jansson/utf.c rename to client/deps/jansson/utf.c diff --git a/client/jansson/utf.h b/client/deps/jansson/utf.h similarity index 100% rename from client/jansson/utf.h rename to client/deps/jansson/utf.h diff --git a/client/jansson/value.c b/client/deps/jansson/value.c similarity index 100% rename from client/jansson/value.c rename to client/deps/jansson/value.c diff --git a/client/liblua/Makefile b/client/deps/liblua/Makefile similarity index 97% rename from client/liblua/Makefile rename to client/deps/liblua/Makefile index 250f4b7ee..d4b31be0a 100644 --- a/client/liblua/Makefile +++ b/client/deps/liblua/Makefile @@ -21,7 +21,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris default: $(PLAT) -include ../../Makefile.host +include ../../../Makefile.host # Convenience targets for popular platforms ALL= all diff --git a/client/liblua/lapi.c b/client/deps/liblua/lapi.c similarity index 100% rename from client/liblua/lapi.c rename to client/deps/liblua/lapi.c diff --git a/client/liblua/lapi.h b/client/deps/liblua/lapi.h similarity index 100% rename from client/liblua/lapi.h rename to client/deps/liblua/lapi.h diff --git a/client/liblua/lauxlib.c b/client/deps/liblua/lauxlib.c similarity index 100% rename from client/liblua/lauxlib.c rename to client/deps/liblua/lauxlib.c diff --git a/client/liblua/lauxlib.h b/client/deps/liblua/lauxlib.h similarity index 100% rename from client/liblua/lauxlib.h rename to client/deps/liblua/lauxlib.h diff --git a/client/liblua/lbaselib.c b/client/deps/liblua/lbaselib.c similarity index 100% rename from client/liblua/lbaselib.c rename to client/deps/liblua/lbaselib.c diff --git a/client/liblua/lbitlib.c b/client/deps/liblua/lbitlib.c similarity index 100% rename from client/liblua/lbitlib.c rename to client/deps/liblua/lbitlib.c diff --git a/client/liblua/lcode.c b/client/deps/liblua/lcode.c similarity index 100% rename from client/liblua/lcode.c rename to client/deps/liblua/lcode.c diff --git a/client/liblua/lcode.h b/client/deps/liblua/lcode.h similarity index 100% rename from client/liblua/lcode.h rename to client/deps/liblua/lcode.h diff --git a/client/liblua/lcorolib.c b/client/deps/liblua/lcorolib.c similarity index 100% rename from client/liblua/lcorolib.c rename to client/deps/liblua/lcorolib.c diff --git a/client/liblua/lctype.c b/client/deps/liblua/lctype.c similarity index 100% rename from client/liblua/lctype.c rename to client/deps/liblua/lctype.c diff --git a/client/liblua/lctype.h b/client/deps/liblua/lctype.h similarity index 100% rename from client/liblua/lctype.h rename to client/deps/liblua/lctype.h diff --git a/client/liblua/ldblib.c b/client/deps/liblua/ldblib.c similarity index 100% rename from client/liblua/ldblib.c rename to client/deps/liblua/ldblib.c diff --git a/client/liblua/ldebug.c b/client/deps/liblua/ldebug.c similarity index 100% rename from client/liblua/ldebug.c rename to client/deps/liblua/ldebug.c diff --git a/client/liblua/ldebug.h b/client/deps/liblua/ldebug.h similarity index 100% rename from client/liblua/ldebug.h rename to client/deps/liblua/ldebug.h diff --git a/client/liblua/ldo.c b/client/deps/liblua/ldo.c similarity index 100% rename from client/liblua/ldo.c rename to client/deps/liblua/ldo.c diff --git a/client/liblua/ldo.h b/client/deps/liblua/ldo.h similarity index 100% rename from client/liblua/ldo.h rename to client/deps/liblua/ldo.h diff --git a/client/liblua/ldump.c b/client/deps/liblua/ldump.c similarity index 100% rename from client/liblua/ldump.c rename to client/deps/liblua/ldump.c diff --git a/client/liblua/lfunc.c b/client/deps/liblua/lfunc.c similarity index 100% rename from client/liblua/lfunc.c rename to client/deps/liblua/lfunc.c diff --git a/client/liblua/lfunc.h b/client/deps/liblua/lfunc.h similarity index 100% rename from client/liblua/lfunc.h rename to client/deps/liblua/lfunc.h diff --git a/client/liblua/lgc.c b/client/deps/liblua/lgc.c similarity index 100% rename from client/liblua/lgc.c rename to client/deps/liblua/lgc.c diff --git a/client/liblua/lgc.h b/client/deps/liblua/lgc.h similarity index 100% rename from client/liblua/lgc.h rename to client/deps/liblua/lgc.h diff --git a/client/liblua/linit.c b/client/deps/liblua/linit.c similarity index 100% rename from client/liblua/linit.c rename to client/deps/liblua/linit.c diff --git a/client/liblua/liolib.c b/client/deps/liblua/liolib.c similarity index 100% rename from client/liblua/liolib.c rename to client/deps/liblua/liolib.c diff --git a/client/liblua/llex.c b/client/deps/liblua/llex.c similarity index 100% rename from client/liblua/llex.c rename to client/deps/liblua/llex.c diff --git a/client/liblua/llex.h b/client/deps/liblua/llex.h similarity index 100% rename from client/liblua/llex.h rename to client/deps/liblua/llex.h diff --git a/client/liblua/llimits.h b/client/deps/liblua/llimits.h similarity index 100% rename from client/liblua/llimits.h rename to client/deps/liblua/llimits.h diff --git a/client/liblua/lmathlib.c b/client/deps/liblua/lmathlib.c similarity index 100% rename from client/liblua/lmathlib.c rename to client/deps/liblua/lmathlib.c diff --git a/client/liblua/lmem.c b/client/deps/liblua/lmem.c similarity index 100% rename from client/liblua/lmem.c rename to client/deps/liblua/lmem.c diff --git a/client/liblua/lmem.h b/client/deps/liblua/lmem.h similarity index 100% rename from client/liblua/lmem.h rename to client/deps/liblua/lmem.h diff --git a/client/liblua/loadlib.c b/client/deps/liblua/loadlib.c similarity index 100% rename from client/liblua/loadlib.c rename to client/deps/liblua/loadlib.c diff --git a/client/liblua/lobject.c b/client/deps/liblua/lobject.c similarity index 100% rename from client/liblua/lobject.c rename to client/deps/liblua/lobject.c diff --git a/client/liblua/lobject.h b/client/deps/liblua/lobject.h similarity index 100% rename from client/liblua/lobject.h rename to client/deps/liblua/lobject.h diff --git a/client/liblua/lopcodes.c b/client/deps/liblua/lopcodes.c similarity index 100% rename from client/liblua/lopcodes.c rename to client/deps/liblua/lopcodes.c diff --git a/client/liblua/lopcodes.h b/client/deps/liblua/lopcodes.h similarity index 100% rename from client/liblua/lopcodes.h rename to client/deps/liblua/lopcodes.h diff --git a/client/liblua/loslib.c b/client/deps/liblua/loslib.c similarity index 100% rename from client/liblua/loslib.c rename to client/deps/liblua/loslib.c diff --git a/client/liblua/lparser.c b/client/deps/liblua/lparser.c similarity index 100% rename from client/liblua/lparser.c rename to client/deps/liblua/lparser.c diff --git a/client/liblua/lparser.h b/client/deps/liblua/lparser.h similarity index 100% rename from client/liblua/lparser.h rename to client/deps/liblua/lparser.h diff --git a/client/liblua/lstate.c b/client/deps/liblua/lstate.c similarity index 100% rename from client/liblua/lstate.c rename to client/deps/liblua/lstate.c diff --git a/client/liblua/lstate.h b/client/deps/liblua/lstate.h similarity index 100% rename from client/liblua/lstate.h rename to client/deps/liblua/lstate.h diff --git a/client/liblua/lstring.c b/client/deps/liblua/lstring.c similarity index 100% rename from client/liblua/lstring.c rename to client/deps/liblua/lstring.c diff --git a/client/liblua/lstring.h b/client/deps/liblua/lstring.h similarity index 100% rename from client/liblua/lstring.h rename to client/deps/liblua/lstring.h diff --git a/client/liblua/lstrlib.c b/client/deps/liblua/lstrlib.c similarity index 100% rename from client/liblua/lstrlib.c rename to client/deps/liblua/lstrlib.c diff --git a/client/liblua/ltable.c b/client/deps/liblua/ltable.c similarity index 100% rename from client/liblua/ltable.c rename to client/deps/liblua/ltable.c diff --git a/client/liblua/ltable.h b/client/deps/liblua/ltable.h similarity index 100% rename from client/liblua/ltable.h rename to client/deps/liblua/ltable.h diff --git a/client/liblua/ltablib.c b/client/deps/liblua/ltablib.c similarity index 100% rename from client/liblua/ltablib.c rename to client/deps/liblua/ltablib.c diff --git a/client/liblua/ltm.c b/client/deps/liblua/ltm.c similarity index 100% rename from client/liblua/ltm.c rename to client/deps/liblua/ltm.c diff --git a/client/liblua/ltm.h b/client/deps/liblua/ltm.h similarity index 100% rename from client/liblua/ltm.h rename to client/deps/liblua/ltm.h diff --git a/client/liblua/lua.c b/client/deps/liblua/lua.c similarity index 100% rename from client/liblua/lua.c rename to client/deps/liblua/lua.c diff --git a/client/liblua/lua.h b/client/deps/liblua/lua.h similarity index 100% rename from client/liblua/lua.h rename to client/deps/liblua/lua.h diff --git a/client/liblua/lua.hpp b/client/deps/liblua/lua.hpp similarity index 100% rename from client/liblua/lua.hpp rename to client/deps/liblua/lua.hpp diff --git a/client/liblua/luac.c b/client/deps/liblua/luac.c similarity index 100% rename from client/liblua/luac.c rename to client/deps/liblua/luac.c diff --git a/client/liblua/luaconf.h b/client/deps/liblua/luaconf.h similarity index 100% rename from client/liblua/luaconf.h rename to client/deps/liblua/luaconf.h diff --git a/client/liblua/lualib.h b/client/deps/liblua/lualib.h similarity index 100% rename from client/liblua/lualib.h rename to client/deps/liblua/lualib.h diff --git a/client/liblua/lundump.c b/client/deps/liblua/lundump.c similarity index 100% rename from client/liblua/lundump.c rename to client/deps/liblua/lundump.c diff --git a/client/liblua/lundump.h b/client/deps/liblua/lundump.h similarity index 100% rename from client/liblua/lundump.h rename to client/deps/liblua/lundump.h diff --git a/client/liblua/lvm.c b/client/deps/liblua/lvm.c similarity index 100% rename from client/liblua/lvm.c rename to client/deps/liblua/lvm.c diff --git a/client/liblua/lvm.h b/client/deps/liblua/lvm.h similarity index 100% rename from client/liblua/lvm.h rename to client/deps/liblua/lvm.h diff --git a/client/liblua/lzio.c b/client/deps/liblua/lzio.c similarity index 100% rename from client/liblua/lzio.c rename to client/deps/liblua/lzio.c diff --git a/client/liblua/lzio.h b/client/deps/liblua/lzio.h similarity index 100% rename from client/liblua/lzio.h rename to client/deps/liblua/lzio.h diff --git a/client/reveng/Makefile b/client/deps/reveng/Makefile similarity index 95% rename from client/reveng/Makefile rename to client/deps/reveng/Makefile index c29538fa5..17d63a4f9 100644 --- a/client/reveng/Makefile +++ b/client/deps/reveng/Makefile @@ -18,7 +18,7 @@ MYSRCS = \ LIB_A = libreveng.a -include ../../Makefile.host +include ../../../Makefile.host CLEAN += bmptst diff --git a/client/reveng/bmpbit.c b/client/deps/reveng/bmpbit.c similarity index 100% rename from client/reveng/bmpbit.c rename to client/deps/reveng/bmpbit.c diff --git a/client/reveng/cli.c b/client/deps/reveng/cli.c similarity index 100% rename from client/reveng/cli.c rename to client/deps/reveng/cli.c diff --git a/client/reveng/config.h b/client/deps/reveng/config.h similarity index 100% rename from client/reveng/config.h rename to client/deps/reveng/config.h diff --git a/client/reveng/getopt.c b/client/deps/reveng/getopt.c similarity index 100% rename from client/reveng/getopt.c rename to client/deps/reveng/getopt.c diff --git a/client/reveng/getopt.h b/client/deps/reveng/getopt.h similarity index 100% rename from client/reveng/getopt.h rename to client/deps/reveng/getopt.h diff --git a/client/reveng/model.c b/client/deps/reveng/model.c similarity index 100% rename from client/reveng/model.c rename to client/deps/reveng/model.c diff --git a/client/reveng/poly.c b/client/deps/reveng/poly.c similarity index 100% rename from client/reveng/poly.c rename to client/deps/reveng/poly.c diff --git a/client/reveng/preset.c b/client/deps/reveng/preset.c similarity index 100% rename from client/reveng/preset.c rename to client/deps/reveng/preset.c diff --git a/client/reveng/reveng.c b/client/deps/reveng/reveng.c similarity index 100% rename from client/reveng/reveng.c rename to client/deps/reveng/reveng.c diff --git a/client/reveng/reveng.h b/client/deps/reveng/reveng.h similarity index 100% rename from client/reveng/reveng.h rename to client/deps/reveng/reveng.h diff --git a/client/tinycbor/Makefile b/client/deps/tinycbor/Makefile similarity index 93% rename from client/tinycbor/Makefile rename to client/deps/tinycbor/Makefile index 6470246d4..376e2b641 100644 --- a/client/tinycbor/Makefile +++ b/client/deps/tinycbor/Makefile @@ -19,4 +19,4 @@ LIB_A = tinycbor.a # Strange errors on Mingw when compiling with -O3 CFLAGS ?= -Wall -Werror -O2 -include ../../Makefile.host +include ../../../Makefile.host diff --git a/client/tinycbor/cbor.h b/client/deps/tinycbor/cbor.h similarity index 100% rename from client/tinycbor/cbor.h rename to client/deps/tinycbor/cbor.h diff --git a/client/tinycbor/cborencoder.c b/client/deps/tinycbor/cborencoder.c similarity index 100% rename from client/tinycbor/cborencoder.c rename to client/deps/tinycbor/cborencoder.c diff --git a/client/tinycbor/cborencoder_close_container_checked.c b/client/deps/tinycbor/cborencoder_close_container_checked.c similarity index 100% rename from client/tinycbor/cborencoder_close_container_checked.c rename to client/deps/tinycbor/cborencoder_close_container_checked.c diff --git a/client/tinycbor/cborerrorstrings.c b/client/deps/tinycbor/cborerrorstrings.c similarity index 100% rename from client/tinycbor/cborerrorstrings.c rename to client/deps/tinycbor/cborerrorstrings.c diff --git a/client/tinycbor/cborinternal_p.h b/client/deps/tinycbor/cborinternal_p.h similarity index 100% rename from client/tinycbor/cborinternal_p.h rename to client/deps/tinycbor/cborinternal_p.h diff --git a/client/tinycbor/cborjson.h b/client/deps/tinycbor/cborjson.h similarity index 100% rename from client/tinycbor/cborjson.h rename to client/deps/tinycbor/cborjson.h diff --git a/client/tinycbor/cborparser.c b/client/deps/tinycbor/cborparser.c similarity index 100% rename from client/tinycbor/cborparser.c rename to client/deps/tinycbor/cborparser.c diff --git a/client/tinycbor/cborparser_dup_string.c b/client/deps/tinycbor/cborparser_dup_string.c similarity index 100% rename from client/tinycbor/cborparser_dup_string.c rename to client/deps/tinycbor/cborparser_dup_string.c diff --git a/client/tinycbor/cborpretty.c b/client/deps/tinycbor/cborpretty.c similarity index 100% rename from client/tinycbor/cborpretty.c rename to client/deps/tinycbor/cborpretty.c diff --git a/client/tinycbor/cborpretty_stdio.c b/client/deps/tinycbor/cborpretty_stdio.c similarity index 100% rename from client/tinycbor/cborpretty_stdio.c rename to client/deps/tinycbor/cborpretty_stdio.c diff --git a/client/tinycbor/cbortojson.c b/client/deps/tinycbor/cbortojson.c similarity index 100% rename from client/tinycbor/cbortojson.c rename to client/deps/tinycbor/cbortojson.c diff --git a/client/tinycbor/cborvalidation.c b/client/deps/tinycbor/cborvalidation.c similarity index 100% rename from client/tinycbor/cborvalidation.c rename to client/deps/tinycbor/cborvalidation.c diff --git a/client/tinycbor/compilersupport_p.h b/client/deps/tinycbor/compilersupport_p.h similarity index 100% rename from client/tinycbor/compilersupport_p.h rename to client/deps/tinycbor/compilersupport_p.h diff --git a/client/tinycbor/open_memstream.c b/client/deps/tinycbor/open_memstream.c similarity index 100% rename from client/tinycbor/open_memstream.c rename to client/deps/tinycbor/open_memstream.c diff --git a/client/tinycbor/tinycbor-version.h b/client/deps/tinycbor/tinycbor-version.h similarity index 100% rename from client/tinycbor/tinycbor-version.h rename to client/deps/tinycbor/tinycbor-version.h diff --git a/client/tinycbor/utf8_p.h b/client/deps/tinycbor/utf8_p.h similarity index 100% rename from client/tinycbor/utf8_p.h rename to client/deps/tinycbor/utf8_p.h diff --git a/client/aidsearch.c b/client/src/aidsearch.c similarity index 100% rename from client/aidsearch.c rename to client/src/aidsearch.c diff --git a/client/aidsearch.h b/client/src/aidsearch.h similarity index 100% rename from client/aidsearch.h rename to client/src/aidsearch.h diff --git a/client/cmdanalyse.c b/client/src/cmdanalyse.c similarity index 100% rename from client/cmdanalyse.c rename to client/src/cmdanalyse.c diff --git a/client/cmdanalyse.h b/client/src/cmdanalyse.h similarity index 100% rename from client/cmdanalyse.h rename to client/src/cmdanalyse.h diff --git a/client/cmdcrc.c b/client/src/cmdcrc.c similarity index 100% rename from client/cmdcrc.c rename to client/src/cmdcrc.c diff --git a/client/cmdcrc.h b/client/src/cmdcrc.h similarity index 100% rename from client/cmdcrc.h rename to client/src/cmdcrc.h diff --git a/client/cmddata.c b/client/src/cmddata.c similarity index 99% rename from client/cmddata.c rename to client/src/cmddata.c index 74c33da55..86cc91dfd 100644 --- a/client/cmddata.c +++ b/client/src/cmddata.c @@ -21,7 +21,7 @@ #include "graph.h" // for graph data #include "comms.h" #include "lfdemod.h" // for demod code -#include "loclass/cipherutils.h" // for decimating samples in getsamples +#include "../loclass/cipherutils.h" // for decimating samples in getsamples #include "cmdlfem4x.h" // askem410xdecode #include "fileutils.h" // searchFile #include "mifare/ndef.h" diff --git a/client/cmddata.h b/client/src/cmddata.h similarity index 100% rename from client/cmddata.h rename to client/src/cmddata.h diff --git a/client/cmdflashmem.c b/client/src/cmdflashmem.c similarity index 100% rename from client/cmdflashmem.c rename to client/src/cmdflashmem.c diff --git a/client/cmdflashmem.h b/client/src/cmdflashmem.h similarity index 100% rename from client/cmdflashmem.h rename to client/src/cmdflashmem.h diff --git a/client/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c similarity index 100% rename from client/cmdflashmemspiffs.c rename to client/src/cmdflashmemspiffs.c diff --git a/client/cmdflashmemspiffs.h b/client/src/cmdflashmemspiffs.h similarity index 100% rename from client/cmdflashmemspiffs.h rename to client/src/cmdflashmemspiffs.h diff --git a/client/cmdhf.c b/client/src/cmdhf.c similarity index 99% rename from client/cmdhf.c rename to client/src/cmdhf.c index 4197b3bee..9ea34420a 100644 --- a/client/cmdhf.c +++ b/client/src/cmdhf.c @@ -39,7 +39,7 @@ #include "ui.h" #include "cmddata.h" #include "graph.h" -#include "../common_fpga/fpga.h" +#include "../../common_fpga/fpga.h" static int CmdHelp(const char *Cmd); diff --git a/client/cmdhf.h b/client/src/cmdhf.h similarity index 100% rename from client/cmdhf.h rename to client/src/cmdhf.h diff --git a/client/cmdhf14a.c b/client/src/cmdhf14a.c similarity index 100% rename from client/cmdhf14a.c rename to client/src/cmdhf14a.c diff --git a/client/cmdhf14a.h b/client/src/cmdhf14a.h similarity index 100% rename from client/cmdhf14a.h rename to client/src/cmdhf14a.h diff --git a/client/cmdhf14b.c b/client/src/cmdhf14b.c similarity index 100% rename from client/cmdhf14b.c rename to client/src/cmdhf14b.c diff --git a/client/cmdhf14b.h b/client/src/cmdhf14b.h similarity index 100% rename from client/cmdhf14b.h rename to client/src/cmdhf14b.h diff --git a/client/cmdhf15.c b/client/src/cmdhf15.c similarity index 99% rename from client/cmdhf15.c rename to client/src/cmdhf15.c index 4d2e5c544..9762ba498 100644 --- a/client/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -29,7 +29,7 @@ #include "comms.h" // clearCommandBuffer #include "cmdtrace.h" #include "iso15693tools.h" -#include "crypto/libpcrypto.h" +#include "../crypto/libpcrypto.h" #include "graph.h" #include "crc16.h" // iso15 crc #include "cmddata.h" // getsamples diff --git a/client/cmdhf15.h b/client/src/cmdhf15.h similarity index 100% rename from client/cmdhf15.h rename to client/src/cmdhf15.h diff --git a/client/cmdhfcryptorf.c b/client/src/cmdhfcryptorf.c similarity index 100% rename from client/cmdhfcryptorf.c rename to client/src/cmdhfcryptorf.c diff --git a/client/cmdhfcryptorf.h b/client/src/cmdhfcryptorf.h similarity index 100% rename from client/cmdhfcryptorf.h rename to client/src/cmdhfcryptorf.h diff --git a/client/cmdhfepa.c b/client/src/cmdhfepa.c similarity index 100% rename from client/cmdhfepa.c rename to client/src/cmdhfepa.c diff --git a/client/cmdhfepa.h b/client/src/cmdhfepa.h similarity index 100% rename from client/cmdhfepa.h rename to client/src/cmdhfepa.h diff --git a/client/cmdhffelica.c b/client/src/cmdhffelica.c similarity index 100% rename from client/cmdhffelica.c rename to client/src/cmdhffelica.c diff --git a/client/cmdhffelica.h b/client/src/cmdhffelica.h similarity index 100% rename from client/cmdhffelica.h rename to client/src/cmdhffelica.h diff --git a/client/cmdhffido.c b/client/src/cmdhffido.c similarity index 99% rename from client/cmdhffido.c rename to client/src/cmdhffido.c index a0a8793c0..e6f89790a 100644 --- a/client/cmdhffido.c +++ b/client/src/cmdhffido.c @@ -31,8 +31,8 @@ #include "emv/emvcore.h" #include "emv/emvjson.h" #include "cliparser/cliparser.h" -#include "crypto/asn1utils.h" -#include "crypto/libpcrypto.h" +#include "../crypto/asn1utils.h" +#include "../crypto/libpcrypto.h" #include "fido/cbortools.h" #include "fido/fidocore.h" #include "emv/dump.h" diff --git a/client/cmdhffido.h b/client/src/cmdhffido.h similarity index 100% rename from client/cmdhffido.h rename to client/src/cmdhffido.h diff --git a/client/cmdhficlass.c b/client/src/cmdhficlass.c similarity index 99% rename from client/cmdhficlass.c rename to client/src/cmdhficlass.c index a9d8c1f9c..73163e1ea 100644 --- a/client/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -19,10 +19,10 @@ #include "util_posix.h" #include "comms.h" #include "mbedtls/des.h" -#include "loclass/cipherutils.h" -#include "loclass/cipher.h" -#include "loclass/ikeys.h" -#include "loclass/elite_crack.h" +#include "../loclass/cipherutils.h" +#include "../loclass/cipher.h" +#include "../loclass/ikeys.h" +#include "../loclass/elite_crack.h" #include "fileutils.h" #include "protocols.h" #include "cardhelper.h" diff --git a/client/cmdhficlass.h b/client/src/cmdhficlass.h similarity index 100% rename from client/cmdhficlass.h rename to client/src/cmdhficlass.h diff --git a/client/cmdhflegic.c b/client/src/cmdhflegic.c similarity index 100% rename from client/cmdhflegic.c rename to client/src/cmdhflegic.c diff --git a/client/cmdhflegic.h b/client/src/cmdhflegic.h similarity index 100% rename from client/cmdhflegic.h rename to client/src/cmdhflegic.h diff --git a/client/cmdhflist.c b/client/src/cmdhflist.c similarity index 100% rename from client/cmdhflist.c rename to client/src/cmdhflist.c diff --git a/client/cmdhflist.h b/client/src/cmdhflist.h similarity index 100% rename from client/cmdhflist.h rename to client/src/cmdhflist.h diff --git a/client/cmdhflto.c b/client/src/cmdhflto.c similarity index 100% rename from client/cmdhflto.c rename to client/src/cmdhflto.c diff --git a/client/cmdhflto.h b/client/src/cmdhflto.h similarity index 100% rename from client/cmdhflto.h rename to client/src/cmdhflto.h diff --git a/client/cmdhfmf.c b/client/src/cmdhfmf.c similarity index 99% rename from client/cmdhfmf.c rename to client/src/cmdhfmf.c index 8d2614ea7..44e56351b 100644 --- a/client/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -25,6 +25,7 @@ #include "mifare/ndef.h" #include "protocols.h" #include "util_posix.h" // msclock +#include "cmdhfmfhard.h" #define MFBLOCK_SIZE 16 diff --git a/client/cmdhfmf.h b/client/src/cmdhfmf.h similarity index 100% rename from client/cmdhfmf.h rename to client/src/cmdhfmf.h diff --git a/client/cmdhfmfdes.c b/client/src/cmdhfmfdes.c similarity index 99% rename from client/cmdhfmfdes.c rename to client/src/cmdhfmfdes.c index 944dfe438..d02c1ddfa 100644 --- a/client/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -20,7 +20,7 @@ #include "cmdhf14a.h" #include "mbedtls/des.h" #include "mbedtls/aes.h" -#include "crypto/libpcrypto.h" +#include "../crypto/libpcrypto.h" #include "protocols.h" #include "mifare.h" // desfire raw command options #include "cmdtrace.h" diff --git a/client/cmdhfmfdes.h b/client/src/cmdhfmfdes.h similarity index 100% rename from client/cmdhfmfdes.h rename to client/src/cmdhfmfdes.h diff --git a/client/cmdhfmfdesfire_disabled.c b/client/src/cmdhfmfdesfire_disabled.c similarity index 100% rename from client/cmdhfmfdesfire_disabled.c rename to client/src/cmdhfmfdesfire_disabled.c diff --git a/client/cmdhfmfdesfire_disabled.h b/client/src/cmdhfmfdesfire_disabled.h similarity index 100% rename from client/cmdhfmfdesfire_disabled.h rename to client/src/cmdhfmfdesfire_disabled.h diff --git a/client/cmdhfmfhard.c b/client/src/cmdhfmfhard.c similarity index 99% rename from client/cmdhfmfhard.c rename to client/src/cmdhfmfhard.c index 9f6c458ae..85e91ac64 100644 --- a/client/cmdhfmfhard.c +++ b/client/src/cmdhfmfhard.c @@ -16,7 +16,6 @@ //----------------------------------------------------------------------------- #include "cmdhfmfhard.h" - #include #include #include @@ -33,6 +32,7 @@ #include "util_posix.h" #include "crapto1/crapto1.h" #include "parity.h" +#include "hardnested/hardnested_bruteforce.h" #include "hardnested/hardnested_bf_core.h" #include "hardnested/hardnested_bitarray_core.h" #include "zlib.h" diff --git a/client/cmdhfmfhard.h b/client/src/cmdhfmfhard.h similarity index 58% rename from client/cmdhfmfhard.h rename to client/src/cmdhfmfhard.h index d86a2005a..6761626b2 100644 --- a/client/cmdhfmfhard.h +++ b/client/src/cmdhfmfhard.h @@ -13,33 +13,6 @@ #include "common.h" -#define NUM_SUMS 19 // number of possible sum property values - -typedef struct guess_sum_a8 { - float prob; - uint64_t num_states; - uint8_t sum_a8_idx; -} guess_sum_a8_t; - -typedef struct noncelistentry { - uint32_t nonce_enc; - uint8_t par_enc; - void *next; -} noncelistentry_t; - -typedef struct noncelist { - uint16_t num; - uint16_t Sum; - guess_sum_a8_t sum_a8_guess[NUM_SUMS]; - bool sum_a8_guess_dirty; - float expected_num_brute_force; - uint8_t BitFlips[0x400]; - uint32_t *states_bitarray[2]; - uint32_t num_states_bitarray[2]; - bool all_bitflips_dirty[2]; - noncelistentry_t *first; -} noncelist_t; - int mfnestedhard(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *trgkey, bool nonce_file_read, bool nonce_file_write, bool slow, int tests, uint64_t *foundkey, char *filename); void hardnested_print_progress(uint32_t nonces, const char *activity, float brute_force, uint64_t min_diff_print_time); diff --git a/client/cmdhfmfp.c b/client/src/cmdhfmfp.c similarity index 99% rename from client/cmdhfmfp.c rename to client/src/cmdhfmfp.c index dd5a9a8d7..91418b191 100644 --- a/client/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -25,7 +25,7 @@ #include "util_posix.h" #include "fileutils.h" #include "protocols.h" -#include "crypto/libpcrypto.h" +#include "../crypto/libpcrypto.h" static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; uint16_t CardAddresses[] = {0x9000, 0x9001, 0x9002, 0x9003, 0x9004, 0xA000, 0xA001, 0xA080, 0xA081, 0xC000, 0xC001}; diff --git a/client/cmdhfmfp.h b/client/src/cmdhfmfp.h similarity index 100% rename from client/cmdhfmfp.h rename to client/src/cmdhfmfp.h diff --git a/client/cmdhfmfu.c b/client/src/cmdhfmfu.c similarity index 99% rename from client/cmdhfmfu.c rename to client/src/cmdhfmfu.c index 65e2062ec..fcac8d137 100644 --- a/client/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -11,7 +11,7 @@ #include #include "cmdparser.h" #include "commonutil.h" -#include "crypto/libpcrypto.h" +#include "../crypto/libpcrypto.h" #include "mbedtls/des.h" #include "cmdhfmf.h" #include "cmdhf14a.h" diff --git a/client/cmdhfmfu.h b/client/src/cmdhfmfu.h similarity index 100% rename from client/cmdhfmfu.h rename to client/src/cmdhfmfu.h diff --git a/client/cmdhfthinfilm.c b/client/src/cmdhfthinfilm.c similarity index 100% rename from client/cmdhfthinfilm.c rename to client/src/cmdhfthinfilm.c diff --git a/client/cmdhfthinfilm.h b/client/src/cmdhfthinfilm.h similarity index 100% rename from client/cmdhfthinfilm.h rename to client/src/cmdhfthinfilm.h diff --git a/client/cmdhftopaz.c b/client/src/cmdhftopaz.c similarity index 100% rename from client/cmdhftopaz.c rename to client/src/cmdhftopaz.c diff --git a/client/cmdhftopaz.h b/client/src/cmdhftopaz.h similarity index 100% rename from client/cmdhftopaz.h rename to client/src/cmdhftopaz.h diff --git a/client/cmdhw.c b/client/src/cmdhw.c similarity index 100% rename from client/cmdhw.c rename to client/src/cmdhw.c diff --git a/client/cmdhw.h b/client/src/cmdhw.h similarity index 100% rename from client/cmdhw.h rename to client/src/cmdhw.h diff --git a/client/cmdlf.c b/client/src/cmdlf.c similarity index 100% rename from client/cmdlf.c rename to client/src/cmdlf.c diff --git a/client/cmdlf.h b/client/src/cmdlf.h similarity index 100% rename from client/cmdlf.h rename to client/src/cmdlf.h diff --git a/client/cmdlfawid.c b/client/src/cmdlfawid.c similarity index 100% rename from client/cmdlfawid.c rename to client/src/cmdlfawid.c diff --git a/client/cmdlfawid.h b/client/src/cmdlfawid.h similarity index 100% rename from client/cmdlfawid.h rename to client/src/cmdlfawid.h diff --git a/client/cmdlfcotag.c b/client/src/cmdlfcotag.c similarity index 100% rename from client/cmdlfcotag.c rename to client/src/cmdlfcotag.c diff --git a/client/cmdlfcotag.h b/client/src/cmdlfcotag.h similarity index 100% rename from client/cmdlfcotag.h rename to client/src/cmdlfcotag.h diff --git a/client/cmdlfem4x.c b/client/src/cmdlfem4x.c similarity index 100% rename from client/cmdlfem4x.c rename to client/src/cmdlfem4x.c diff --git a/client/cmdlfem4x.h b/client/src/cmdlfem4x.h similarity index 100% rename from client/cmdlfem4x.h rename to client/src/cmdlfem4x.h diff --git a/client/cmdlffdx.c b/client/src/cmdlffdx.c similarity index 100% rename from client/cmdlffdx.c rename to client/src/cmdlffdx.c diff --git a/client/cmdlffdx.h b/client/src/cmdlffdx.h similarity index 100% rename from client/cmdlffdx.h rename to client/src/cmdlffdx.h diff --git a/client/cmdlfgallagher.c b/client/src/cmdlfgallagher.c similarity index 100% rename from client/cmdlfgallagher.c rename to client/src/cmdlfgallagher.c diff --git a/client/cmdlfgallagher.h b/client/src/cmdlfgallagher.h similarity index 100% rename from client/cmdlfgallagher.h rename to client/src/cmdlfgallagher.h diff --git a/client/cmdlfguard.c b/client/src/cmdlfguard.c similarity index 100% rename from client/cmdlfguard.c rename to client/src/cmdlfguard.c diff --git a/client/cmdlfguard.h b/client/src/cmdlfguard.h similarity index 100% rename from client/cmdlfguard.h rename to client/src/cmdlfguard.h diff --git a/client/cmdlfhid.c b/client/src/cmdlfhid.c similarity index 100% rename from client/cmdlfhid.c rename to client/src/cmdlfhid.c diff --git a/client/cmdlfhid.h b/client/src/cmdlfhid.h similarity index 100% rename from client/cmdlfhid.h rename to client/src/cmdlfhid.h diff --git a/client/cmdlfhitag.c b/client/src/cmdlfhitag.c similarity index 100% rename from client/cmdlfhitag.c rename to client/src/cmdlfhitag.c diff --git a/client/cmdlfhitag.h b/client/src/cmdlfhitag.h similarity index 100% rename from client/cmdlfhitag.h rename to client/src/cmdlfhitag.h diff --git a/client/cmdlfindala.c b/client/src/cmdlfindala.c similarity index 100% rename from client/cmdlfindala.c rename to client/src/cmdlfindala.c diff --git a/client/cmdlfindala.h b/client/src/cmdlfindala.h similarity index 100% rename from client/cmdlfindala.h rename to client/src/cmdlfindala.h diff --git a/client/cmdlfio.c b/client/src/cmdlfio.c similarity index 100% rename from client/cmdlfio.c rename to client/src/cmdlfio.c diff --git a/client/cmdlfio.h b/client/src/cmdlfio.h similarity index 100% rename from client/cmdlfio.h rename to client/src/cmdlfio.h diff --git a/client/cmdlfjablotron.c b/client/src/cmdlfjablotron.c similarity index 100% rename from client/cmdlfjablotron.c rename to client/src/cmdlfjablotron.c diff --git a/client/cmdlfjablotron.h b/client/src/cmdlfjablotron.h similarity index 100% rename from client/cmdlfjablotron.h rename to client/src/cmdlfjablotron.h diff --git a/client/cmdlfkeri.c b/client/src/cmdlfkeri.c similarity index 100% rename from client/cmdlfkeri.c rename to client/src/cmdlfkeri.c diff --git a/client/cmdlfkeri.h b/client/src/cmdlfkeri.h similarity index 100% rename from client/cmdlfkeri.h rename to client/src/cmdlfkeri.h diff --git a/client/cmdlfmotorola.c b/client/src/cmdlfmotorola.c similarity index 100% rename from client/cmdlfmotorola.c rename to client/src/cmdlfmotorola.c diff --git a/client/cmdlfmotorola.h b/client/src/cmdlfmotorola.h similarity index 100% rename from client/cmdlfmotorola.h rename to client/src/cmdlfmotorola.h diff --git a/client/cmdlfnedap.c b/client/src/cmdlfnedap.c similarity index 100% rename from client/cmdlfnedap.c rename to client/src/cmdlfnedap.c diff --git a/client/cmdlfnedap.h b/client/src/cmdlfnedap.h similarity index 100% rename from client/cmdlfnedap.h rename to client/src/cmdlfnedap.h diff --git a/client/cmdlfnexwatch.c b/client/src/cmdlfnexwatch.c similarity index 100% rename from client/cmdlfnexwatch.c rename to client/src/cmdlfnexwatch.c diff --git a/client/cmdlfnexwatch.h b/client/src/cmdlfnexwatch.h similarity index 100% rename from client/cmdlfnexwatch.h rename to client/src/cmdlfnexwatch.h diff --git a/client/cmdlfnoralsy.c b/client/src/cmdlfnoralsy.c similarity index 100% rename from client/cmdlfnoralsy.c rename to client/src/cmdlfnoralsy.c diff --git a/client/cmdlfnoralsy.h b/client/src/cmdlfnoralsy.h similarity index 100% rename from client/cmdlfnoralsy.h rename to client/src/cmdlfnoralsy.h diff --git a/client/cmdlfpac.c b/client/src/cmdlfpac.c similarity index 100% rename from client/cmdlfpac.c rename to client/src/cmdlfpac.c diff --git a/client/cmdlfpac.h b/client/src/cmdlfpac.h similarity index 100% rename from client/cmdlfpac.h rename to client/src/cmdlfpac.h diff --git a/client/cmdlfparadox.c b/client/src/cmdlfparadox.c similarity index 100% rename from client/cmdlfparadox.c rename to client/src/cmdlfparadox.c diff --git a/client/cmdlfparadox.h b/client/src/cmdlfparadox.h similarity index 100% rename from client/cmdlfparadox.h rename to client/src/cmdlfparadox.h diff --git a/client/cmdlfpcf7931.c b/client/src/cmdlfpcf7931.c similarity index 100% rename from client/cmdlfpcf7931.c rename to client/src/cmdlfpcf7931.c diff --git a/client/cmdlfpcf7931.h b/client/src/cmdlfpcf7931.h similarity index 100% rename from client/cmdlfpcf7931.h rename to client/src/cmdlfpcf7931.h diff --git a/client/cmdlfpresco.c b/client/src/cmdlfpresco.c similarity index 100% rename from client/cmdlfpresco.c rename to client/src/cmdlfpresco.c diff --git a/client/cmdlfpresco.h b/client/src/cmdlfpresco.h similarity index 100% rename from client/cmdlfpresco.h rename to client/src/cmdlfpresco.h diff --git a/client/cmdlfpyramid.c b/client/src/cmdlfpyramid.c similarity index 100% rename from client/cmdlfpyramid.c rename to client/src/cmdlfpyramid.c diff --git a/client/cmdlfpyramid.h b/client/src/cmdlfpyramid.h similarity index 100% rename from client/cmdlfpyramid.h rename to client/src/cmdlfpyramid.h diff --git a/client/cmdlfsecurakey.c b/client/src/cmdlfsecurakey.c similarity index 100% rename from client/cmdlfsecurakey.c rename to client/src/cmdlfsecurakey.c diff --git a/client/cmdlfsecurakey.h b/client/src/cmdlfsecurakey.h similarity index 100% rename from client/cmdlfsecurakey.h rename to client/src/cmdlfsecurakey.h diff --git a/client/cmdlft55xx.c b/client/src/cmdlft55xx.c similarity index 100% rename from client/cmdlft55xx.c rename to client/src/cmdlft55xx.c diff --git a/client/cmdlft55xx.h b/client/src/cmdlft55xx.h similarity index 100% rename from client/cmdlft55xx.h rename to client/src/cmdlft55xx.h diff --git a/client/cmdlfti.c b/client/src/cmdlfti.c similarity index 100% rename from client/cmdlfti.c rename to client/src/cmdlfti.c diff --git a/client/cmdlfti.h b/client/src/cmdlfti.h similarity index 100% rename from client/cmdlfti.h rename to client/src/cmdlfti.h diff --git a/client/cmdlfverichip.c b/client/src/cmdlfverichip.c similarity index 100% rename from client/cmdlfverichip.c rename to client/src/cmdlfverichip.c diff --git a/client/cmdlfverichip.h b/client/src/cmdlfverichip.h similarity index 100% rename from client/cmdlfverichip.h rename to client/src/cmdlfverichip.h diff --git a/client/cmdlfviking.c b/client/src/cmdlfviking.c similarity index 100% rename from client/cmdlfviking.c rename to client/src/cmdlfviking.c diff --git a/client/cmdlfviking.h b/client/src/cmdlfviking.h similarity index 100% rename from client/cmdlfviking.h rename to client/src/cmdlfviking.h diff --git a/client/cmdlfvisa2000.c b/client/src/cmdlfvisa2000.c similarity index 100% rename from client/cmdlfvisa2000.c rename to client/src/cmdlfvisa2000.c diff --git a/client/cmdlfvisa2000.h b/client/src/cmdlfvisa2000.h similarity index 100% rename from client/cmdlfvisa2000.h rename to client/src/cmdlfvisa2000.h diff --git a/client/cmdmain.c b/client/src/cmdmain.c similarity index 100% rename from client/cmdmain.c rename to client/src/cmdmain.c diff --git a/client/cmdmain.h b/client/src/cmdmain.h similarity index 100% rename from client/cmdmain.h rename to client/src/cmdmain.h diff --git a/client/cmdparser.c b/client/src/cmdparser.c similarity index 100% rename from client/cmdparser.c rename to client/src/cmdparser.c diff --git a/client/cmdparser.h b/client/src/cmdparser.h similarity index 100% rename from client/cmdparser.h rename to client/src/cmdparser.h diff --git a/client/cmdscript.c b/client/src/cmdscript.c similarity index 100% rename from client/cmdscript.c rename to client/src/cmdscript.c diff --git a/client/cmdscript.h b/client/src/cmdscript.h similarity index 100% rename from client/cmdscript.h rename to client/src/cmdscript.h diff --git a/client/cmdsmartcard.c b/client/src/cmdsmartcard.c similarity index 99% rename from client/cmdsmartcard.c rename to client/src/cmdsmartcard.c index ba48fae96..36b7155e7 100644 --- a/client/cmdsmartcard.c +++ b/client/src/cmdsmartcard.c @@ -19,7 +19,7 @@ #include "proxmark3.h" #include "comms.h" // getfromdevice #include "emv/emvcore.h" // decodeTVL -#include "crypto/libpcrypto.h" // sha512hash +#include "../crypto/libpcrypto.h" // sha512hash #include "emv/dump.h" #include "ui.h" #include "fileutils.h" diff --git a/client/cmdsmartcard.h b/client/src/cmdsmartcard.h similarity index 100% rename from client/cmdsmartcard.h rename to client/src/cmdsmartcard.h diff --git a/client/cmdtrace.c b/client/src/cmdtrace.c similarity index 100% rename from client/cmdtrace.c rename to client/src/cmdtrace.c diff --git a/client/cmdtrace.h b/client/src/cmdtrace.h similarity index 100% rename from client/cmdtrace.h rename to client/src/cmdtrace.h diff --git a/client/cmdusart.c b/client/src/cmdusart.c similarity index 100% rename from client/cmdusart.c rename to client/src/cmdusart.c diff --git a/client/cmdusart.h b/client/src/cmdusart.h similarity index 100% rename from client/cmdusart.h rename to client/src/cmdusart.h diff --git a/client/cmdwiegand.c b/client/src/cmdwiegand.c similarity index 100% rename from client/cmdwiegand.c rename to client/src/cmdwiegand.c diff --git a/client/cmdwiegand.h b/client/src/cmdwiegand.h similarity index 100% rename from client/cmdwiegand.h rename to client/src/cmdwiegand.h diff --git a/client/comms.c b/client/src/comms.c similarity index 100% rename from client/comms.c rename to client/src/comms.c diff --git a/client/comms.h b/client/src/comms.h similarity index 100% rename from client/comms.h rename to client/src/comms.h diff --git a/client/crypto/asn1dump.c b/client/src/crypto/asn1dump.c similarity index 100% rename from client/crypto/asn1dump.c rename to client/src/crypto/asn1dump.c diff --git a/client/crypto/asn1dump.h b/client/src/crypto/asn1dump.h similarity index 100% rename from client/crypto/asn1dump.h rename to client/src/crypto/asn1dump.h diff --git a/client/crypto/asn1utils.c b/client/src/crypto/asn1utils.c similarity index 100% rename from client/crypto/asn1utils.c rename to client/src/crypto/asn1utils.c diff --git a/client/crypto/asn1utils.h b/client/src/crypto/asn1utils.h similarity index 100% rename from client/crypto/asn1utils.h rename to client/src/crypto/asn1utils.h diff --git a/client/crypto/libpcrypto.c b/client/src/crypto/libpcrypto.c similarity index 100% rename from client/crypto/libpcrypto.c rename to client/src/crypto/libpcrypto.c diff --git a/client/crypto/libpcrypto.h b/client/src/crypto/libpcrypto.h similarity index 100% rename from client/crypto/libpcrypto.h rename to client/src/crypto/libpcrypto.h diff --git a/client/elf.h b/client/src/elf.h similarity index 100% rename from client/elf.h rename to client/src/elf.h diff --git a/client/emojis.h b/client/src/emojis.h similarity index 100% rename from client/emojis.h rename to client/src/emojis.h diff --git a/client/emojis_alt.h b/client/src/emojis_alt.h similarity index 100% rename from client/emojis_alt.h rename to client/src/emojis_alt.h diff --git a/client/emv/apduinfo.c b/client/src/emv/apduinfo.c similarity index 100% rename from client/emv/apduinfo.c rename to client/src/emv/apduinfo.c diff --git a/client/emv/apduinfo.h b/client/src/emv/apduinfo.h similarity index 100% rename from client/emv/apduinfo.h rename to client/src/emv/apduinfo.h diff --git a/client/emv/cmdemv.c b/client/src/emv/cmdemv.c similarity index 100% rename from client/emv/cmdemv.c rename to client/src/emv/cmdemv.c diff --git a/client/emv/cmdemv.h b/client/src/emv/cmdemv.h similarity index 100% rename from client/emv/cmdemv.h rename to client/src/emv/cmdemv.h diff --git a/client/emv/crypto.c b/client/src/emv/crypto.c similarity index 100% rename from client/emv/crypto.c rename to client/src/emv/crypto.c diff --git a/client/emv/crypto.h b/client/src/emv/crypto.h similarity index 100% rename from client/emv/crypto.h rename to client/src/emv/crypto.h diff --git a/client/emv/crypto_backend.h b/client/src/emv/crypto_backend.h similarity index 100% rename from client/emv/crypto_backend.h rename to client/src/emv/crypto_backend.h diff --git a/client/emv/crypto_polarssl.c b/client/src/emv/crypto_polarssl.c similarity index 100% rename from client/emv/crypto_polarssl.c rename to client/src/emv/crypto_polarssl.c diff --git a/client/emv/dol.c b/client/src/emv/dol.c similarity index 100% rename from client/emv/dol.c rename to client/src/emv/dol.c diff --git a/client/emv/dol.h b/client/src/emv/dol.h similarity index 100% rename from client/emv/dol.h rename to client/src/emv/dol.h diff --git a/client/emv/dump.c b/client/src/emv/dump.c similarity index 100% rename from client/emv/dump.c rename to client/src/emv/dump.c diff --git a/client/emv/dump.h b/client/src/emv/dump.h similarity index 100% rename from client/emv/dump.h rename to client/src/emv/dump.h diff --git a/client/emv/emv_pk.c b/client/src/emv/emv_pk.c similarity index 100% rename from client/emv/emv_pk.c rename to client/src/emv/emv_pk.c diff --git a/client/emv/emv_pk.h b/client/src/emv/emv_pk.h similarity index 100% rename from client/emv/emv_pk.h rename to client/src/emv/emv_pk.h diff --git a/client/emv/emv_pki.c b/client/src/emv/emv_pki.c similarity index 100% rename from client/emv/emv_pki.c rename to client/src/emv/emv_pki.c diff --git a/client/emv/emv_pki.h b/client/src/emv/emv_pki.h similarity index 100% rename from client/emv/emv_pki.h rename to client/src/emv/emv_pki.h diff --git a/client/emv/emv_pki_priv.c b/client/src/emv/emv_pki_priv.c similarity index 100% rename from client/emv/emv_pki_priv.c rename to client/src/emv/emv_pki_priv.c diff --git a/client/emv/emv_pki_priv.h b/client/src/emv/emv_pki_priv.h similarity index 100% rename from client/emv/emv_pki_priv.h rename to client/src/emv/emv_pki_priv.h diff --git a/client/emv/emv_roca.c b/client/src/emv/emv_roca.c similarity index 100% rename from client/emv/emv_roca.c rename to client/src/emv/emv_roca.c diff --git a/client/emv/emv_roca.h b/client/src/emv/emv_roca.h similarity index 100% rename from client/emv/emv_roca.h rename to client/src/emv/emv_roca.h diff --git a/client/emv/emv_tags.c b/client/src/emv/emv_tags.c similarity index 100% rename from client/emv/emv_tags.c rename to client/src/emv/emv_tags.c diff --git a/client/emv/emv_tags.h b/client/src/emv/emv_tags.h similarity index 100% rename from client/emv/emv_tags.h rename to client/src/emv/emv_tags.h diff --git a/client/emv/emvcore.c b/client/src/emv/emvcore.c similarity index 100% rename from client/emv/emvcore.c rename to client/src/emv/emvcore.c diff --git a/client/emv/emvcore.h b/client/src/emv/emvcore.h similarity index 100% rename from client/emv/emvcore.h rename to client/src/emv/emvcore.h diff --git a/client/emv/emvjson.c b/client/src/emv/emvjson.c similarity index 100% rename from client/emv/emvjson.c rename to client/src/emv/emvjson.c diff --git a/client/emv/emvjson.h b/client/src/emv/emvjson.h similarity index 100% rename from client/emv/emvjson.h rename to client/src/emv/emvjson.h diff --git a/client/emv/test/cda_test.c b/client/src/emv/test/cda_test.c similarity index 100% rename from client/emv/test/cda_test.c rename to client/src/emv/test/cda_test.c diff --git a/client/emv/test/cda_test.h b/client/src/emv/test/cda_test.h similarity index 100% rename from client/emv/test/cda_test.h rename to client/src/emv/test/cda_test.h diff --git a/client/emv/test/crypto_test.c b/client/src/emv/test/crypto_test.c similarity index 100% rename from client/emv/test/crypto_test.c rename to client/src/emv/test/crypto_test.c diff --git a/client/emv/test/crypto_test.h b/client/src/emv/test/crypto_test.h similarity index 100% rename from client/emv/test/crypto_test.h rename to client/src/emv/test/crypto_test.h diff --git a/client/emv/test/cryptotest.c b/client/src/emv/test/cryptotest.c similarity index 100% rename from client/emv/test/cryptotest.c rename to client/src/emv/test/cryptotest.c diff --git a/client/emv/test/cryptotest.h b/client/src/emv/test/cryptotest.h similarity index 100% rename from client/emv/test/cryptotest.h rename to client/src/emv/test/cryptotest.h diff --git a/client/emv/test/dda_test.c b/client/src/emv/test/dda_test.c similarity index 100% rename from client/emv/test/dda_test.c rename to client/src/emv/test/dda_test.c diff --git a/client/emv/test/dda_test.h b/client/src/emv/test/dda_test.h similarity index 100% rename from client/emv/test/dda_test.h rename to client/src/emv/test/dda_test.h diff --git a/client/emv/test/sda_test.c b/client/src/emv/test/sda_test.c similarity index 100% rename from client/emv/test/sda_test.c rename to client/src/emv/test/sda_test.c diff --git a/client/emv/test/sda_test.h b/client/src/emv/test/sda_test.h similarity index 100% rename from client/emv/test/sda_test.h rename to client/src/emv/test/sda_test.h diff --git a/client/emv/tlv.c b/client/src/emv/tlv.c similarity index 100% rename from client/emv/tlv.c rename to client/src/emv/tlv.c diff --git a/client/emv/tlv.h b/client/src/emv/tlv.h similarity index 100% rename from client/emv/tlv.h rename to client/src/emv/tlv.h diff --git a/client/fido/additional_ca.c b/client/src/fido/additional_ca.c similarity index 100% rename from client/fido/additional_ca.c rename to client/src/fido/additional_ca.c diff --git a/client/fido/additional_ca.h b/client/src/fido/additional_ca.h similarity index 100% rename from client/fido/additional_ca.h rename to client/src/fido/additional_ca.h diff --git a/client/fido/cbortools.c b/client/src/fido/cbortools.c similarity index 100% rename from client/fido/cbortools.c rename to client/src/fido/cbortools.c diff --git a/client/fido/cbortools.h b/client/src/fido/cbortools.h similarity index 100% rename from client/fido/cbortools.h rename to client/src/fido/cbortools.h diff --git a/client/fido/cose.c b/client/src/fido/cose.c similarity index 100% rename from client/fido/cose.c rename to client/src/fido/cose.c diff --git a/client/fido/cose.h b/client/src/fido/cose.h similarity index 100% rename from client/fido/cose.h rename to client/src/fido/cose.h diff --git a/client/fido/fido2.json b/client/src/fido/fido2.json similarity index 100% rename from client/fido/fido2.json rename to client/src/fido/fido2.json diff --git a/client/fido/fidocore.c b/client/src/fido/fidocore.c similarity index 100% rename from client/fido/fidocore.c rename to client/src/fido/fidocore.c diff --git a/client/fido/fidocore.h b/client/src/fido/fidocore.h similarity index 100% rename from client/fido/fidocore.h rename to client/src/fido/fidocore.h diff --git a/client/fileutils.c b/client/src/fileutils.c similarity index 100% rename from client/fileutils.c rename to client/src/fileutils.c diff --git a/client/fileutils.h b/client/src/fileutils.h similarity index 100% rename from client/fileutils.h rename to client/src/fileutils.h diff --git a/client/flash.c b/client/src/flash.c similarity index 100% rename from client/flash.c rename to client/src/flash.c diff --git a/client/flash.h b/client/src/flash.h similarity index 100% rename from client/flash.h rename to client/src/flash.h diff --git a/client/graph.c b/client/src/graph.c similarity index 100% rename from client/graph.c rename to client/src/graph.c diff --git a/client/graph.h b/client/src/graph.h similarity index 100% rename from client/graph.h rename to client/src/graph.h diff --git a/client/guidummy.cpp b/client/src/guidummy.cpp similarity index 100% rename from client/guidummy.cpp rename to client/src/guidummy.cpp diff --git a/client/loclass/cipher.c b/client/src/loclass/cipher.c similarity index 100% rename from client/loclass/cipher.c rename to client/src/loclass/cipher.c diff --git a/client/loclass/cipher.h b/client/src/loclass/cipher.h similarity index 100% rename from client/loclass/cipher.h rename to client/src/loclass/cipher.h diff --git a/client/loclass/cipherutils.c b/client/src/loclass/cipherutils.c similarity index 100% rename from client/loclass/cipherutils.c rename to client/src/loclass/cipherutils.c diff --git a/client/loclass/cipherutils.h b/client/src/loclass/cipherutils.h similarity index 100% rename from client/loclass/cipherutils.h rename to client/src/loclass/cipherutils.h diff --git a/client/loclass/elite_crack.c b/client/src/loclass/elite_crack.c similarity index 100% rename from client/loclass/elite_crack.c rename to client/src/loclass/elite_crack.c diff --git a/client/loclass/elite_crack.h b/client/src/loclass/elite_crack.h similarity index 100% rename from client/loclass/elite_crack.h rename to client/src/loclass/elite_crack.h diff --git a/client/loclass/hash1_brute.c b/client/src/loclass/hash1_brute.c similarity index 100% rename from client/loclass/hash1_brute.c rename to client/src/loclass/hash1_brute.c diff --git a/client/loclass/hash1_brute.h b/client/src/loclass/hash1_brute.h similarity index 100% rename from client/loclass/hash1_brute.h rename to client/src/loclass/hash1_brute.h diff --git a/client/loclass/ikeys.c b/client/src/loclass/ikeys.c similarity index 100% rename from client/loclass/ikeys.c rename to client/src/loclass/ikeys.c diff --git a/client/loclass/ikeys.h b/client/src/loclass/ikeys.h similarity index 100% rename from client/loclass/ikeys.h rename to client/src/loclass/ikeys.h diff --git a/client/mifare/desfire_crypto.c b/client/src/mifare/desfire_crypto.c similarity index 97% rename from client/mifare/desfire_crypto.c rename to client/src/mifare/desfire_crypto.c index 42542c948..e4caaae26 100644 --- a/client/mifare/desfire_crypto.c +++ b/client/src/mifare/desfire_crypto.c @@ -27,15 +27,14 @@ */ #include "desfire_crypto.h" #include -#include #include #include "commonutil.h" -#include "crc32.h" #include "mbedtls/aes.h" #include "mbedtls/des.h" #include "ui.h" #include "crc.h" #include "crc16.h" // crc16 ccitt +#include "crc32.h" mbedtls_des_context ctx; mbedtls_des3_context ctx3; @@ -45,37 +44,6 @@ mbedtls_aes_context actx; # define AddCrc14A(data, len) compute_crc(CRC_14443_A, (data), (len), (data)+(len), (data)+(len)+1) #endif -#define htole32(x) (x) -#define CRC32_PRESET 0xFFFFFFFF - -static void crc32_byte(uint32_t *crc, const uint8_t value); - -static void crc32_byte(uint32_t *crc, const uint8_t value) { - /* x32 + x26 + x23 + x22 + x16 + x12 + x11 + x10 + x8 + x7 + x5 + x4 + x2 + x + 1 */ - const uint32_t poly = 0xEDB88320; - - *crc ^= value; - for (int current_bit = 7; current_bit >= 0; current_bit--) { - int bit_out = (*crc) & 0x00000001; - *crc >>= 1; - if (bit_out) - *crc ^= poly; - } -} - -void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc) { - uint32_t desfire_crc = CRC32_PRESET; - for (size_t i = 0; i < len; i++) { - crc32_byte(&desfire_crc, data[i]); - } - - *((uint32_t *)(crc)) = htole32(desfire_crc); -} - -void crc32_append(uint8_t *data, const size_t len) { - crc32_ex(data, len, data + len); -} - static inline void update_key_schedules(desfirekey_t key); static inline void update_key_schedules(desfirekey_t key) { diff --git a/client/mifare/desfire_crypto.h b/client/src/mifare/desfire_crypto.h similarity index 97% rename from client/mifare/desfire_crypto.h rename to client/src/mifare/desfire_crypto.h index ff2334b5d..40c57de27 100644 --- a/client/mifare/desfire_crypto.h +++ b/client/src/mifare/desfire_crypto.h @@ -3,6 +3,7 @@ #include "common.h" #include "mifare.h" // structs +#include "crc32.h" //#include "../../armsrc/printf.h" //#include "../../armsrc/desfire.h" //#include "../../armsrc/iso14443a.h" @@ -103,9 +104,6 @@ typedef unsigned long DES3_KS[48][2]; /* Triple-DES key schedule */ extern int Asmversion; /* 1 if we're linked with an asm version, 0 if C */ -void crc32_ex(const uint8_t *data, const size_t len, uint8_t *crc); -void crc32_append(uint8_t *data, const size_t len); - void des_encrypt(void *out, const void *in, const void *key); void des_decrypt(void *out, const void *in, const void *key); void tdes_nxp_receive(const void *in, void *out, size_t length, const void *key, unsigned char iv[8], int keymode); diff --git a/client/mifare/mad.c b/client/src/mifare/mad.c similarity index 100% rename from client/mifare/mad.c rename to client/src/mifare/mad.c diff --git a/client/mifare/mad.h b/client/src/mifare/mad.h similarity index 100% rename from client/mifare/mad.h rename to client/src/mifare/mad.h diff --git a/client/mifare/mfkey.c b/client/src/mifare/mfkey.c similarity index 100% rename from client/mifare/mfkey.c rename to client/src/mifare/mfkey.c diff --git a/client/mifare/mfkey.h b/client/src/mifare/mfkey.h similarity index 100% rename from client/mifare/mfkey.h rename to client/src/mifare/mfkey.h diff --git a/client/mifare/mifare4.c b/client/src/mifare/mifare4.c similarity index 100% rename from client/mifare/mifare4.c rename to client/src/mifare/mifare4.c diff --git a/client/mifare/mifare4.h b/client/src/mifare/mifare4.h similarity index 100% rename from client/mifare/mifare4.h rename to client/src/mifare/mifare4.h diff --git a/client/mifare/mifaredefault.c b/client/src/mifare/mifaredefault.c similarity index 100% rename from client/mifare/mifaredefault.c rename to client/src/mifare/mifaredefault.c diff --git a/client/mifare/mifaredefault.h b/client/src/mifare/mifaredefault.h similarity index 100% rename from client/mifare/mifaredefault.h rename to client/src/mifare/mifaredefault.h diff --git a/client/mifare/mifarehost.c b/client/src/mifare/mifarehost.c similarity index 100% rename from client/mifare/mifarehost.c rename to client/src/mifare/mifarehost.c diff --git a/client/mifare/mifarehost.h b/client/src/mifare/mifarehost.h similarity index 100% rename from client/mifare/mifarehost.h rename to client/src/mifare/mifarehost.h diff --git a/client/mifare/ndef.c b/client/src/mifare/ndef.c similarity index 100% rename from client/mifare/ndef.c rename to client/src/mifare/ndef.c diff --git a/client/mifare/ndef.h b/client/src/mifare/ndef.h similarity index 100% rename from client/mifare/ndef.h rename to client/src/mifare/ndef.h diff --git a/client/pm3_binlib.c b/client/src/pm3_binlib.c similarity index 100% rename from client/pm3_binlib.c rename to client/src/pm3_binlib.c diff --git a/client/pm3_binlib.h b/client/src/pm3_binlib.h similarity index 100% rename from client/pm3_binlib.h rename to client/src/pm3_binlib.h diff --git a/client/pm3_bit_limits.h b/client/src/pm3_bit_limits.h similarity index 100% rename from client/pm3_bit_limits.h rename to client/src/pm3_bit_limits.h diff --git a/client/pm3_bitlib.c b/client/src/pm3_bitlib.c similarity index 100% rename from client/pm3_bitlib.c rename to client/src/pm3_bitlib.c diff --git a/client/pm3_bitlib.h b/client/src/pm3_bitlib.h similarity index 100% rename from client/pm3_bitlib.h rename to client/src/pm3_bitlib.h diff --git a/client/polarssl_config.h b/client/src/polarssl_config.h similarity index 100% rename from client/polarssl_config.h rename to client/src/polarssl_config.h diff --git a/client/preferences.c b/client/src/preferences.c similarity index 100% rename from client/preferences.c rename to client/src/preferences.c diff --git a/client/preferences.h b/client/src/preferences.h similarity index 100% rename from client/preferences.h rename to client/src/preferences.h diff --git a/client/prng.c b/client/src/prng.c similarity index 100% rename from client/prng.c rename to client/src/prng.c diff --git a/client/prng.h b/client/src/prng.h similarity index 100% rename from client/prng.h rename to client/src/prng.h diff --git a/client/proxendian.h b/client/src/proxendian.h similarity index 100% rename from client/proxendian.h rename to client/src/proxendian.h diff --git a/client/proxgui.cpp b/client/src/proxgui.cpp similarity index 100% rename from client/proxgui.cpp rename to client/src/proxgui.cpp diff --git a/client/proxgui.h b/client/src/proxgui.h similarity index 100% rename from client/proxgui.h rename to client/src/proxgui.h diff --git a/client/proxguiqt.cpp b/client/src/proxguiqt.cpp similarity index 100% rename from client/proxguiqt.cpp rename to client/src/proxguiqt.cpp diff --git a/client/proxguiqt.h b/client/src/proxguiqt.h similarity index 100% rename from client/proxguiqt.h rename to client/src/proxguiqt.h diff --git a/client/proxmark3.c b/client/src/proxmark3.c similarity index 100% rename from client/proxmark3.c rename to client/src/proxmark3.c diff --git a/client/proxmark3.h b/client/src/proxmark3.h similarity index 100% rename from client/proxmark3.h rename to client/src/proxmark3.h diff --git a/client/scandir.c b/client/src/scandir.c similarity index 100% rename from client/scandir.c rename to client/src/scandir.c diff --git a/client/scandir.h b/client/src/scandir.h similarity index 100% rename from client/scandir.h rename to client/src/scandir.h diff --git a/client/scripting.c b/client/src/scripting.c similarity index 100% rename from client/scripting.c rename to client/src/scripting.c diff --git a/client/scripting.h b/client/src/scripting.h similarity index 100% rename from client/scripting.h rename to client/src/scripting.h diff --git a/client/tea.c b/client/src/tea.c similarity index 100% rename from client/tea.c rename to client/src/tea.c diff --git a/client/tea.h b/client/src/tea.h similarity index 100% rename from client/tea.h rename to client/src/tea.h diff --git a/client/uart/README.md b/client/src/uart/README.md similarity index 100% rename from client/uart/README.md rename to client/src/uart/README.md diff --git a/client/uart/uart.h b/client/src/uart/uart.h similarity index 100% rename from client/uart/uart.h rename to client/src/uart/uart.h diff --git a/client/uart/uart_posix.c b/client/src/uart/uart_posix.c similarity index 100% rename from client/uart/uart_posix.c rename to client/src/uart/uart_posix.c diff --git a/client/uart/uart_win32.c b/client/src/uart/uart_win32.c similarity index 100% rename from client/uart/uart_win32.c rename to client/src/uart/uart_win32.c diff --git a/client/ui.c b/client/src/ui.c similarity index 100% rename from client/ui.c rename to client/src/ui.c diff --git a/client/ui.h b/client/src/ui.h similarity index 100% rename from client/ui.h rename to client/src/ui.h diff --git a/client/ui/overlays.ui b/client/src/ui/overlays.ui similarity index 100% rename from client/ui/overlays.ui rename to client/src/ui/overlays.ui diff --git a/client/util.c b/client/src/util.c similarity index 100% rename from client/util.c rename to client/src/util.c diff --git a/client/util.h b/client/src/util.h similarity index 100% rename from client/util.h rename to client/src/util.h diff --git a/client/util_darwin.h b/client/src/util_darwin.h similarity index 100% rename from client/util_darwin.h rename to client/src/util_darwin.h diff --git a/client/util_darwin.m b/client/src/util_darwin.m similarity index 100% rename from client/util_darwin.m rename to client/src/util_darwin.m diff --git a/client/whereami.c b/client/src/whereami.c similarity index 99% rename from client/whereami.c rename to client/src/whereami.c index 2dca967af..30d70c4d9 100644 --- a/client/whereami.c +++ b/client/src/whereami.c @@ -7,7 +7,7 @@ extern "C" { #endif -#include +#include "whereami.h" #if defined(__linux__) // make realpath() available: diff --git a/client/whereami.h b/client/src/whereami.h similarity index 100% rename from client/whereami.h rename to client/src/whereami.h diff --git a/client/wiegand_formats.c b/client/src/wiegand_formats.c similarity index 100% rename from client/wiegand_formats.c rename to client/src/wiegand_formats.c diff --git a/client/wiegand_formats.h b/client/src/wiegand_formats.h similarity index 100% rename from client/wiegand_formats.h rename to client/src/wiegand_formats.h diff --git a/client/wiegand_formatutils.c b/client/src/wiegand_formatutils.c similarity index 100% rename from client/wiegand_formatutils.c rename to client/src/wiegand_formatutils.c diff --git a/client/wiegand_formatutils.h b/client/src/wiegand_formatutils.h similarity index 100% rename from client/wiegand_formatutils.h rename to client/src/wiegand_formatutils.h