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

• 666fa6e1cf deploy in msys2 and proxspace (#702) Oleg Moiseenko 2018-10-22 23:27:37 +03:00
• 9ea41a56a5 deploy in msys2 and proxspace merlokk 2018-10-22 23:05:21 +03:00
• 39d0137178 small fix merlokk 2018-10-22 15:14:22 +03:00
• 6c4289b874 small fix merlokk 2018-10-22 14:10:36 +03:00
• 2568dbb7e4 added plain parameter merlokk 2018-10-22 13:57:37 +03:00
• 22ad70ec54 Merge branch 'master' of github.com:merlokk/proxmark3 into fido merlokk 2018-10-22 13:12:50 +03:00
• e5bcf991c2 Fix "hf mf chk" <t|d|s|ss> flags. Hector Sanjuan 2018-10-21 00:35:24 +02:00
• fa22c310d2 Fix bad version tag Hector Sanjuan 2018-10-20 23:27:23 +02:00
• fb2e025f9d some refactoring merlokk 2018-10-19 17:37:15 +03:00
• 729dbe0471 auth4 refactoring merlokk 2018-10-19 17:20:09 +03:00
• 8df4180f39 small teaser) merlokk 2018-10-19 16:35:43 +03:00
• ffb269196f added a key merlokk 2018-10-19 16:24:01 +03:00
• ce661ec546 refactoring merlokk 2018-10-19 16:23:37 +03:00
• 3d9b303224 commit perso fix merlokk 2018-10-19 15:54:03 +03:00
• 4e524bd385 fixed MERGE bug merlokk 2018-10-19 15:53:36 +03:00
• 7f3b8860ed added init card command merlokk 2018-10-19 15:30:45 +03:00
• be34bb6fa4 fixed showing error merlokk 2018-10-19 15:30:28 +03:00
• 9a97a1af2b fix bug in CLIParamHexToBuf merlokk 2018-10-19 15:26:38 +03:00
• 4c0542338a added errors https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L91 merlokk 2018-10-19 00:05:33 +03:00
• d76856aeed commit perso sketch. https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua#L184 not tested... merlokk 2018-10-18 20:50:27 +03:00
• 1b4e5e0ecc refactoring merlokk 2018-10-18 20:35:28 +03:00
• 6afdead05c some refactoring merlokk 2018-10-18 20:31:27 +03:00
• 5470e507b2 key number not mandatory merlokk 2018-10-18 20:23:25 +03:00
• 8d32e62d75 add write perso from https://github.com/Proxmark/proxmark3/blob/master/client/scripts/mifarePlus.lua merlokk 2018-10-18 20:14:36 +03:00
• 0849c62633 added changelog merlokk 2018-10-18 18:39:12 +03:00
• 9b4edaab6a works merlokk 2018-10-18 18:34:38 +03:00
• 7aac07be8e sketch works merlokk 2018-10-18 17:04:32 +03:00
• 21572097a4 small fix merlokk 2018-10-18 16:40:32 +03:00
• 7e4b449d31 added auth command sketch merlokk 2018-10-18 16:39:26 +03:00
• dc3e2acf33 mf plus info with detect sl mode (#695) Oleg Moiseenko 2018-10-17 21:55:04 +03:00
• 95b697f017 Emv scan (#691) Oleg Moiseenko 2018-10-17 21:53:34 +03:00
• e18ffa6a88 small fix merlokk 2018-10-17 21:13:06 +03:00
• b36057198a got hash merlokk 2018-10-17 20:57:11 +03:00
• 508f4035e1 chaining iso14443-4 works merlokk 2018-10-17 20:47:53 +03:00
• 33f52dbda0 starting refactoring merlokk 2018-10-17 20:21:35 +03:00
• 117f0df729 some improvements in APDU response checking merlokk 2018-10-17 18:19:04 +03:00
• b1eb10c8d3 added error handling in FIDOExchange merlokk 2018-10-17 18:02:24 +03:00
• a1c6c8f937 communication fido chaining + iso14443-4 chaining. needs refactoring... merlokk 2018-10-17 17:52:16 +03:00
• 90d1240211 Merge branch 'master' into fix_hf_15 pwpiwi 2018-10-17 09:34:49 +02:00
• 291df038f2 fix hf 15 sim * added ISO15693 coding for tag messages (CodeIso15693AsTag()) * added ISO15693 decoding for reader commands (Handle15693SampleFromReader()) * send tag inventory response in either high or low speed * some refactoring and formatting pwpiwi 2018-10-06 09:00:04 +02:00
• fbd3f981c6 some refactoring and add new commands for fido u2f merlokk 2018-10-16 19:02:14 +03:00
• 6d6fd1dd21 detects FIDO tag merlokk 2018-10-16 18:42:16 +03:00
• 2da7c502bc hf fido command merlokk 2018-10-16 18:08:50 +03:00
• 3c100be137 merged merlokk 2018-10-12 15:35:22 +03:00
• 784015d981 Merge branch 'master' of github.com:Proxmark/proxmark3 into mfp merlokk 2018-10-12 15:33:16 +03:00
• 54e3cfcb74 small improvements in auth (#694) Oleg Moiseenko 2018-10-12 15:13:58 +03:00
• 2793873e16 small fixes merlokk 2018-10-12 14:32:03 +03:00
• ae4e75701d mf plus info with detect sl mode merlokk 2018-10-12 14:23:42 +03:00
• f6d127f2ab small improvements in auth merlokk 2018-10-12 12:45:42 +03:00
• ae027818ac small fix in auth (#693) Oleg Moiseenko 2018-10-11 20:28:29 +03:00
• 2e02bd79fd small fix in auth merlokk 2018-10-11 20:12:50 +03:00
• acda830056
  Merge branch 'master' into emv_scan Oleg Moiseenko 2018-10-10 23:35:26 +03:00
• 7dadcc959f auth 14443-4 (#692) Oleg Moiseenko 2018-10-10 23:34:04 +03:00
• 670608b064 small fix merlokk 2018-10-10 23:17:32 +03:00
• e9b268971c small fix merlokk 2018-10-10 23:15:34 +03:00
• 90fa5397ad works merlokk 2018-10-10 18:36:05 +03:00
• 9f38391395 Update CHANGELOG for 3.1.0 release v3.1.0 pwpiwi 2018-10-10 08:13:40 +02:00
• 5dffe7b022 added finalization logic to emv scan and option to remove hash checking in key recovery merlokk 2018-10-09 19:27:43 +03:00
• 141316c372 small fix in memory management logic merlokk 2018-10-09 19:14:17 +03:00
• 05d1458789 add file name handling and small refactoring in argtable string processing merlokk 2018-10-09 19:10:47 +03:00
• f001cbab21 added RID to app data merlokk 2018-10-08 20:49:37 +03:00
• b8e9900bd5 fix if certificate not found merlokk 2018-10-08 20:46:57 +03:00
• 998815337e small fix merlokk 2018-10-08 20:43:52 +03:00
• 2989702f0f added save mode merlokk 2018-10-08 20:33:55 +03:00
• c9e51701a8 refactoring: process response format 1 from GPO merlokk 2018-10-08 20:12:11 +03:00
• 40f0435a14 small fix merlokk 2018-10-08 20:11:36 +03:00
• 435c374959 added some codes to appdata list merlokk 2018-10-08 20:11:20 +03:00
• 746b397043 small fix merlokk 2018-10-08 19:38:38 +03:00
• 6777b377c3 refactoring and add key recovering merlokk 2018-10-08 19:37:13 +03:00
• 46e15ab471 small fix merlokk 2018-10-08 18:03:22 +03:00
• 4df0548513 refactoring: move defparams.json to tag-name-value structure merlokk 2018-10-08 18:01:52 +03:00
• ef7fc4f793 refactoring: move ParamLoadFromJson merlokk 2018-10-08 17:55:37 +03:00
• 2a45c2b9c3 Merge branch 'master' of github.com:Proxmark/proxmark3 into emv_scan merlokk 2018-10-08 17:49:57 +03:00
• 23523ca9b0 added path.c to jansson merlokk 2018-10-08 17:43:54 +03:00
• 1900197557 refactoring: move json functions to emvjson.h/c merlokk 2018-10-08 17:43:32 +03:00
• 7ad6ec7a69 flag --extract works merlokk 2018-10-08 17:06:55 +03:00
• a0af1061c9 added work with application data section merlokk 2018-10-08 17:00:41 +03:00
• 92479429c2 Added loading parameters from json to several emv commands (#686) Oleg Moiseenko 2018-10-08 08:48:37 +03:00
• b742ab8cc3 osx: fix annoying focus behaviour (#689) AntiCat 2018-10-08 07:20:21 +02:00
• 473b60d7b3
  Merge branch 'master' into fix/focus-behavior pwpiwi 2018-10-08 07:19:46 +02:00
• 2a53731106 osx: disable app-nap during serial comm (#687) AntiCat 2018-10-08 07:15:29 +02:00
• 70b2fc0abd
  start fixing hf 15: (#684) pwpiwi 2018-10-07 17:32:03 +02:00
• 351d6d17b3 Fix: ControlWidget placement (#690) AntiCat 2018-10-07 17:30:47 +02:00
• 5a747ea556 ui: move control widget below plot AntiCat 2018-10-07 12:03:41 +02:00
• 073466038c ui: code cleanup AntiCat 2018-10-07 12:03:13 +02:00
• 6abf68bd46 osx: fix annoying focus behaviour AntiCat 2018-10-07 00:24:46 +02:00
• 466c112aeb osx: disable app-nap during serial comm AntiCat 2018-10-06 00:02:17 +02:00
• eed83b910c Add another #ifdef for the __BIONIC__ fix (the effect of setting p_thread to 0 is undefined for other libs) pwpiwi 2018-10-06 17:48:43 +02:00
• a025b74606 Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2018-10-06 17:35:40 +02:00
• 7b2cd970ec FIX: crash on Bionic libc if CloseProxmark is called twice. (#672) Michael Farrell 2018-10-07 01:33:44 +10:00
• b49aec796c Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2018-10-06 09:06:13 +02:00
• 2c5f7921f8 osx: disable app-nap during serial comm AntiCat 2018-10-06 00:02:17 +02:00
• 9bf76901f0 added application data list merlokk 2018-10-05 20:24:56 +03:00
• 7edb677c99 extract childs from tlv works merlokk 2018-10-05 20:04:18 +03:00
• c7aa55a311 added read records merlokk 2018-10-05 16:13:06 +03:00
• 2bdf19a7be save gpo result merlokk 2018-10-03 19:12:35 +03:00
• 831096776b added kernel id and moved some parts of code in ppse merlokk 2018-10-03 18:10:25 +03:00
• 7fecd489cf added tlv tree navigation merlokk 2018-10-03 17:31:01 +03:00
• af789d7f2d add changes... merlokk 2018-10-03 15:22:00 +03:00
• c3bf91edaf add tlv tag save to json merlokk 2018-10-03 15:21:35 +03:00