proxmark3

github/proxmark3

Fork 0

mirror of https://github.com/Proxmark/proxmark3.git synced 2025-03-12 04:35:36 -07:00

Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

unstable

#1

#101

#102

#1021

#1021

#106

#107

#108

#109

#111

#112

#113

#114

#115

#117

#118

#119

#120

#121

#122

#123

#125

#127

#129

#130

#131

#132

#132

#133

#134

#137

#137

#138

#139

#139

#14

#14

#140

#141

#142

#143

#144

#146

#147

#148

#148

#149

#15

#153

#158

#160

#161

#162

#164

#165

#166

#167

#168

#17

#170

#170

#171

#171

#172

#172

#173

#173

#175

#176

#176

#178

#181

#184

#185

#190

#190

#191

#191

#192

#193

#194

#194

#195

#196

#197

#198

#198

#2

#202

#208

#209

#21

#21

#211

#213

#213

#214

#215

#216

#219

#22

#220

#221

#223

#224

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#239

#24

#24

#240

#241

#242

#243

#244

#245

#246

#248

#249

#250

#251

#252

#253

#254

#256

#257

#258

#259

#260

#262

#263

#263

#264

#265

#266

#268

#271

#274

#276

#277

#278

#281

#282

#286

#287

#289

#293

#297

#298

#301

#302

#304

#306

#31

#310

#311

#312

#313

#315

#317

#319

#32

#321

#322

#328

#329

#33

#330

#332

#333

#336

#337

#338

#339

#339

#34

#340

#340

#341

#343

#344

#345

#346

#346

#347

#349

#350

#351

#352

#354

#355

#356

#358

#361

#362

#365

#366

#366

#369

#37

#37

#370

#370

#371

#373

#374

#374

#377

#377

#378

#38

#380

#382

#384

#385

#387

#388

#391

#392

#393

#396

#398

#398

#40

#400

#401

#402

#403

#405

#407

#41

#41

#414

#417

#419

#420

#421

#424

#424

#425

#425

#426

#427

#430

#432

#432

#434

#435

#436

#438

#439

#44

#440

#442

#442

#443

#444

#445

#446

#448

#450

#451

#452

#456

#457

#458

#458

#459

#46

#460

#461

#462

#463

#463

#465

#466

#470

#471

#472

#474

#475

#477

#478

#48

#480

#481

#482

#483

#483

#484

#486

#488

#49

#490

#491

#493

#494

#498

#498

#5

#50

#500

#502

#503

#504

#506

#507

#508

#51

#511

#512

#515

#516

#516

#519

#52

#52

#521

#522

#522

#523

#524

#525

#526

#528

#529

#53

#531

#533

#534

#537

#538

#54

#540

#543

#545

#546

#547

#548

#549

#55

#550

#551

#553

#554

#555

#556

#558

#56

#560

#562

#565

#566

#566

#568

#569

#57

#570

#571

#572

#577

#578

#579

#58

#580

#584

#585

#587

#588

#589

#59

#590

#590

#591

#592

#592

#593

#595

#596

#597

#598

#6

#6

#60

#600

#604

#606

#607

#609

#609

#611

#611

#613

#614

#615

#615

#616

#617

#620

#625

#629

#629

#63

#630

#631

#632

#635

#638

#64

#643

#645

#646

#648

#648

#649

#651

#652

#653

#654

#655

#658

#659

#66

#662

#665

#665

#666

#667

#668

#669

#67

#671

#672

#673

#674

#676

#678

#679

#68

#680

#680

#682

#683

#684

#686

#687

#689

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#7

#700

#702

#704

#705

#706

#708

#709

#711

#711

#713

#714

#716

#717

#718

#720

#721

#722

#723

#724

#725

#726

#727

#729

#730

#732

#734

#735

#736

#739

#74

#743

#745

#746

#747

#748

#749

#75

#750

#751

#752

#753

#754

#755

#757

#758

#759

#760

#761

#762

#763

#765

#769

#77

#770

#771

#775

#776

#777

#778

#78

#780

#781

#782

#783

#784

#786

#787

#788

#789

#790

#795

#796

#797

#8

#80

#800

#801

#802

#803

#804

#807

#808

#811

#811

#812

#815

#817

#818

#82

#822

#823

#824

#826

#828

#829

#829

#830

#833

#837

#84

#842

#846

#847

#848

#849

#850

#851

