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

• 818efbebb8
  USB comms: part 3 towards @micolous PR#463 pwpiwi 2018-04-28 10:09:16 +02:00
• 61aaee35cc
  USB comms: part 2 towards @micolous PR#463 (#595) pwpiwi 2018-04-24 08:27:29 +02:00
• e069547c27 Fix for swapped parity when using lf_bulk_program.lua (#591) Tom Harkness 2018-04-03 16:14:51 +10:00
• f5ecd97b15
  USB comm: prepare for @micolous change (PR#463) (#587) pwpiwi 2018-03-31 09:52:43 +02:00
• 3bcc4d77e1
  add: save and load options in hf list (#577) pwpiwi 2018-03-30 17:55:41 +02:00
• 53c7a7053d Fix empty key list bug in mfkeys.lua (#579) AnthraX1 2018-03-31 02:54:45 +11:00
• 3316fc1d11
  Merge pull request #589 from Proxmark/revert-588-indala-preamble-fix pwpiwi 2018-03-28 14:58:46 +02:00
• 7ecf7cf6cc
  Revert "Fix offset Indala UID display" marshmellow42 2018-03-28 08:50:08 -04:00
• 6c7a3bd7ce
  Merge pull request #588 from megabug/indala-preamble-fix Iceman 2018-03-28 13:10:33 +02:00
• b05611a30b Fix offset Indala UID display Matthew Daley 2018-03-28 23:37:07 +13:00
• b24930c764 mfu read block: retry block with bad CRC (#584) James Chambers 2018-03-23 15:26:30 -04:00
• a5a830168f OSX: Multiple libedit/readline fixes (#585) Michael Farrell 2018-03-22 02:05:03 +11:00
• 51d51c6782
  Merge pull request #580 from Proxmark/iceman1001-patch-1 W8M2Hg9lLmWqXSGC 2018-02-26 17:25:21 +11:00
• d4d439a8aa
  Update README.md Iceman 2018-02-26 07:16:08 +01:00
• c50e55a4a5
  Merge pull request #578 from Tom5ive/master Iceman 2018-02-22 14:08:33 +01:00
• f43b1038a2 fix for swapped parity bits Tom Harkness 2018-02-22 23:38:53 +11:00
• b8196bf8ee
  Merge pull request #565 from Proxcloud/usb_android Iceman 2018-02-17 12:39:19 +01:00
• d6e5b54f40
  Merge pull request #572 from merlokk/hflistms_fix Iceman 2018-02-14 23:36:41 +01:00
• 738ed6e476 small fix merlokk 2018-02-15 00:20:00 +02:00
• 6dec58aa44 small fix hf list mf merlokk 2018-02-15 00:18:02 +02:00
• 902c470d38
  Merge pull request #571 from merlokk/hf_list_mf Iceman 2018-02-14 22:06:29 +01:00
• f69f1de80c
  Merge pull request #570 from marshmellow42/master Iceman 2018-02-14 22:06:00 +01:00
• 2896e490d9 update changelog marshmellow42 2018-02-14 15:41:39 -05:00
• 079563a092 small fix and added line to changelog. merlokk 2018-02-14 12:36:22 +02:00
• 868deeb783 move annotate* functions merlokk 2018-02-13 17:14:51 +02:00
• 45b4ac09c9 added hardnested sketch. final cleaning. merlokk 2018-02-13 17:07:49 +02:00
• 0113dcf3fd nested works merlokk 2018-02-13 15:12:41 +02:00
• 8253ca0e1b code cleaning merlokk 2018-02-13 12:35:33 +02:00
• 597fca4ff1 check parity works merlokk 2018-02-13 12:33:15 +02:00
• 2d7bdee30b added parity check of deciphered command merlokk 2018-02-12 18:53:12 +02:00
• bf52d74adc small fix Oleg Moiseenko 2018-02-11 00:45:12 +02:00
• 856da9a1c0 added cipherstream recovery Oleg Moiseenko 2018-02-11 00:44:24 +02:00
• e01bc7942c move ks to authdata Oleg Moiseenko 2018-02-11 00:40:24 +02:00
• 779d9a0e90 reconfigure lf cmdread ... marshmellow42 2018-02-10 17:30:32 -05:00
• 7bea15816e added some cone in nested. not tested. Oleg Moiseenko 2018-02-11 00:28:23 +02:00
• e0158d3373 added destroy Oleg Moiseenko 2018-02-10 23:28:15 +02:00
• dca8220f72 mock of key checking Oleg Moiseenko 2018-02-10 23:25:28 +02:00
• c6a886fb4f added mock of key check Oleg Moiseenko 2018-02-10 23:06:01 +02:00
• 747885a6ed hf list mf 1st auth works Oleg Moiseenko 2018-02-10 22:33:32 +02:00
• edd4c8385b small fix util.c Oleg Moiseenko 2018-02-10 22:10:38 +02:00
• 28ee794f59 fix appearance Oleg Moiseenko 2018-02-10 20:41:56 +02:00
• 7b215d149a correct 1st key calculation Oleg Moiseenko 2018-02-10 20:28:30 +02:00
• b957bcd382 added get parity Oleg Moiseenko 2018-02-10 19:19:56 +02:00
• a31f7f899b small fix Oleg Moiseenko 2018-02-10 19:06:34 +02:00
• aadc6bf1e1 combine all auth data to single struct and fill it Oleg Moiseenko 2018-02-10 19:03:29 +02:00
• 61e96805ad add bitbang option to lf cmdread marshmellow42 2018-02-09 15:49:55 -05:00
• fb30f5a101 added check reader/tag merlokk 2018-02-09 19:40:39 +02:00
• 6c30a244eb added some get auth data merlokk 2018-02-09 19:32:17 +02:00
• 6612a5a201 moved some functions and added auth sequence annotation merlokk 2018-02-09 18:23:04 +02:00
• 4f131b53ea added cmdhflist file merlokk 2018-02-09 17:37:31 +02:00
• a37725facf add nested auth decoding to hf mf sniff Oleg Moiseenko 2018-02-09 16:50:55 +02:00
• 9e40bad2e3
  Merge pull request #569 from pwpiwi/fix_WDT_crash Iceman 2018-02-08 19:02:16 +01:00
• f3dc6d59f4 make product string even length Proxcloud 2018-02-08 22:32:08 +08:00
• 664e132f88 hf mf mifare: * prevent WDT crash on repeated tries * comes with faster execution as side effect * use uint8_t instead of byte_t * populate ar instead of (correctly) assuming that it is zero * remove the "will take a few seconds longer" message because it is no longer true pwpiwi 2018-02-08 14:50:03 +01:00
• d03a573eee change product desc to 9 and add extra null byte Proxcloud 2018-02-08 20:40:57 +08:00
• 13c25f892e remove debug change Proxcloud 2018-02-08 19:43:03 +08:00
• c179e7b1f8 remove old Manufacturer description code. fix Product description length Proxcloud 2018-02-08 19:37:55 +08:00
• 8b9de94afe Remove BOS descriptor, leave just manufacturer descriptor for Android Proxcloud 2018-02-08 17:47:40 +08:00
• 02515642bc fix: hf mf mifare - populate keylist (#568) Iceman 2018-02-08 04:15:42 +01:00
• 948b49c407 Add BOS USB descriptor. This allows non-root access on Android devices Proxcloud 2018-02-07 01:07:48 +08:00
• 2ef3a5e99c
  Merge pull request #560 from pwpiwi/fix_hfmfmif Iceman 2018-02-06 08:15:03 +01:00
• d86ee73da5 fix: prevent hf mf mifare from always running twice (issue #510) pwpiwi 2018-02-03 18:24:32 +01:00
• c839fa2c25
  Merge pull request #558 from pwpiwi/fix_alignment Iceman 2018-02-01 09:49:43 +01:00
• 32e6891a05 hf mf nested: use bitwise or instead. (#556) Arnie97 2018-02-01 15:09:14 +08:00
• f921c113c9 add force_align_arg_pointer attribute to all callback functions * inspired by issue #404 and respective fix PR #538 * possible fix for mysterious crashes, e.g. issue #497 and http://www.proxmark.org/forum/viewtopic.php?id=5388 pwpiwi 2018-01-31 18:31:51 +01:00
• 298e1a2d0d
  update license conditions in armsrc/optimized_cipher.[ch] (#554) pwpiwi 2018-01-31 08:14:56 +01:00
• 365627e2f1
  Merge pull request #555 from Arnie97/master Iceman 2018-01-26 19:31:23 +01:00
• 7b7416bd3b hf mf nested: transfer keys to the correct block in one sector mode. Arnie97 2018-01-27 01:55:38 +08:00
• 36545f0a56 hf mf eset: reuse mfEmlSetMem(). Arnie97 2018-01-27 01:09:56 +08:00
• 380e0d086c
  Merge pull request #553 from Arnie97/master Iceman 2018-01-25 09:50:47 +01:00
• b5cf8b07e2 mfkeys.lua: Remove trailing whitespaces. Arnie97 2018-01-25 14:48:26 +08:00
• f88fa399bc mfkeys.lua: Align empty cells in the table. Arnie97 2018-01-25 14:48:12 +08:00
• 392301aaab mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua) Arnie97 2018-01-25 14:10:41 +08:00
• 4e002980af hf mf ecfill: Add the missing line break. Arnie97 2018-01-25 13:49:40 +08:00
• e98389b355 Fix typo in lua scripts: 1443a -> 14443a. Arnie97 2018-01-25 13:43:01 +08:00
• fb69dd881a
  Merge pull request #551 from pwpiwi/remove_reveng Iceman 2018-01-24 10:47:59 +01:00
• 757221f5d6 Remove reveng (its license was not compatible with PM3 license, see issue #527) pwpiwi 2018-01-08 07:48:13 +01:00
• 940b282f54
  Merge pull request #550 from pwpiwi/fix_warnings Iceman 2018-01-23 17:43:07 +01:00
• ec0872181b fix clang compiler warnings identified in http://www.proxmark.org/forum/viewtopic.php?id=5388 pwpiwi 2018-01-23 08:27:58 +01:00
• acaa71ffe3
  Merge pull request #549 from rkblackfire/master Iceman 2018-01-22 19:33:41 +01:00
• f3ffd5a24f Revert "dbg: Watchdog resets while 'hw tune lf'" rkblackfire 2018-01-22 19:25:22 +01:00
• 095173f72d chg: print only valid tuning data rkblackfire 2018-01-22 18:59:48 +01:00
• fc175230f4 dbg: Watchdog resets while 'hw tune lf' rkblackfire 2018-01-22 18:54:29 +01:00
• 30bb6d6591
  Merge pull request #548 from merlokk/mfsniff_fix Iceman 2018-01-17 23:16:08 +01:00
• 2ba37081ec added nested authentication "not implemented" warning merlokk 2018-01-17 18:16:37 +02:00
• af1940a5d8
  Merge pull request #546 from pwpiwi/fix_tune Iceman 2018-01-17 16:11:56 +01:00
• a034948363 fix eml file format merlokk 2018-01-17 16:12:50 +02:00
• f7887fa82e added magic cards merlokk 2018-01-17 16:01:56 +02:00
• 3e77c7a7b4 ignore SELECT ALL merlokk 2018-01-17 15:57:24 +02:00
• 543a6ed3c9 SNF_WUPREQ and SNF_SAK harmonized) merlokk 2018-01-17 15:48:01 +02:00
• 968cb35498 deleted save UID from card merlokk 2018-01-17 14:14:36 +02:00
• 35cc71b075 delete opposite states fix merlokk 2018-01-17 14:10:26 +02:00
• 3544b99715 fixed #541 merlokk 2018-01-16 17:54:54 +02:00
• feb328c90a hf mf sniff small fix merlokk 2018-01-16 14:34:04 +02:00
• 138a0e7a6b
  Merge pull request #503 from merlokk/travis Iceman 2018-01-15 16:06:37 +01:00
• d1f9ec06ae
  Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547) pwpiwi 2018-01-15 15:29:14 +01:00
• 8ec06f5ef3 hf mf sniff: small fixes Oleg Moiseenko 2018-01-12 23:37:55 +02:00
• 078e2bd238 fix: SIMD instruction set detection on non-x86 hardware Oleg Moiseenko 2018-01-12 23:04:16 +02:00
• d040cb9024 hw tune: * scale results to allow higher LF voltages * remove historic comments pwpiwi 2018-01-12 21:48:42 +01:00
• 9b32625c2c hw tune minor fix, comments updated pwpiwi 2018-01-11 08:32:01 +01:00