RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 08:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
13581 commits 3 branches 14 tags 86 MiB
Commit graph

393 commits

Author SHA1 Message Date
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
Philippe Teuwen b556810776 armsrc: clarify static vars vs global vars, part 2 2020-05-19 17:25:58 +02:00
Philippe Teuwen 3e7512a5d5 armsrc: clarify static vars vs global vars 2020-05-19 17:05:43 +02:00
iceman1001 ed11e4a093 cppcheck fix, assign a value 2020-05-14 09:18:51 +02:00
Philippe Teuwen 026707b960 arm: fix prototypes 2020-05-11 13:48:57 +02:00
Salvador Mendoza a06d05cc95 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza 88d9ad2829 Update iso14443a.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza 3535c2ffb0 Update iso14443a.c 2020-04-24 16:42:40 +02:00
iceman1001 732c012be7 adjustments 2020-04-10 10:27:28 +02:00
iceman1001 57788d5751 whitespace 2020-03-10 17:11:57 +01:00
iceman1001 36f2234121 fix HF simulation 2020-02-12 10:29:00 +01:00
iceman1001 eb9f67635b chg: enable/disable hf fpga tracing 2020-01-13 10:34:59 +01:00
iceman1001 0c8ead0bd6 fix: forgot some changes 2019-12-30 13:11:44 +01:00
Philippe Teuwen 8ea04a42a6 Use GetTickCountDelta when possible 2019-10-16 00:03:53 +02:00
Philippe Teuwen 395d0f9ebf make style 2019-10-13 00:48:26 +02:00
iceman1001 ebb2ac6f66 adjusting check button timings 2019-10-04 10:24:04 +02:00
iceman1001 7c2231974d clean up, explain, lesser tests for buttonpress 2019-09-26 09:54:43 +02:00
iceman1001 3e22d99b03 hf mf darkside uses NG. checkbutton more seldom, shoulded interfere with syncing the prng so much 2019-09-25 10:24:34 +02:00
Philippe Teuwen abe5ca47a5 thinfilm: reduce timeout, no need to wait so long 2019-09-17 17:45:45 +02:00
Ludovic Rousseau f961c1c551 Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
 2019-09-14 17:53:24 +02:00
iceman1001 df2c294cac chg - cleaning out testcode... 2019-09-11 15:15:13 +02:00
Philippe Teuwen d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Philippe Teuwen 1354aec556 typos 2019-08-06 13:51:10 +02:00
Philippe Teuwen 25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
iceman1001 2400418067 style 2019-08-01 11:15:39 -04:00
Philippe Teuwen 118c8478f0 fix ManchesterDecoding_Thinfilm (msb was always forced to 0) 2019-08-01 16:55:20 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen 544fb30ce6 typos 2019-07-23 21:40:01 +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 8e6258936c make style 2019-07-19 13:18:35 +02:00
merlokk 6e15d6521d Merge branch 'master' of github.com:merlokk/proxmark3i into apdu_armside 2019-07-18 17:44:50 +03:00
merlokk e87abc9681 small fix apdu leds 2019-07-18 17:32:56 +03:00
merlokk 1e0433c1d7 now code can't use uninitialized fpga link and encoders/decoders 2019-07-18 17:11:04 +03: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
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +02:00
Philippe Teuwen 3b12ba2e93 replace usb_poll_validate_length() by data_available() that supports USART too 2019-06-03 00:01:08 +02:00
iceman1001 58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
iceman1001 b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
iceman1001 33c10f260d chg: hf 14a sim / hf mf sim - check buttonpress/usb frame fewer times in order not to disrupt simulation (@McEloff) 2019-05-23 10:29:33 -04:00
Philippe Teuwen 62b0732a8c
Merge pull request #201 from McEloff/hf_14a_sim_comp_write 
fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command,
 2019-05-23 00:42:12 +02:00