#852

#855

#856

#858

#86

#861

#862

#864

#865

#869

#870

#872

#873

#876

#879

#880

#881

#884

#887

#888

#89

#890

#894

#895

#896

#9

#900

#901

#904

#905

#908

#909

#91

#910

#911

#913

#917

#919

#92

#920

#923

#923

#926

#929

#930

#930

#938

#943

#944

#948

#948

#953

#963

#964

#969

#98

#99

v1.0.0

v1.1.0

v2.0.0

v2.0.0-rc1

v2.0.0-rc2

v2.1.0

v2.2.0

v2.3.0

v3.0.0

v3.0.1

v3.1.0

7242efa07c bugfix Martin Holst Swende 2015-01-22 23:04:59 +01:00
cb366e9dbd Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions Martin Holst Swende 2015-01-22 23:01:29 +01:00
e629181f5a Fixed issue where -1 size_t was returned Martin Holst Swende 2015-01-22 21:04:16 +01:00
afceaf4018 Removed openssl from the mfu-stuff Martin Holst Swende 2015-01-22 21:02:21 +01:00
03e6bb4aed lf FSK demod tools/fixes marshmellow42 2015-01-22 14:24:03 -05:00
3fd26a683d On another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2 if you have multiple) Martin Holst Swende 2015-01-22 00:33:49 +01:00
388c92bde5 Generic tracing pt.4: Deprecated old 'hf 14b list' command Martin Holst Swende 2015-01-22 00:19:20 +01:00
c54d1394c6 Fixed compiler error Martin Holst Swende 2015-01-22 00:10:09 +01:00
9e8255d4e9 Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory Martin Holst Swende 2015-01-21 23:53:40 +01:00
df3e429d71 minor fix for a help in "hf 14a snoop" iceman1001 2015-01-21 21:24:37 +01:00
ec75f5c10a lf Bug Fixes and lf demod additions marshmellow42 2015-01-20 17:28:51 -05:00
a1557c4c2f Minor fixes: Array inits, some array bounds checks. ADD: some extra help text for lf snoop ADD: HasGraphData - function in graph.c ADD: DetectHighLowInGraph - function in graph.c iceman1001 2015-01-20 22:14:56 +01:00
e469159145 FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable. iceman1001 2015-01-20 21:58:53 +01:00
80b1b53fa3 SUGGESTED FIX: iceman1001 2015-01-20 21:55:19 +01:00
fe5b3a4424 FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call. iceman1001 2015-01-20 21:50:49 +01:00
e3c235654f Minor fixes to some help-texts. iceman1001 2015-01-20 21:48:39 +01:00
81740aa519 STEP 3 - the actual new files for Ultralight. ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again. ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do "data load" "lf search" ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods. iceman1001 2015-01-20 21:29:55 +01:00
5ee701292f Step 2 - Ultralight / Ultralight-C iceman1001 2015-01-20 21:23:04 +01:00
c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 iceman1001 2015-01-20 20:59:24 +01:00
5149e37e66 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-20 09:32:53 +01:00
53d85a8fa1 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-01-18 18:19:26 -05:00
1e090a61a1 lf demod additions marshmellow42 2015-01-18 18:13:32 -05:00
355c8b4a7d Generic trace pt2: made iso14443b use standard trace format Martin Holst Swende 2015-01-18 20:23:58 +01:00
80fe723570 Generic trace pt1: Moved arm-side trace functionality into util-package Martin Holst Swende 2015-01-18 20:21:53 +01:00
b689b842b6 Bugfix 'hf list 14b' and 'hf list raw' Martin Holst Swende 2015-01-16 22:48:30 +01:00
41fdd0f061 First stab at adding 'hf list 14b' and 'hf list raw' Martin Holst Swende 2015-01-16 22:41:19 +01:00
55c7e3520f Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-01-16 15:49:11 +01:00
49726b4088 Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks Martin Holst Swende 2015-01-15 23:00:39 +01:00
5c72368e2d Merge pull request #44 from marshmellow42/master Martin Holst Swende 2015-01-15 21:53:18 +01:00
f164662363 Merge branch 'master' of https://github.com/iceman1001/ForPm3 Martin Holst Swende 2015-01-15 21:50:03 +01:00
d60418a05f Synchronized loclass library, imported the legal warning Martin Holst Swende 2015-01-15 16:28:28 +01:00
758f1fd1f3 Fixed issue #43 on github Martin Holst Swende 2015-01-15 16:07:58 +01:00
6b038d192a Minor dox Martin Holst Swende 2015-01-15 15:45:54 +01:00
1eb874ee3f Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-01-15 15:45:15 +01:00
09b69422e2 This was resynthezised along with my hf-changes. Nothing changed though Martin Holst Swende 2015-01-15 15:29:03 +01:00
7b941c8d7f Fixed memory corruption after reader-attack in armsrc, fixed annoying LED Martin Holst Swende 2015-01-15 15:27:44 +01:00
645c960f61 Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages Martin Holst Swende 2015-01-15 15:16:34 +01:00
dc065b4e34 slight em410xdecode adjustments marshmellow42 2015-01-13 17:52:48 -05:00
84871873a4 Small lf bug fixes and threshold adjustments marshmellow42 2015-01-13 17:21:36 -05:00
a631936e84 ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC. ADD: des.c , aes.c in ARMSRC iceman1001 2015-01-13 23:18:04 +01:00
ae6ead3dc8 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-01-13 16:02:23 -05:00
4e3d8d0f76 Merge pull request #40 from holiman/master Martin Holst Swende 2015-01-13 19:40:41 +01:00
896473399b Actually add the FILES also, doh Martin Holst Swende 2015-01-12 22:16:46 +01:00
55eaed8f2a Documentation to apps.h, documentation/renaming to iclass Martin Holst Swende 2015-01-12 22:08:57 +01:00
1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead Martin Holst Swende 2015-01-12 21:47:36 +01:00
68033ed776 Fixed error when no match is found for uidmapping Martin Holst Swende 2015-01-11 21:49:13 +01:00
ac3ba7ee69 lf search use new psk, small demod adjustments marshmellow42 2015-01-09 16:46:17 -05:00
473124be92 removed double include Martin Holst Swende 2015-01-09 21:51:34 +01:00
f44a01235c Merge branch 'master' of https://github.com/iceman1001/ForPm3 Martin Holst Swende 2015-01-09 21:50:36 +01:00
952a8bb59b Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-08 22:23:45 +01:00
07c808038c Merge pull request #38 from marshmellow42/master Martin Holst Swende 2015-01-08 21:53:20 +01:00
31d1caa526 Reverted some minor things, altered other things to get it to compile cleanly Martin Holst Swende 2015-01-08 17:51:52 +01:00
03d7b60f2b ADD: default_toys.lua a script which identify tnp3xx tags iceman1001 2015-01-08 17:36:01 +01:00
c12512e99a minor code cleanup marshmellow42 2015-01-07 23:02:00 -05:00
d6d20c5435 cmddata.c changes by others - reapply marshmellow42 2015-01-07 19:06:29 -05:00
3179383f85 put cmdlf.c back (only changes spaces to tabs) marshmellow42 2015-01-07 18:45:47 -05:00
8e863ab641 FIX: forgot to add the function in the header file. iceman1001 2015-01-08 00:20:22 +01:00
c3bfb9c76b ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it. minor code clean up. iceman1001 2015-01-08 00:17:40 +01:00
bce5d24494 Merge branch 'master' of https://github.com/marshmellow42/proxmark3 marshmellow42 2015-01-07 18:15:14 -05:00
3aa4014baa Fix Tune Samples (broken in commit 12/31 by me) marshmellow42 2015-01-07 16:34:02 -05:00
ba1a299ce6 code cleanup. re-added psk commands. marshmellow42 2015-01-06 23:29:45 -05:00
c07b79fcbf sync with master lf files to resolve conflicts marshmellow42 2015-01-06 10:58:35 -05:00
4118b74dc8 added data psk* cmds for pskdemod marshmellow42 2015-01-06 09:20:36 -05:00
787b5bd8a4 CHG: minor code clean up in ArmSrc. ADD: added some more default keys in Hf mf nested, maybe it runs faster :) iceman1001 2015-01-08 00:08:33 +01:00
79bf1ad2cc ADD: Jonor's timeout patch for "Hf 14a raw". minor code clean up iceman1001 2015-01-07 23:23:17 +01:00
b5be31f996 FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. ADD: crc32.c functionality iceman1001 2015-01-07 22:56:20 +01:00
024b97c507 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-07 22:55:26 +01:00
809fb6aeab Fix Tune Samples (broken in commit 12/31 by me) marshmellow42 2015-01-07 16:34:02 -05:00
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short" CHG: minor code clean up. ADD: AES / CRC16 for lua. (and tnp3xx scripts.) ADD: tnp3dump.lua script to dump tnp3xx tags. ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live iceman1001 2015-01-07 22:00:29 +01:00
d91a31f935 CHG: minor code clean up. iceman1001 2015-01-07 21:29:38 +01:00
4df54240c1 Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541 Martin Holst Swende 2015-01-07 21:14:32 +01:00
52ab55ab0d ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. ADD: added a manufacturer list in "hf 14a reader", only viable when UID is double or triple size. Thanks to Asper for the list. ADD: detect chinese magic backdoor commands in "hf 14a reader" CHG: minor code clean up. iceman1001 2015-01-07 21:06:15 +01:00
79544b28ad CHG: minor code clean up ADD: added some helper-functions in util.c iceman1001 2015-01-07 20:52:03 +01:00
3af373f352 CHG: Added support for tnp3xx in lua scripts. ADD: a save file function in lua. iceman1001 2015-01-07 20:45:43 +01:00
23b598ee23 CHG: Minor code clean up. ADD: crc16.c - new crc16_ccitt calc. iceman1001 2015-01-07 20:40:22 +01:00
002c1ce57a CHG: removed leftover debugging statements proxmark3.c CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS. iceman1001 2015-01-07 11:10:46 +01:00
4888b28195 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-07 11:09:05 +01:00
cb29e00a12 Save iclass dumps to file, like mifare-dump functionality works Martin Holst Swende 2015-01-07 09:57:18 +01:00
a6293168da code cleanup. re-added psk commands. marshmellow42 2015-01-06 23:29:45 -05:00
9484ff3d6e ADD: tnp3xxx identification in luascripts. CHG: minor code clean up. iceman1001 2015-01-06 21:20:41 +01:00
bf8328e928 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-01-06 20:51:11 +01:00
9269081341 Merge pull request #4 from Proxmark/master marshmellow42 2015-01-06 14:28:59 -05:00
d2197f967a Changed io threshold to 140, fixed boolean error in comparison Martin Holst Swende 2015-01-06 18:59:59 +01:00
e47e52a2c8 Fixed thresholding of io fskdemod Martin Holst Swende 2015-01-06 18:43:37 +01:00
389d0360e1 Merge pull request #3 from Proxmark/master marshmellow42 2015-01-06 11:02:11 -05:00
1c4b102cd5 sync with master lf files to resolve conflicts marshmellow42 2015-01-06 10:58:35 -05:00
5644791bdb added data psk* cmds for pskdemod marshmellow42 2015-01-06 09:20:36 -05:00
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device CHG: suggested a fix for the underscore problem in ioclass\fileutils.c ADD: tnp3xx support ADD: nxp tag idents. ADD: identifiction of chinese backdoor commands to hf 14a reader. iceman1001 2015-01-05 15:51:27 +01:00
6f101995b6 Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests Martin Holst Swende 2015-01-05 09:16:06 +01:00
39d3ce5dd6 Moved iclass crc to be based on a lookup table Martin Holst Swende 2015-01-04 22:10:25 +01:00
337818f7ab Minor dox Martin Holst Swende 2015-01-04 21:26:10 +01:00
4c3de57ad2 Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands Martin Holst Swende 2015-01-04 21:22:54 +01:00
c8dd9b092e Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle Martin Holst Swende 2015-01-04 14:53:26 +01:00
2e9d4b3ff4 Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed Martin Holst Swende 2015-01-03 15:11:48 +01:00
d0d1e24590 Set lower threshold for lf iodemod, it had too high threshold for filtering out noise. Now it works better at least with my antenna/setup Martin Holst Swende 2015-01-03 14:36:38 +01:00
3400a4358d Fixed indentation Martin Holst Swende 2015-01-03 14:29:22 +01:00
854b9a233f Removed unused variable Martin Holst Swende 2015-01-03 14:29:07 +01:00
ae8e8a4372 Corrected indentation to tabs only Martin Holst Swende 2015-01-03 14:21:07 +01:00
6ca4c6463e Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops Martin Holst Swende 2015-01-03 14:16:05 +01:00
45dda9fcd7 Merge pull request #34 from marshmellow42/master Martin Holst Swende 2015-01-01 13:46:48 +01:00