Commit graph

6499 commits

Author SHA1 Message Date
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen daae890667 Bootrom & flasher changes:
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
2019-07-20 10:48:40 +02:00
slurdge 68aa9d631d Flasher support for versionning
Only bootrom with version > 1.0.0 will allow 512K writes
2019-07-20 10:47:24 +02:00
slurdge c056e56492 Add a version command to the bootloader (not activated yet) 2019-07-20 10:47:24 +02:00
Philippe Teuwen 7ad7275ee9
Merge pull request #279 from McEloff/mf_sim_ac_fix
'hf mf sim' - wrong access rights to write key B in trailer
2019-07-20 00:47:48 +02:00
McEloff 0189bb70d7
Merge branch 'master' into mf_sim_ac_fix 2019-07-19 16:32:45 +03:00
Eloff 0b38c23ed3 'hf mf sim' - wrong access rights to write key B in trailer; typo; simple code optimization 2019-07-19 16:27:08 +03:00
Philippe Teuwen f4ffa005c9 Travis on osx: testing xcode9.2 2019-07-19 14:00:26 +02:00
Philippe Teuwen 8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen 33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen 44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge 7bf3255a6c Flasher support for 512K flash
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
2019-07-19 12:35:04 +02:00
Philippe Teuwen 4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Philippe Teuwen 41731ea084 analyzesize: create db on first use 2019-07-18 23:42:58 +02:00
Philippe Teuwen ed85df110e
Merge pull request #278 from slurdge/ignore_openocd_conf
Ignore local openocd configuration
2019-07-18 23:22:02 +02:00
Philippe Teuwen 6634ac268f
Merge pull request #277 from slurdge/analyze_elf_size
Add a simple tool to analyze elf files
2019-07-18 22:42:30 +02:00
slurdge 32382ace3b Ignore local openocd configuration 2019-07-18 22:28:07 +02:00
slurdge 01e6db5c2e Add a simple tool to analyze elf files 2019-07-18 22:26:01 +02:00
RFID Research Group fdada47325
Update README.md
swapped to RRG account for Appveyor
2019-07-18 20:45:08 +02:00
Oleg Moiseenko e23ea71427
Merge pull request #263 from merlokk/apdu_armside
added 14a send/receive arm timeout
2019-07-18 20:03:24 +03:00
merlokk 6e15d6521d Merge branch 'master' of github.com:merlokk/proxmark3i into apdu_armside 2019-07-18 17:44:50 +03:00
Oleg Moiseenko 757cbe2699
Merge pull request #274 from luminouw/master
Update CHANGELOG.md
2019-07-18 17:42:53 +03:00
Philippe Teuwen 9cd80406e2 Add Travis badge 2019-07-18 16:39:48 +02:00
Oleg Moiseenko ee3203de88
Merge pull request #275 from merlokk/apdu_init_fix
small fix apdu leds
2019-07-18 17:35:03 +03:00
merlokk e87abc9681 small fix apdu leds 2019-07-18 17:32:56 +03:00
Oleg Moiseenko 1823b94527
Merge pull request #272 from merlokk/apdu_init_check
code can't use uninitialized fpga link and encoders/decoders
2019-07-18 17:26:19 +03:00
merlokk 1e0433c1d7 now code can't use uninitialized fpga link and encoders/decoders 2019-07-18 17:11:04 +03:00
Julien Piat 5a5b3db92e Update CHANGELOG.md 2019-07-18 16:11:03 +02:00
RFID Research Group 86d05d1080
Merge pull request #270 from luminouw/master
Update default_keys.dic with new keys from Scan Badge APK
2019-07-18 15:57:04 +02:00
Julien Piat 29f8bfb80c Update default_keys.dic with new keys from Scan Badge APK 2019-07-18 15:54:21 +02:00
Iceman f748c217b6
Update README.md
appveyor RRG/Iceman link.
2019-07-18 15:27:12 +02:00
Philippe Teuwen 9dc1b1664d Add external flash layout notes 2019-07-17 21:11:34 +02:00
Philippe Teuwen dfdef0bbcc Clarify some PLATFORM_EXTRAS usages 2019-07-17 20:39:32 +02:00
Philippe Teuwen 259c730bb0 exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable 2019-07-17 20:15:47 +02:00
Philippe Teuwen a4f1185f25
Merge pull request #264 from slurdge/fix_linux_travis
Fix build for linux on travis
2019-07-17 19:54:04 +02:00
slurdge 7d836d9f1b Less apt libs for compilation 2019-07-17 19:17:20 +02:00
Philippe Teuwen 7efaeec054 Linux install: limit dependencies to the really needed ones 2019-07-17 19:01:51 +02:00
merlokk 87e183e664 small fix 2019-07-17 16:26:10 +03:00
merlokk 81fa3f20df speed optimization 2019-07-17 16:22:14 +03:00
merlokk 67ad6298cd added 14a send/receive arm timeout 2019-07-17 15:54:22 +03:00
slurdge 6e1bd28aac Fix build for linux
And move to xenial
2019-07-17 14:52:48 +02:00
mwalker33 9a1c0ff8a8
Merge pull request #1 from RfidResearchGroup/master
Sync Master to fork
2019-07-17 21:00:49 +10:00
Oleg Moiseenko 2bd1be9aba
Merge pull request #262 from merlokk/fix_sea
fix rare emv search behavior
2019-07-17 12:20:27 +03:00
merlokk 84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
Oleg Moiseenko 7c6facce94
Merge pull request #261 from merlokk/emv_sea_bug
fix emv search keep field bug
2019-07-17 12:00:02 +03:00
merlokk a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Iceman 777f9858cb
Merge pull request #259 from cjbrigato/patch-2
FIX: Get a usable AES implementation again
2019-07-17 07:55:43 +02:00
Colin J. Brigato 2ad63c07ff
FIX: Get a usable AES implementation again
see #258 for more information.
2019-07-17 03:16:13 +02:00
Philippe Teuwen 8cb35893c4
Merge pull request #256 from slurdge/patch-1
Add the needed qt package on ArchLinux
2019-07-16 23:46:49 +02:00