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

• 0635c570d5 json sketch merlokk 2018-10-03 14:04:05 +03:00
• 9fae7350e5 small refactoring merlokk 2018-10-02 19:57:40 +03:00
• ef8e6a94ad added sketch to hf emv scan merlokk 2018-10-02 19:46:40 +03:00
• 7f49398823 added hf emv scan command and options merlokk 2018-10-02 18:23:07 +03:00
• e16cdf5b7a help fix merlokk 2018-10-02 17:52:12 +03:00
• 87d5f5c9be dol calculation implemented in genac and intauth merlokk 2018-10-02 17:40:50 +03:00
• 5a2378ae79 started hf emv ac merlokk 2018-10-01 21:52:18 +03:00
• b7f7ab0edd small change merlokk 2018-10-01 21:41:47 +03:00
• c40894f289 hf emv pdol added help and warning merlokk 2018-10-01 21:41:18 +03:00
• 6f888272c2 added loading params from GPO merlokk 2018-10-01 21:36:05 +03:00
• 11146fc1e1 modify argtable parser to parse ints with spaces (#683) Oleg Moiseenko 2018-10-01 21:12:14 +03:00
• 91ab6e02f6 small GPO fix merlokk 2018-09-28 21:49:53 +03:00
• d0e2275842 small fix in GPO help merlokk 2018-09-28 21:44:37 +03:00
• 7c1e6128c0 add new argtable logic to emv commands and small fix merlokk 2018-09-28 21:34:31 +03:00
• e5b9e83c2c
  Merge branch 'master' into ex_argtable Oleg Moiseenko 2018-09-28 21:28:19 +03:00
• f23565c38b Added to hf emv commands: gpo, readrec, genac, challenge, intauth (#671) Oleg Moiseenko 2018-09-28 19:03:21 +03:00
• 48354ddb54 Merge branch 'emv_argtable' of https://github.com/merlokk/proxmark3 pwpiwi 2018-09-28 17:59:14 +02:00
• 22c00adf68 start fixing hf 15: * implement a real time Decoder (will be required for sniffing) * switch off field after each command (protect rdv40) * correctly signal field status with LED D pwpiwi 2018-09-28 13:54:41 +02:00
• a8d8a0b20e added option to clue data in arg parser merlokk 2018-09-26 19:36:49 +03:00
• 8285a71716 added arg_strx1 and arg_strx0 for x str arguments in one merlokk 2018-09-26 19:17:22 +03:00
• 2ff07208fd modify argtable parser to parse ints with spaces merlokk 2018-09-24 18:55:59 +03:00
• cf77197535
  Merge 9dcc00e8e3 into b8a92318be Oleg Moiseenko 2018-09-24 12:33:16 +00:00
• b8a92318be Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2018-09-24 13:04:21 +02:00
• c13afca1f5 Fix: accidentially deleted line in fpgaloader.c pwpiwi 2018-09-24 13:03:13 +02:00
• 2d4db38754 FIX: APDUCodeTable has more items than 100 (#682) Oleg Moiseenko 2018-09-24 13:48:07 +03:00
• 16cdfa6355
  Merge branch 'master' into emv_argtable Oleg Moiseenko 2018-09-24 13:27:30 +03:00
• 3fcbd0cf43 FIX: APDUCodeTable has more items than 100 4fa0835d5f merlokk 2018-09-24 13:12:53 +03:00
• a7e1b46d51 Jansson gcc8 fix (#679) Fl0-0 2018-09-22 17:51:13 +02:00
• 2baf9ddc57 28 chars fix Fl0-0 2018-09-22 17:15:34 +02:00
• 1b9576cba7 8 chars fix Fl0-0 2018-09-22 16:41:36 +02:00
• 9dcc00e8e3 remagic.lua fix merlokk 2018-09-21 17:24:27 +03:00
• 050aa18b13
  RDV40 compatibility fixes (#678) pwpiwi 2018-09-21 08:27:35 +02:00
• 054cb359ca increase length by 17 Fl0-0 2018-09-19 17:28:27 +02:00
• 6d2a32c3f5 Fix error in load.c Fl0-0 2018-09-19 16:37:14 +02:00
• f23d3734fa Fix error in error.c Fl0-0 2018-09-19 15:42:56 +02:00
• 9970fa99f3 RDV40 compatibility fixes * detect and use RDV40 higher voltage ADC channel for hw tune, hf tune, hw detectreader * fix mode switching in hw detectreader * detect Smartcard Slot in hw version * i2c changes from https://github.com/RfidResearchGroup/proxmark3 * some formatting in proxmark3.h pwpiwi 2018-09-19 08:57:09 +02:00
• 2758d83652
  Merge pull request #658 from grauerfuchs/master marshmellow42 2018-09-18 22:23:47 -04:00
• 161c40fb52
  Merge branch 'master' into master marshmellow42 2018-09-18 22:12:11 -04:00
• 696e863078 added EMV tag #9F6E (#676) Oleg Moiseenko 2018-09-18 19:52:41 +03:00
• 526b188e84 added EMV tag #9F6E merlokk 2018-09-18 19:48:26 +03:00
• 57548f275a hf emv exec works with argtable merlokk 2018-09-18 19:06:59 +03:00
• 61ad070f56 delete unused procedure after merge merlokk 2018-09-18 18:36:03 +03:00
• 654b6ae3f4
  Merge branch 'master' into emv_argtable Oleg Moiseenko 2018-09-18 18:29:59 +03:00
• 556826b5d5 Added loading EMV transaction parameters from json file (#659) Oleg Moiseenko 2018-09-18 08:15:34 +03:00
• 7ea17d6d2f move jansson lib from include to client directory merlokk 2018-09-17 14:13:44 +03:00
• 82258709f6 Remove unused functions le32toh, le24toh, hextobinstring, binarraytobinstring, print_hex, print_hex_break, sprint_hex_ascii, sprint_ascii, SwapEndian64ex (#667) Michael Farrell 2018-09-17 16:35:45 +10:00
• 2dedd5eaec Update changelog and fix build error (#674) AntiCat 2018-09-17 07:56:53 +02:00
• b4ba1eeabe fpgaloader: fix function accordingly to #669 (#673) uhei 2018-09-17 07:55:51 +02:00
• d90e4adc17 fpga: fixed conflicting function definition Andreas Dröscher 2018-09-16 21:09:38 +02:00
• 07cfc513d7 Update CHANGELOG.md AntiCat 2018-09-11 20:52:24 +02:00
• dbd633e196
  fpgaloader: fix function accordingly to #669 uhei 2018-09-16 21:07:23 +02:00
• 6a5d4e17f4
  rework iso14443b device functions including FPGA I/Q signal transfer (#669) pwpiwi 2018-09-16 00:53:28 +02:00
• 082b51d354 FIX: crash on Bionic libc if CloseProxmark is called twice. Michael Farrell 2018-09-15 10:19:22 +10:00
• 0d7ee55f9d
  Adding new Kastle 32-bit format from @xilni grauerfuchs 2018-09-14 06:32:29 -04:00
• bb6eff89d8
  Minor changes to variable names and comments pwpiwi 2018-09-14 08:49:17 +02:00
• 173ba1e1a2
  Merge branch 'master' into master grauerfuchs 2018-09-13 21:30:24 -04:00
• fc7a78f2d1 Changes requested by @marshmellow42 grauerfuchs 2018-09-13 21:05:11 -04:00
• 8c2ae2176d added changelog merlokk 2018-09-13 20:03:10 +03:00
• 0c4750c3ba small fixes in helps merlokk 2018-09-13 19:58:26 +03:00
• 02ab5afa87 add terminal decision to genac and small fixes merlokk 2018-09-13 19:53:14 +03:00
• 48c32f0436 added CDA transaction to hf emv genac merlokk 2018-09-13 18:44:20 +03:00
• 11a78e048c added intauth and genac commands. works. merlokk 2018-09-13 18:38:03 +03:00
• 53e2f2fad1
  Correction to Samyrun offline mode grauerfuchs 2018-09-13 06:30:26 -04:00
• 7517461d0b
  Indentation fixed and comment updated pwpiwi 2018-09-13 09:56:20 +02:00
• 08a7ed661f
  Indendation fixes and comments updated pwpiwi 2018-09-13 09:50:30 +02:00
• ad23886a6f small fix merlokk 2018-09-12 20:22:24 +03:00
• 8ffdccffa0 hf emv challenge works merlokk 2018-09-12 20:20:27 +03:00
• ab2d91f86d hf emv readrec works and some changes in help merlokk 2018-09-12 20:08:16 +03:00
• cd2f1acd1b hf emv gpo works merlokk 2018-09-12 19:51:20 +03:00
• 9632c63767 Merge branch 'master' into fix_iq_xcorr pwpiwi 2018-09-12 15:14:06 +02:00
• 5bec7a314e rework iso14443b device functions * hf_read_rx_xcorr.v: transfer i/q pair in one 16bit frame * hi_read_tx.v: invert ssp_dout. When nothing is transferred (ssp_dout=0), this results in no modulation (carrier on) * adjust arm sources accordingly * iso14443b.c: switch off carrier after hf 14b sri512read and hf 14b srix4kread * iso14443b.c: fix DMA circular buffer handling pwpiwi 2018-09-11 07:19:10 +02:00
• 626e650fbf added new functions to hf emv merlokk 2018-09-11 17:02:22 +03:00
• 72eec0617c Remove unused function SwapEndian64ex Michael Farrell 2018-09-12 00:01:09 +10:00
• fd43ccb145 Delete unused functions sprint_hex_ascii, sprint_ascii Michael Farrell 2018-09-11 23:58:50 +10:00
• d174ff06de Remove unused functions print_hex, print_hex_break Michael Farrell 2018-09-11 23:56:00 +10:00
• 69a74eb0b3 Remove unused functions hextobinstring, binarraytobinstring Michael Farrell 2018-09-11 23:52:22 +10:00
• d7f79c5ba2 Delete unused function le24toh Michael Farrell 2018-09-11 23:47:46 +10:00
• a4662ca9f9 hf emv pse and sketch for the other commands merlokk 2018-09-11 16:11:58 +03:00
• 24e0d538d1 delete old help merlokk 2018-09-11 14:58:15 +03:00
• 7d4ba60e8e hf emv select some refactoring merlokk 2018-09-11 14:56:33 +03:00
• 3668df05ec hf emv select merlokk 2018-09-11 14:49:50 +03:00
• 6d31653c44 move hf emv search to argtable merlokk 2018-09-11 12:21:29 +03:00
• 53edb044c0 Allow clean Legic simulation exit without button press (#668) wllm-rbnt 2018-09-10 18:19:31 +02:00
• 59bce4c48a Allow clean Legic simulation exit without button press William Robinet 2018-09-10 15:21:38 +02:00
• 1b902aa01a Legic Tag Simulator (#666) AntiCat 2018-09-09 16:40:20 +02:00
• ef1442021d
  Merge 52e7fae07e into 6e3d8d671a Michael Farrell 2018-09-09 12:51:56 +00:00
• bed3db8f1d Remove unused method le32toh. Michael Farrell 2018-09-08 23:54:16 +10:00
• c051bdc09a
  Merge 2484ea6f82 into 6e3d8d671a Defensor7 2018-09-06 05:51:19 +00:00
• 6e3d8d671a implement argtable in hf 14a apdu (#490) Oleg Moiseenko 2018-09-06 08:48:54 +03:00
• f3c8131a0d update travis config (#662) Oleg Moiseenko 2018-09-06 08:38:38 +03:00
• 20912c8a33 Legic: Implemented write command for card simulation AntiCat 2018-09-05 22:46:38 +02:00
• 324223c4f5 Legic: Implemented read command for card simulation AntiCat 2018-09-05 22:46:21 +02:00
• 0ae6bd5097 Legic: Implemented setup phase for card simulation AntiCat 2018-09-05 22:46:19 +02:00
• a51167b7ad Legic: Implemented RX and TX for card simulation AntiCat 2018-09-05 22:46:15 +02:00
• 19ab48f713 Legic: Moved card simulator into separate file & cleaned interface. AntiCat 2018-09-05 22:46:05 +02:00
• e1ba4195c8 FPGA Hi-Simulate: Added 212kHz SSP-Clock option AntiCat 2018-09-05 22:46:03 +02:00
• afe6b01eec FPGA Hi-Simulate: Freed up 4 LUTs AntiCat 2018-09-05 22:46:02 +02:00
• 883cc3fd37 FPGA Hi-Simulate: Fixed documantation AntiCat 2018-09-05 22:45:59 +02:00
• aa8ae7230c FPGA Hi-Simulate: Formatted code AntiCat 2018-09-05 22:45:57 +02:00
• 2484ea6f82
  lfops.c CmdEM410xdemod empty TAG ID fix Defensor7 2018-09-05 20:04:55 +03:00