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

• fefb7f5376 appveyor.yml. display return values (#451) Oleg Moiseenko 2017-10-27 17:58:24 +03:00
• fc1db079c9 forget to delete github upload release section) merlokk 2017-10-27 17:47:11 +03:00
• 3240a3a579 display return values from commands and compare them with value. as promised in #440 merlokk 2017-10-27 17:45:28 +03:00
• 3851172d81 Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450) pwpiwi 2017-10-27 09:56:46 +02:00
• 289d25ae15 Revert "Comms refactor (prerequisite of libproxmark work) (#371)" pwpiwi 2017-10-27 09:55:51 +02:00
• afdcb8c159 Comms refactor (prerequisite of libproxmark work) (#371) Michael Farrell 2017-10-27 06:54:27 +11:00
• e17660d5f7 code cleaning (#445) Oleg Moiseenko 2017-10-26 20:09:53 +03:00
• a7c49f890d fixed. resp is initialized merlokk 2017-10-26 19:41:16 +03:00
• 2baf9b24a1 small refactoring merlokk 2017-10-26 19:37:22 +03:00
• 5d7d0c3af9 small improvement in tests (test result in green or red) (#448) Oleg Moiseenko 2017-10-26 19:32:18 +03:00
• 5db25967c7 small improvement in tests (test result in green or red) merlokk 2017-10-26 18:44:32 +03:00
• 8abdfb8a72 small fixes in ReaderIso14443a() merlokk 2017-10-26 15:44:33 +03:00
• 88e61ce998 OSX: Add note for example serial port Michael Farrell 2017-10-22 12:19:22 +11:00
• 6ceb41ac1c Refactor the comms code only from PR#346, without comms_globals.h. Michael Farrell 2017-10-17 22:30:23 +11:00
• 8dd0118673 Merge pull request #440 from merlokk/c3 Iceman 2017-10-26 11:46:20 +02:00
• 3d2d6155a0 code cleaning merlokk 2017-10-26 12:31:41 +03:00
• bcad808e65 Merge 2676222c2e3403c481cae0b0e6cfbcd6a0f3fb37 into 8bdb6043b09a32998a2ea16e8aa14bdc815ca7ca Fl0-0 2017-10-25 05:56:14 +00:00
• 8bdb6043b0 identification fix for magic chinese cards (#444) Oleg Moiseenko 2017-10-25 08:56:03 +03:00
• dfe9737799 there is no need to switch field off with last changes in client. all works. merlokk 2017-10-24 19:35:47 +03:00
• 886df5f61b fixed some commands in client merlokk 2017-10-24 19:32:19 +03:00
• 34c3fa652f fixed #411 merlokk 2017-10-24 19:20:27 +03:00
• 5cc1ff44b4 Merge pull request #443 from doegox/flush Iceman 2017-10-24 14:28:16 +02:00
• 8a50d60617 Flush stdout when waiting for /dev/ttyACM0 Philippe Teuwen 2017-10-24 14:10:52 +02:00
• 2676222c2e Revert 'Don't do iso14443-4 select' for mfCIdentify() Fl0-0 2017-10-24 08:15:00 +02:00
• 0323384554 Merge remote-tracking branch 'upstream/master' Fl0-0 2017-10-24 08:05:11 +02:00
• 23af9327a5 fix hw status (and USB comm in general) (#434) pwpiwi 2017-10-24 07:48:38 +02:00
• a6d4e93cb5 Merge pull request #438 from pwpiwi/fpga_14b Iceman 2017-10-23 15:05:07 +02:00
• b5381d70dc added write-host for tests merlokk 2017-10-23 13:43:46 +03:00
• 05b6b11785 Multiple USB-CDC changes (attempt 6) (#439) Michael Farrell 2017-10-23 18:04:06 +11:00
• 14589d36e4 Multiple USB-CDC changes (attempt 6) Michael Farrell 2017-10-23 17:03:29 +11:00
• 9764d3ea0e normally show powershell scripts it needs to have no spaces at the end of lines and no ; merlokk 2017-10-22 22:20:44 +03:00
• da36bed90d added testing timeout 40 sec to avoid hang VM merlokk 2017-10-22 21:47:19 +03:00
• d372569b45 FPGA changes ISO14443B: * slightly increase reader field strength * increase sensitivity when reading, allowing increased reading distance pwpiwi 2017-09-07 09:33:32 +02:00
• bb04ef216d small fix: make iso14a_set_timeout() external pwpiwi 2017-10-20 20:20:07 +02:00
• ef9746cb2f added CI appveyor.com (#436) Oleg Moiseenko 2017-10-20 20:11:02 +03:00
• 6e49717b5e fix hf mf sim (issue #412) (#419) pwpiwi 2017-10-20 17:55:13 +02:00
• ed6f29f317 Merge pull request #435 from ytisf/master Iceman 2017-10-20 17:54:36 +02:00
• 1df4df6d8a Fixing liblua issues tisf 2017-10-20 21:55:13 +07:00
• 46554065e2 added CI appveyor.com merlokk 2017-10-20 16:52:01 +03:00
• b6719718b4 fix hw status (and USB comm in general) * don't ignore ReadLine() errors (Windows) * lock CmdBuffer with Mutex * refactor WaitForResponseTimeoutW pwpiwi 2017-10-20 14:11:11 +02:00
• 584a9a56a6 fix hf mf sim * timing: decrease time to get ready for new reader commands pwpiwi 2017-10-20 06:47:36 +02:00
• aa757f71d9 proxmark3 refactoring command line parameters (#417) Oleg Moiseenko 2017-10-20 07:49:53 +03:00
• 0aefe2674e Merge 11ba38764d19f1f5eb5a35571eb3bf4c8f4cb57e into 36b1cdd1b4064e1a506b5bab0d00e61b91cb10b2 Oleg Moiseenko 2017-10-19 11:13:39 +00:00
• 11ba38764d fix compiler warning for windows merlokk 2017-10-19 14:11:51 +03:00
• 36b1cdd1b4 fix fpga_comress sending no-error messages to stderr (#430) Oleg Moiseenko 2017-10-19 13:23:09 +03:00
• 1c9ec87a0a fix fpga_comress sending no-error messages to stderr merlokk 2017-10-19 13:18:20 +03:00
• 3f10c215a1 Merge branch 'master' into cmds Oleg Moiseenko 2017-10-19 12:24:28 +03:00
• 2cd986160f fix) merlokk 2017-10-19 12:15:59 +03:00
• 98db73d966 added changelog merlokk 2017-10-19 12:15:28 +03:00
• 544f3fae91 Merge pull request #427 from pwpiwi/usb_mods Iceman 2017-10-18 22:08:07 +02:00
• 0c86cb0127 Check keys in hf mf nested (issue #426) Oleg Moiseenko 2017-10-18 22:44:59 +03:00
• 715fdbffcd small fix merlokk 2017-10-18 15:40:43 +03:00
• 4af40c00d4 main_loop() string create refactoring merlokk 2017-10-18 15:21:30 +03:00
• 63e950c5ea proxmark main_loop() replace char refactoring merlokk 2017-10-18 14:41:55 +03:00
• 54c24c1dc5 pipe works. printf "hf 14a reader\nhf mf rdbl 0 a ffffffffffff\n" | proxmark3 com6 -w merlokk 2017-10-18 14:30:20 +03:00
• c8662b509c fixed merlokk 2017-10-17 22:07:54 +03:00
• f194e4290c Device side USB implementation: * add some comments and #defines in usb_cdc.c * use full FIFO size of 64 Bytes for device -> host transfers pwpiwi 2017-10-17 19:25:40 +02:00
• 4e205656e4 hf mf nested added doc to <s> and <ss> merlokk 2017-10-17 17:43:28 +03:00
• abf9bff25f Merge a627d94afb954396793846ab12e9f3eaad241b2d into 9d0a333449d52dc0d9cfca217cf9f0cc0f792744 Oleg Moiseenko 2017-10-17 14:37:19 +00:00
• a627d94afb hf mf nested added doc to <s> and <ss> merlokk 2017-10-17 17:28:23 +03:00
• 13c7bef91c Merge c42efbe129ceddc39570c612612807ddc51b3a9d into 9d0a333449d52dc0d9cfca217cf9f0cc0f792744 Oleg Moiseenko 2017-10-17 14:30:46 +00:00
• c42efbe129 hf mf nested asses doc to <s> and <ss> merlokk 2017-10-17 17:28:23 +03:00
• bbc10bce7d hf mf nested added 14a timeout for check keys merlokk 2017-10-17 17:19:48 +03:00
• be8315e971 Merge e3fdbbc90b2acdf4f308142e1536a5fda2681624 into 9d0a333449d52dc0d9cfca217cf9f0cc0f792744 Michael Farrell 2017-10-17 13:19:24 +00:00
• e3fdbbc90b wip rebasing libmk2 Michael Farrell 2017-10-18 00:14:25 +11:00
• b4a56dd774 fixup QT GUI Michael Farrell 2017-07-08 22:53:28 +10:00
• b217320a26 Refactoring out the global state in the client Michael Farrell 2017-07-08 22:08:20 +10:00
• 87d0ba5dbc Refactor the comms code only from PR#346, without comms_globals.h Michael Farrell 2017-10-17 22:30:23 +11:00
• 9d0a333449 wrong define used (#421) Iceman 2017-10-16 18:16:39 +02:00
• b2d4ae9714 wrong define used Iceman 2017-10-16 16:57:15 +02:00
• a008a74541 Merge pull request #420 from merlokk/b_fix Iceman 2017-10-16 10:36:49 +02:00
• 73d7bf75c8 small fix #416 merlokk 2017-10-16 11:33:17 +03:00
• 275d9e61c2 Check keys in hf mf nested and hf mf chk (#414) Oleg Moiseenko 2017-10-15 22:19:34 +03:00
• 00d7a2f115 fix error: (near initialization for 'keyIndex[0]') merlokk 2017-10-15 21:37:43 +03:00
• cae696d36b dont execute commands - deleted merlokk 2017-10-15 21:13:04 +03:00
• 292e03556a fix hf mf sim * move to separate files mifaresim.[ch] * check CRC of commands * don't execute commands without successfull authentication * ensure correct timing of REQA, WUPA, ANTICOL and SELECT responses * remove iso14443-4 remnants * trace raw reader commands instead of decrypted ones * some refactoring pwpiwi 2017-10-10 07:15:29 +02:00
• c30f7bf438 small fix in executing command files merlokk 2017-10-13 19:38:12 +03:00
• d9bcabb93b small memory management bugfix merlokk 2017-10-13 19:31:03 +03:00
• a405360f7b added execute lua script and rework help merlokk 2017-10-13 19:09:19 +03:00
• d460538b85 small fix) merlokk 2017-10-13 18:38:00 +03:00
• d527d52411 big bugfix. 1. sometimes proxmark executes command twice... 2. start proxmark from QT was in a strange way( if we issue command very fast - it hangs merlokk 2017-10-13 18:31:07 +03:00
• 850f41650d check spme errors + small refactoring merlokk 2017-10-13 15:21:55 +03:00
• c6afaeb174 execute command ok. merlokk 2017-10-13 14:44:20 +03:00
• beb047e2a5 send script_cmd via all the loop of code. merlokk 2017-10-13 14:31:01 +03:00
• 66b853c084 small fix in help and start work for exec commands merlokk 2017-10-13 14:15:37 +03:00
• 1abc4144ee small refactoring merlokk 2017-10-13 13:13:13 +03:00
• 0ab6c7b9be proxmark3 refactoring command line parameters merlokk 2017-10-13 13:02:43 +03:00
• a65c523334 added some comments. merlokk 2017-10-12 15:33:57 +03:00
• f54035c4f5 added line to changelog merlokk 2017-10-12 15:08:52 +03:00
• 5a5292ef13 hf mf chk works with timeout merlokk 2017-10-12 15:05:57 +03:00
• 4dc1570c74 hf mf chk. timeouts works. merlokk 2017-10-12 14:28:38 +03:00
• b2a820eb0b hf mf chk. add timeout (arm side) and some tweaks. merlokk 2017-10-12 13:43:14 +03:00
• 448abaec60 small fix hf list f merlokk 2017-10-11 20:00:53 +03:00
• ca23a05400 added some default keys and small speed optimization merlokk 2017-10-11 19:49:03 +03:00
• a570420784 fix readme merlokk 2017-10-11 19:04:38 +03:00
• 2f43e94099 avoid 2s warning in hf mf chk merlokk 2017-10-11 18:49:32 +03:00
• c57a9d2d70 hf mf nested. added key check after we have found a key. merlokk 2017-10-11 18:20:30 +03:00
• c24188dd17 hf mf nested. change key search procedure merlokk 2017-10-11 18:02:38 +03:00
• 8388f5441d hf mf chk works. merlokk 2017-10-11 17:53:29 +03:00
• c0de54da0f hf mf chk multisector works merlokk 2017-10-11 16:56:30 +03:00