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

Mono Color

• 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
• 3de045905f ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it. minor code clean up. iceman1001 2015-01-08 00:16:33 +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
• 1d660bb993 Added Pm3-master changes from Holiman. REM: removed some old test code to cmdhf15 read. iceman1001 2015-01-07 23:52: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
• 14edfd09c3 CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. iceman1001 2015-01-07 22:51:34 +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
• c0e6c18bf5 FIX: more minor issues with block Numbers. iceman1001 2015-01-07 19:01:00 +01:00
• 5f2cb31bca CHG: spelling errors, added help texts in cmdhfmfu.c CHG: refactored the "hf mfu rdbl/wrbl/crdbl/wrbl" commands. CHG: added a cauth test to "hf mfu info" command to see if the tag is a Ultralight-C tag or not. iceman1001 2015-01-07 18:50:51 +01:00
• 225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2, REM: removed old comments in bootrom.c CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c iceman1001 2015-01-07 17:42:57 +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
• 99a714185e CHG: Refactored the HF MFU udump/ucdump commands into one method. iceman1001 2015-01-06 21:08:20 +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
• 225643168c Merge 1365b3a35fb1151c0cda22965959591317e2b80c into d2197f967aaf4e58ffd9df387c228bf5354c9e0c Iceman 2015-01-06 18:00:10 +00: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
• e3ab50cafb CHG: rename the HF MFU * commands. ADD: added a HF MFU INFO commmand, where you can see some tag info. Used to be in the readcard command. FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR. CHG: lowered a testing value for timeout in cmdhf14a.c iceman1001 2015-01-06 17:43:31 +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
• dd683ece72 FIX: a compilation error for a static method in CmdHF14A.h iceman1001 2015-01-06 15:36:33 +01:00
• 5644791bdb added data psk* cmds for pskdemod marshmellow42 2015-01-06 09:20:36 -05:00
• 1365b3a35f fixed: some minor bugs from the previous merge with master. It compiles clean now. iceman1001 2015-01-06 12:26:15 +01:00
• a3133321ea Merge remote-tracking branch 'upstream/master' into pm3sub iceman1001 2015-01-06 12:12:10 +01:00
• 8472e72aff ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. ADD: added a manufacturer list for hf 14a reader, only viable when UID is double or triple size. Thanks to Asper for the list. iceman1001 2015-01-06 11:20:48 +01:00
• 10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. ADD: added a manufacturer list for hf 14a reader, only viable when UID is double or triple size. Thanks to Asper for the list. ADD: Some changes from Holimans commits. CHG: some more code clean up. iceman1001 2015-01-06 11:17:02 +01:00
• 26c8035142 Minor code clean ups ADD: tnp3xx support in lua scripts FIX: hf 14a reader and identificate chinese backdoor, forgot to add the code. iceman1001 2015-01-05 19:50:00 +01:00
• 5db9756676 CHG: corrections for the detection of chinese backdoor commands in cmdhf14a.c iceman1001 2015-01-05 19:12:59 +01:00
• 052bbe08d0 TEST of creating branch simular to PM3master. iceman1001 2015-01-05 16:31:19 +01: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
• 0452ec6c90 FIX: downloaded a fresh clone from my fork, and took away the build-errors. iceman1001 2015-01-05 15:12:48 +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
• d3a22c7dfa ADD: Holimans new changes in master. iceman1001 2015-01-05 02:01:24 +01:00
• f0cf62cd73 FIX: fixed a little bug I introduced from last commit in fskdemod CHG: tab fixes in cmdlf.c and minor code clean up CHG: minor variable name change, printstatement in cmddata.c iceman1001 2015-01-04 23:43:07 +01:00
• 8d0a3e87d7 FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works. iceman1001 2015-01-04 22:49:54 +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
• b1329a0264 chg: updated the README.txt chg: updated the commands.lua so it is in sync with usb_cnd.c definitions. iceman1001 2015-01-02 00:09:59 +01:00
• 7c5f70dd9f Merge pull request #1 from bforbort/master Iceman 2015-01-01 23:02:23 +01:00
• 23b80a7334 Merge remote-tracking branch 'origin/DESFireAuth' Blaine Forbort 2015-01-01 10:41:14 -08:00
• 0a966150a0 Updated the README.txt CHG: added marshmellows last changes with rtrim, and minor fixes. DEL: code cleanup in usb_cdc.c iceman1001 2015-01-01 14:07:42 +01:00
• 45dda9fcd7 Merge pull request #34 from marshmellow42/master Martin Holst Swende 2015-01-01 13:46:48 +01:00
• 7eefddcc58 Revert "problems creating pull request with the new traces" marshmellow42 2014-12-31 15:24:37 -05:00
• e33b652c53 problems creating pull request with the new traces marshmellow42 2014-12-31 15:16:02 -05:00
• ac914e56db minor adjustment to askmandemod for lf search marshmellow42 2014-12-31 14:55:58 -05:00
• 9ec1416ad2 added data rtrim command marshmellow42 2014-12-31 14:43:49 -05:00
• c579a5871e CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded. iceman1001 2014-12-31 12:01:00 +01:00
• 6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch. ADD: Marshmellows fixes for the LF (demods) commands, (LF SEACH) ADD: Holimans changes with hash1_brute iceman1001 2014-12-31 11:35:43 +01:00
• f822a063b3 lf demod code cleanup - added fskraw arguments marshmellow42 2014-12-31 02:27:30 -05:00
• d5a72d2fee LF demod/cmd code cleanup + new lf search marshmellow42 2014-12-30 16:08:33 -05:00
• 6bfa18eab4 Merge pull request #1 from Proxmark/master marshmellow42 2014-12-29 16:14:23 -05:00
• 2df8c07907 minor setting adjustments/cleanup marshmellow42 2014-12-29 15:58:59 -05:00
• 66707a3b3c LF Demod bug fixes and add lf em em410xdemod marshmellow42 2014-12-29 15:32:53 -05:00
• 7db5f1ca25 slight adjustment to include marshmellow42 2014-12-28 21:29:33 -05:00
• eb191de615 LF Demod streamlining marshmellow42 2014-12-28 20:33:32 -05:00
• 9c7c222c03 FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO) iceman1001 2014-12-26 22:38:23 +01:00
• d52e4e8819 ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands. FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't. iceman1001 2014-12-26 21:32:58 +01:00
• 1b492a97af ADD: marshmellows new lf command and DetectClock. (works great!) FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35) FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set, this made desfire/magic cards not work. iceman1001 2014-12-26 20:02:59 +01:00
• 9e6dd4eb69 rename askrawdemod to askmandemod marshmellow42 2014-12-24 13:01:09 -05:00
• 0e74c023bd Created new detectclock function + EM decode addons marshmellow42 2014-12-24 11:48:41 -05:00
• cd48c19c31 minor askrawdemod adjustment if errors in demoding are found marshmellow42 2014-12-23 15:16:53 -05:00
• 2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd marshmellow42 2014-12-23 12:00:13 -05:00
• 4be9e7507b Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-23 11:44:41 +01:00
• a088364e9c Merge branch 'master' of https://github.com/pwpiwi/proxmark3 pwpiwi 2014-12-23 11:26:10 +01:00
• 52bfb95543 bugfixes in iso14443a.c and hf 14a reader - introduced with the big frame and parity support (commit 6a1f2d82): tag responses with len%8 == 0 were dropped - thanks iceman for testing and finding - after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix. pwpiwi 2014-12-23 11:11:52 +01:00
• 7705bf4e37 fixed a bug in iso14443a.c which had been introduced with the big frame and parity support (commit 6a1f2d82) - thanks iceman for finding and testing pwpiwi 2014-12-23 11:11:52 +01:00
• ea7d657f75 minor fix - got too comment happy removing test code marshmellow42 2014-12-22 22:50:13 -05:00
• e888ed8e62 added new data askrawdemod command marshmellow42 2014-12-22 17:46:28 -05:00
• 3bc3598e88 added the changes from PM3 master. added some code for the AWID26 iceman1001 2014-12-22 15:14:05 +01:00