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

• 2bb7f7e327 Fixes a double-free issue in CloseProxmark: (#617) Michael Farrell 2018-06-04 21:54:41 +10:00
• 8fb06c8bc5 Fixes a double-free issue in CloseProxmark: Michael Farrell 2018-06-04 20:25:08 +10:00
• ad939de501
  USB comms: part 4 towards @micolous PR #463 pwpiwi 2018-06-03 14:25:20 +02:00
• 37042429b9 Code cleanup * coverity fixes (including a real bug in cmdhftopaz.c) * Typo fix * replace TRUE/FALSE by stdbool true/false pwpiwi 2018-05-28 08:08:27 +02:00
• 0f7e784ae7
  Merge 11901a91188123191cb9ccb94e38be9980f33618 into 9b4661c53baa99a649b26bd123b6f5d71e7bd812 Michael Farrell 2018-05-29 21:38:06 +00:00
• 9b4661c53b Delete .DS_Store (#613) Fl0-0 2018-05-29 18:05:32 +02:00
• 6a0bcd1a4c
  Delete .DS_Store Fl0-0 2018-05-29 17:54:06 +02:00
• 3fa4f9a1ea comms.c: set sp and serial_port_name to NULL when offline pwpiwi 2018-05-28 21:51:11 +02:00
• 803674b2d6 Added mifarePlus.lua script for communication with Mifare Plus. (#593) Dominic Celiano 2018-05-28 20:32:48 +01:00
• 69c5bba78c Got rid of small typo. Dom 2018-05-28 19:55:47 +01:00
• a9c466796e Added example usage for mifarePlus.lua script. Dom 2018-05-28 19:52:03 +01:00
• 11901a9118 FIX: Mark uart parameters as pointers, and initialise to NULL. Michael Farrell 2018-05-24 20:47:28 +10:00
• 823eadfa5b USB comms refactoring * make storeCommand() and getCommand() static in comms.c * don't assume a port to be defined by a name. Change parameter in OpenProxmark() to void* pwpiwi 2018-05-22 07:58:19 +02:00
• 035dabee46
  Merge eb3bf60ecfc50d2e02b5873755b32061a719e96b into e8924be8bac6e8ddc91d1950368ef51c454a6e55 dieuxfr2003 2018-05-19 15:37:05 +00:00
• eb3bf60ecf Merge remote-tracking branch 'refs/remotes/Proxmark/master' dieuxfr2003 2018-05-19 17:32:42 +02:00
• 9c76e578d9 Update from original Tom Harkness 2018-05-18 15:00:00 +10:00
• e8924be8ba fix gui (plot) bugs (#604) marshmellow42 2018-05-15 02:19:49 -04:00
• dc9f900d2c USB comms: part 4 towards @micolous PR #463 * make uart_communication() static in comms.c * move receiver thread creation and respective mutexes to comms.c * add mutex and signal for tx buffer * use comms.c for flasher as well * remove comm functions from client/proxmark3.h * this completes isolating all USB communication related functions in comms.c pwpiwi 2018-05-03 18:31:47 +02:00
• a73d6e9b39 Added error handling for no-card case and when proximity check is not supported. Dom 2018-05-11 10:36:50 +01:00
• 6fd30efcff Merge branch 'master' into mifareplus-only Dom 2018-05-11 10:16:44 +01:00
• 0000a4cda2
  fix HitagS simulation erors (issue #605) (#606) pwpiwi 2018-05-11 05:24:02 +02:00
• 797cd0d6c2 fix HitagS simulation erors (issue #605) pwpiwi 2018-05-10 12:00:26 +02:00
• 5b953895f4 fix gui (plot) bugs marshmellow42 2018-05-10 01:44:30 -04:00
• babca445ff
  rework of GetFromBigBuf() (#597) pwpiwi 2018-05-08 07:54:49 +02:00
• 03cdcca03f
  Merge pull request #600 from marshmellow42/master Iceman 2018-05-05 06:59:39 +02:00
• a468b4277a more graceful exit to lf search if no signal found marshmellow42 2018-05-04 23:54:01 -04:00
• e475fce44d
  Update CHANGELOG.md pwpiwi 2018-05-04 08:25:08 +02:00
• dbac9ffb40
  Change driver file proxmark3.inf to support both old and new Vendor/Product IDs pwpiwi 2018-05-04 08:19:37 +02:00
• 56607fd632 Merge branch 'master' of https://github.com/Proxmark/proxmark3 Tom Harkness 2018-05-04 11:36:04 +10:00
• 854fdf15e0 fix bug if -DWITH_ISO14443a_StandAlone is removed from makefile (#598) marshmellow42 2018-05-03 13:36:51 -04:00
• b67801621f fix bug if -DWITH_ISO14443a_StandAlone is removed from makefile marshmellow42 2018-05-03 12:36:11 -04:00
• be303b4c74 USB comms: part 3 towards @micolous PR#463 pwpiwi 2018-04-28 10:09:16 +02:00
• cbce5db9aa USB comms: part 2 towards @micolous PR#463 (#595) pwpiwi 2018-04-24 08:27:29 +02:00
• 2e05b45199 rework of GetFromBigBuf() * this should fix crashes reported in issue #497 * don't allow receiver thread to write directly into arbitrary main thread's memory * instead use cmdBuffer[] for CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K as well * add timeout and warning options to GetFromBigBuf(), same as in WaitForResponseTimeoutW() * move GetFromBigBuf() from data.c to comms.c * remove data.c and data.h pwpiwi 2018-04-28 10:03:25 +02:00
• 818efbebb8
  USB comms: part 3 towards @micolous PR#463 pwpiwi 2018-04-28 10:09:16 +02:00
• fdc783e440 USB comms: part 3 towards @micolous PR#463 * change variable 'sp' from global to static * move code to open and close USB port to comms.c (OpenProxmark() and CloseProxmark()) * change scope of USBCommandReceived() to static * (flasher still unchanged) pwpiwi 2018-04-25 07:32:18 +02:00
• 61aaee35cc
  USB comms: part 2 towards @micolous PR#463 (#595) pwpiwi 2018-04-24 08:27:29 +02:00
• 118aab0925 USB comms: part 2 towards @micolous PR#463 * change variable 'offline' from global to static * change variable 'FlushAfterWrite' from global to static * remove unused global variable 'current_command' * WaitForResponseTimeoutW(CMD_UNKNOWN, ...) waits for any command * #include "printf.h" or <stdio.h> in iso15693tools.c to define sprintf() * and some minor changes/comments pwpiwi 2018-04-18 09:34:56 +02:00
• a5bdc2d1d1 Got rid of code to explicitly set all of card's memory to 0. Dom 2018-04-09 20:37:42 +01:00
• b47b50dc8a Updated number of sectors for 2k cards. Dom 2018-04-09 15:15:50 +01:00
• ff9ab74fb1 Added mifarePlus.lua script for communication with Mifare Plus. Dom 2018-04-06 10:17:00 +01:00
• 78ec3b26a5
  Merge 5093fb9e07070590e4f2b399c58a1fc8702e584d into e069547c27276069fd8d1cf93a281b819127bec4 Dominic Celiano 2018-04-06 08:35:46 +00:00
• 5093fb9e07 Added error checking for RATS and PPS check. Dom 2018-04-06 09:34:47 +01:00
• 7e5923d0be Added ability to write to 2kB and 4kB of blocks in SL0. Dom 2018-04-06 09:15:39 +01:00
• bda0d7e04b Created parameter in CommitPerso() function. Dom 2018-04-06 09:00:43 +01:00
• d1b56172c6 Added ability to send Proximity Check in multiple chunks. Dom 2018-04-06 08:55:14 +01:00
• 1b1d843ab3 Changed another 4 bytes comment to 1 byte. Dom 2018-04-05 19:48:26 +01:00
• c18e098cd3 Got rid of unused variables (build works) and changed comment. Dom 2018-04-05 19:13:06 +01:00
• 8255d0c837 Got rid of distance-bounding code in armsrc/iso14443a.c, updated RHR to be 1 byte. Dom 2018-04-05 15:14:50 +01:00
• 70df25e7cb Got rid of client/scripting.c debug code. Dom 2018-04-05 15:00:08 +01:00
• 08f436d26a Got rid of common Makefile changes. Dom 2018-04-05 14:54:38 +01:00
• 6fc8dcf2d1 Got rid of client Makefile changes. Dom 2018-04-05 14:50:34 +01:00
• 6fa4f9f87b Added back in the loclass dump file and updated .gitignore to include it. Dom 2018-04-05 14:45:57 +01:00
• fd11c262c7 Got rid of duplicated code lines. Dom 2018-04-05 10:17:03 +01:00
• 57f9bd734e Got rid of .DS_Store and other untracked binary files Dom 2018-04-05 10:08:35 +01:00
• 675705ffcd minor changes. Changed minor errors to warnings in compiler. Dom 2018-04-05 09:22:54 +01:00
• 2cbf09c3d1 Temporarily commented out distance bounding code. About to add in CMAC calculations to C Code. Dom 2018-04-02 10:46:05 +01:00
• 2020b129ca Changed name of Lua script. Dom 2018-03-30 17:36:22 +01:00
• d4a97eb4c7 Timing analysis now starts when first bit is received. Dom 2018-03-30 14:29:15 +01:00
• 7a5acc71ac Added timing analysis based on how long it takes to receive all bytes. Dom 2018-03-30 09:28:39 +01:00
• 5bbb503192 Added more MAC check functionality. TODO: implement CMAC-AES. Dom 2018-03-20 19:37:21 +00:00
• f882a16aed Added MAC calculations with dummy filler as input. Dom 2018-03-20 16:46:55 +00:00
• 7fe4589d21 Added keys for writePerso(). Dom 2018-03-20 08:51:14 +00:00
• a508482ae7 Beginning tests with VerifyPC and authenticating to change keys. Dom 2018-03-13 18:49:09 +00:00
• 46473030c1 small changes Dom 2018-02-28 13:41:32 +00:00
• be3e148937 Added ISO 14443-4 support (via PPS (Protocol and Parameter Selection)). Now card can be talked to in SL1. Dom 2018-02-28 12:44:30 +00:00
• a65c1e82ad Card has been moved to SL1. Next step is to add code for distance-bounding protocol. Dom 2018-02-28 11:30:45 +00:00
• 53ef1227c4 added WritePerso() method to personalize the keys and data on the card before moving security levels. Dom 2018-02-28 11:20:36 +00:00
• 8987480b61 cleaned up code to cleanly send commands to the Proxmark. Dom 2018-02-27 22:47:34 +00:00
• 7b2e196dcb Got rid of unnecessary code which was being used for debugging. Dom 2018-02-27 20:13:57 +00:00
• d4c01572c7 successfully receiving raw packet responses being sent from the Proxmark to the Lua code. Dom 2018-02-27 17:39:56 +00:00
• e069547c27 Fix for swapped parity when using lf_bulk_program.lua (#591) Tom Harkness 2018-04-03 16:14:51 +10:00
• fdde89cf9e
  Update lf_bulk_program.lua pwpiwi 2018-04-03 08:13:31 +02:00
• 24fe17e9e9 Fix for bulk HID card programming and parity issues Thomas J L. Harkness 2018-04-03 15:44:39 +10:00
• 3323633a27
  Merge 83b63bea29f982d0b99d8d2c89e7cff466d24492 into f5ecd97b15797e14e691bb6f3562ec1685c96bca Tom Harkness 2018-04-03 02:59:07 +00:00
• 83b63bea29 more fixes for parity bits Thomas J L. Harkness 2018-04-03 12:56:37 +10:00
• f5ecd97b15
  USB comm: prepare for @micolous change (PR#463) (#587) pwpiwi 2018-03-31 09:52:43 +02:00
• 7dd9d39fb8
  Merge e2aa5eb47c7f6adaf4bfa6d5de031c3c594763bf into 3bcc4d77e1ea1d383e3dd15935efda2f36af4881 Michael Farrell 2018-03-31 00:09:04 +00: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
• 56463d061e
  Minor fix to the fix pwpiwi 2018-03-28 08:36:23 +02:00
• c2e0297451 chg: hf list load/save: remove explicit filesize record from trace files pwpiwi 2018-03-23 20:11:15 +01:00
• fc583fb52f USB comm: prepare for @micolous change (PR#463) * move communication related code from proxmark3.c and cmdmain.c to new file comms.c * replace byte_t by uint8_t in uart_posix.c and uart_win32.c * move OpenProxmark() and CloseProxmark() from flasher.c to flash.c * move print_lock mutex including initializer to ui.c * minor changes in printing help texts * no changes in comms functionality yet pwpiwi 2018-03-25 14:56:06 +02:00
• 949bfc8738
  Merge 6e0b2d0beb22c188d05a0c4de04eae782a7a5165 into b24930c764849e16048936d62ff426a05083d2b1 uzlonewolf 2018-03-23 19:27:03 +00: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
• e2aa5eb47c Cleanups: Michael Farrell 2018-03-21 22:24:11 +11:00
• 638a4fe8c5 remove unused variable and target Michael Farrell 2018-03-21 21:52:55 +11:00
• dcc430b575 Add in new version of "waiting for response" string that was reverted in merge Michael Farrell 2018-02-21 20:30:59 +11:00
• 8204c2959b Fix some merge errors: Michael Farrell 2018-02-17 09:34:26 +11:00
• b456793c3a When timeout is more than 2sec, don't stop at 2sec Michael Farrell 2017-12-03 16:36:40 +11:00
• 006bedd3f1 Change while to if on txcmd_pending (per @pwpiwi comment); add note on race condition ugliness. Michael Farrell 2017-11-22 22:07:23 +11:00
• 582cceff01 Speed up flashing to previous levels by executing on main thread Michael Farrell 2017-11-04 23:53:03 +11:00
• b91cde087d Revert "Revert "Comms refactor (prerequisite of libproxmark work) (#371)"" Michael Farrell 2017-11-04 22:21:39 +11:00
• 14cfe2ac17 Remove rl_initialise per @iceman1001 comment in #497 Michael Farrell 2018-03-21 22:29:25 +11:00
• 4b3ede7028 [mod] hf list: allow traces bigger than 64K to be saved and loaded pwpiwi 2018-03-19 21:14:10 +01:00