Philippe Teuwen 522297896c Use GetTickCountDelta everywhere 2019-05-23 00:39:50 +02:00
Eloff 0ec9323df0 PACK-response to EV1 PASSWORD request no more used as precompiled sequense 2019-05-23 01:30:23 +03:00
Eloff 49de1a1655 fix: 'hf 14a sim' ultralight COMPATIBLE_WRITE command, 
chg: 'hf 14a sim' incoming commands length checks, reorder block conditions
 2019-05-23 00:59:35 +03:00
iceman1001 088d34eb3e chg: hf mf nack - keep sync if started without card over antenna 2019-05-15 08:20:04 -04:00
iceman1001 bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001 41acc98d87 mix 2019-05-15 12:03:00 +02:00
Philippe Teuwen 107b3873fb fix 14a sniff timings by moving away debug msg 2019-05-09 15:24:41 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Iceman bdf7746105
Merge pull request #175 from McEloff/hf14a 
'hf 14a sim' more flexible init responses method
 2019-04-29 22:52:05 +02:00
Eloff b2d0bea05f 'hf 14a sim' more flexible init responses method 2019-04-26 13:22:57 +03:00
Philippe Teuwen eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00
Eloff 66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Eloff a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 e5928424b6 style 2019-04-16 15:08:51 +02:00
iceman1001 6803e6d1c0 style 2019-04-13 01:43:22 +02:00
Eloff 249352a1e7 'hf mf sim' + 'hf 14a sim' now back to stable 2019-04-09 23:57:10 +03:00
Eloff f13f7f4cbb Pull request #145. Next part of changes 2019-04-08 19:15:15 +03:00
McEloff 4588384587
Merge branch 'master' into temp 2019-04-08 10:26:30 +03:00
Philippe Teuwen 9c3a520300 iso14443a_select_card resp_data -> p_card 2019-04-07 12:18:20 +02:00
iceman1001 4856252912 styles 2019-04-07 11:39:49 +02:00
Philippe Teuwen a52a0bf537 args names 2019-04-06 20:21:03 +02:00
Philippe Teuwen 41f36ca20b make style 2019-04-06 19:09:01 +02:00
vratiskol 0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
Eloff 791ff18381 'hf mf sim' - bugs fix, refactoring 2019-04-05 00:15:55 +03:00
Eloff 19cf50a6ff Mifare Ultralight/NTAG simulation. Add WRITE and COMPATIBLE_WRITE support 2019-04-03 22:26:18 +03:00
vratiskol 1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen db4aa08b78 make style 2019-03-28 14:19:41 +01:00
iceman1001 459835b5ca fix: 'hf mf sim' - Mifare simulation now works against Android etc. Thanks to @eloff 2019-03-27 15:29:45 +01:00
vratiskol 3b06c9d8ee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 20:46:56 +01:00
iceman1001 ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
vratiskol c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001 e925dc9f7a clean 2019-03-17 21:53:26 +01:00
iceman1001 ca24b7ae74 chg: 'hf 14a sim' - send 4bit ACK/NACK responses 2019-03-17 21:52:14 +01:00
vratiskol cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim" 
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
 2019-03-15 21:45:00 +01:00
vratiskol cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol 6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol 64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
Philippe Teuwen 3807848171 fix DetectNACKbug: sync_cycles is signed 2019-03-12 23:37:53 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 8a7c6825b5 armsrc: fix mix of spaces & tabs 2019-03-09 20:34:41 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
merlokk 69f3e65dd0 fix memmove if len=0 2019-02-05 18:39:03 +02:00
merlokk 0e5d896893 fix endless loop 2019-02-05 18:27:48 +02:00
merlokk cf21f046d8 arm side 2019-01-30 18:15:47 +02:00
merlokk 1b3d96ab2d add apdu chaining to arm side 2019-01-29 19:30:15 +02:00
iceman1001 2612cd006a CHG: bigbuf adaptations 2019-01-09 12:00:06 +01:00
iceman1001 3ae871f534 CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS - 2019-01-07 09:32:16 +01:00
merlokk 0cfa47e628 merged iso14 arm side 2018-11-08 20:29:08 +02:00