Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

unstable

#1

#101

#102

#1021

#1021

#1033

#1033

#1034

#1035

#1035

#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

• 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
• 2d51da38f3 HW TUNE adapting for powerful antennas. (#540) Iceman 2018-01-10 13:56:27 +01:00
• 84e86ed9e3 move appveyor.yml merlokk 2018-01-07 23:23:35 +02:00
• 932af56ea0 Merge pull request #538 from merlokk/hardnestedsetsimd Iceman 2018-01-06 18:54:27 +01:00
• 91ca74f0ed Merge pull request #534 from pwpiwi/fix_printf Iceman 2018-01-06 18:54:09 +01:00
• ab0582d672 fix another way merlokk 2018-01-06 19:14:34 +02:00
• 4ed45d444b fix #404 merlokk 2018-01-05 18:36:00 +02:00
• 7421ab0b43 fix readme merlokk 2018-01-05 13:04:17 +02:00
• 314a9b9cdd Merge branch 'master' of github.com:Proxmark/proxmark3 into travis merlokk 2018-01-05 11:57:11 +02:00
• 58f0ae45c1 move travis files merlokk 2018-01-05 11:51:51 +02:00
• 1c313691e6 Update ikeys.c (#537) Iceman 2018-01-03 11:15:46 +01:00
• 362d203909 works merlokk 2018-01-02 22:28:13 +02:00
• eaecd7f541 add print SIMD core at the beginning merlokk 2018-01-02 19:11:26 +02:00
• 4a768458d2 hardnested SIMD select merlokk 2018-01-02 19:05:12 +02:00
• e1e7a09db1 Merge pull request #533 from merlokk/chktd Iceman 2017-12-30 15:23:14 +01:00
• 3775e9e865 Allow externalisation of PrintAndLog (#506) Michael Farrell 2017-12-29 03:27:39 +10:00
• 96be871374 Merge branch 'master' into fix_printf pwpiwi 2017-12-28 18:23:41 +01:00
• 3ded0f97d3 Khorben/warnings (#519) Pierre Pronchery 2017-12-28 17:56:18 +01:00
• 55b700a0ac fix #532. looks at length of parameters. merlokk 2017-12-28 13:29:30 +02:00
• b838c4ff27 Minor fixes * fix compiler warnings on Ubuntu * cmdhf14a.c: make manufactureMapping static * cmdhf14a.c: fix format strings pwpiwi 2017-12-28 08:49:07 +01:00
• 0f112d6f19 Avoid a crash in "script list" (#521) Pierre Pronchery 2017-12-28 08:37:09 +01:00
• 91e03840f4 Merge pull request #531 from pwpiwi/loclass_gpl Iceman 2017-12-27 09:41:50 +01:00
• 26f202e22f Change copyright to allow GPLV3, for https://github.com/Proxmark/proxmark3/issues/527 Martin Holst Swende 2017-12-26 20:42:44 +01:00
• dfdc087bc0 Merge pull request #529 from merlokk/appveyor-tst Iceman 2017-12-25 15:13:46 +01:00
• e79209e1f4 fixed condition merlokk 2017-12-24 01:11:43 +02:00
• b1c0f02098 added xcode 9.2 and some logging merlokk 2017-12-24 00:28:38 +02:00
• 69fb283011 Merge pull request #528 from Proxmark/iceman1001-patch-1 marshmellow42 2017-12-23 17:17:43 -05:00
• 828279508a inc timeout merlokk 2017-12-23 23:59:47 +02:00
• 546ae21fa1 add hf emv test to appveyor config merlokk 2017-12-23 23:50:51 +02:00
• 097d265091 Update cmdmain.c Iceman 2017-12-23 22:14:04 +01:00
• d03fb293bc Emv4 - more additions to hf emv exec Oleg Moiseenko 2017-12-23 17:46:43 +02:00
• 69f98ec91e Merge pull request #526 from Proxmark/marshmellow42-patch-1 marshmellow42 2017-12-21 08:02:19 -05:00
• 6469d5503a Update lfsampling.c Iceman 2017-12-21 07:55:51 +01:00
• 5e4932e846 'hf iclass chk' part3 (#525) Iceman 2017-12-17 12:53:21 +01:00
• afb4408b00 Merge pull request #524 from Proxmark/iceman1001-patch-1 marshmellow42 2017-12-16 11:10:05 -05:00
• 5421396e7e Merge pull request #523 from Proxmark/iceman1001-patch-2 marshmellow42 2017-12-16 11:09:48 -05:00
• 909c40c835 Update cmdhficlass.h Iceman 2017-12-16 17:08:45 +01:00
• 385c1a5ebc Update cmdhficlass.c Iceman 2017-12-15 15:53:58 +01:00
• 678a3cb2fe Update cmdhficlass.h Iceman 2017-12-15 15:48:25 +01:00
• feb1bf4184 Merge pull request #515 from pwpiwi/fix_14atimeout Iceman 2017-12-12 15:50:53 +01:00
• fa85b08504 fix iso14a_set_timeout() adjustment pwpiwi 2017-12-11 20:40:09 +01:00
• 7c7327e7c8 fix: hf mf hardnested failed with new WUPA timing * allow additional 2 ssp_frame cycles to detect SOF * use only respective functions to get/set iso14a_timeout * remove waiting time in MifareAcquireEncryptedNonces(). This is covered by GetATQA() now. pwpiwi 2017-12-10 11:57:15 +01:00
• bc3b2f7f94 Merge pull request #511 from ikarus23/typo Iceman 2017-12-07 00:00:10 +01:00
• 6148817a7f fix: usage and sample text of hf mf cwipe ikarus 2017-12-06 23:30:27 +01:00
• 8afa9712f7 Merge pull request #508 from pwpiwi/fix_AVX512 Iceman 2017-12-06 17:26:49 +01:00
• 1ff75f168b fixing the fix: older shells don't know about &> pwpiwi 2017-12-06 09:25:10 +01:00
• 0fb3e45541 Merge pull request #507 from pwpiwi/fix_AVX512 Iceman 2017-12-05 17:26:20 +01:00
• 385e4b5019 Merge pull request #504 from merlokk/emv3 Iceman 2017-12-05 15:39:37 +01:00
• c656c870ae fix: AVX512 detection pwpiwi 2017-12-05 08:25:10 +01:00
• 7a7afeba5c small refactoring merlokk 2017-12-04 22:20:29 +02:00
• 5a1b25ac31 added 9f0a tag merlokk 2017-12-03 20:36:04 +02:00
• f7ec230e98 added a tag merlokk 2017-12-03 20:28:36 +02:00
• 1e431c5d36 get rid of tabs) merlokk 2017-12-02 22:12:41 +02:00
• b0c73387f0 added if merlokk 2017-12-02 22:10:25 +02:00
• 10d4f82338 transactions MSD and M/Chip, qVSDC works merlokk 2017-12-02 21:47:30 +02:00
• 2db66b01da Merge pull request #493 from merlokk/emv2 Iceman 2017-12-02 18:39:14 +01:00
• 245a6b2083 added xcode 9 and 9.1 coz 8 and 8.1 links to 8.3 merlokk 2017-12-02 16:41:39 +02:00
• 3c9b6573ec remove show options merlokk 2017-12-02 16:24:47 +02:00
• a36b278fad add options show merlokk 2017-12-02 13:06:51 +02:00
• 2e35aa3aa7 added info merlokk 2017-12-02 11:51:12 +02:00
• 755c72b798 rename travis file merlokk 2017-12-01 18:57:31 +02:00
• b6c370f171 added REPOSITORY_EP var merlokk 2017-12-01 18:54:54 +02:00
• b35c11f95e init travis from https://github.com/pwpiwi/proxmark3/tree/travis_test merlokk 2017-12-01 18:49:31 +02:00
• d217282541 Merge pull request #502 from merlokk/apduhelp Iceman 2017-11-30 20:04:16 +01:00
• 606eddca8d added hint on hf 14a apdu. close #495 merlokk 2017-11-30 19:34:20 +02:00
• dc93020701 Update fpgaloader.c (#500) Iceman 2017-11-30 12:46:40 +01:00
• 653e5ed3ca Merge pull request #488 from pwpiwi/fix_usbpower Iceman 2017-11-28 21:26:57 +01:00
• f380317220 Change USB Configuration to "Bus Powered" pwpiwi 2017-11-28 21:22:29 +01:00
• 14971507b1 Merge pull request #494 from qaisjp/patch-1 Iceman 2017-11-26 06:15:48 +01:00
• 1ccdd4f631 Make README file markdown Qais Patankar 2017-11-26 04:41:24 +00:00
• 78528074b1 optimization UDOL creation. does not affect on functionality. merlokk 2017-11-25 21:17:56 +02:00
• 44128a0e9a Added hf emv exec - command for execute EMV transaction Added to hf emv exec MSD path for VISA and Mastercard and some other compatible EMV cards merlokk 2017-11-25 14:40:23 +02:00
• 87fc2dad14 merged emvcore merlokk 2017-11-25 14:30:53 +02:00
• 66efdc1f64 part of changes merlokk 2017-11-25 12:58:50 +02:00
• 45eb1383e3 Merge pull request #491 from pwpiwi/mod_select Iceman 2017-11-25 09:51:39 +01:00
• 137dd5826e Merge pull request #486 from KenzyCarey/master Iceman 2017-11-24 12:39:45 +01:00
• 47b78133a0 minor iso14443a timing fixes to avoid select errors: * take setup frame guard time (SFGT) into account * adjust iso14a_timeout by FPGA delays * don't give up on first WUPA. Retry several times pwpiwi 2017-11-22 17:46:00 +01:00
• 3c5fce2ba7 Add: Emv first part of commands Oleg Moiseenko 2017-11-22 07:16:33 +02:00
• 4058a2d7df fix: avoid SspClk overflow due to incomplete reset pwpiwi 2017-11-21 07:31:42 +01:00
• dfa1628ac3 Add files via upload Kenzy Carey 2017-11-17 14:42:52 -08:00
• 0363be9358 fix: USB Power requirements * correctly indicate the maximum current drawn from the USB bus pwpiwi 2017-11-17 09:13:37 +01:00
• c95affa8d3 minor fixes Oleg Moiseenko 2017-11-15 08:49:18 +02:00
• db68bcdb06 Complete WTX handling pwpiwi 2017-11-15 07:47:18 +01:00
• aa264aba1d Merge pull request #480 from pwpiwi/fix_nested marshmellow42 2017-11-13 09:42:56 -05:00
• e537c3e894 fix memory overflow in hf mf nested (issue #479) pwpiwi 2017-11-12 18:08:57 +01:00
• c3511781a1 Merge pull request #478 from wsmoses/master Iceman 2017-11-11 22:45:37 +01:00
• 230eaa5391 Merge pull request #477 from merlokk/wtx Iceman 2017-11-11 22:16:19 +01:00
• 874572d419 Fix memory bounds error William S. Moses 2017-11-11 16:08:57 -05:00
• ba4f95b4af added some info from @peterfillmore fork merlokk 2017-11-11 23:05:08 +02:00
• a63505c953 Added work with S-Block WTX in 14a apdu on arm side merlokk 2017-11-11 22:56:50 +02:00
• c0e852f907 Merge pull request #475 from merlokk/master Iceman 2017-11-11 00:39:29 +01:00
• 298143218a true fix #472 ))) merlokk 2017-11-11 01:28:20 +02:00
• 8b5ec1f4a6 Merge pull request #474 from merlokk/df_fix Iceman 2017-11-11 00:24:38 +01:00
• 7c84f80657 Merge pull request #471 from marshmellow42/master Iceman 2017-11-11 00:24:20 +01:00
• 872337e019 change ul_switch_off_field to DropField fix #473 merlokk 2017-11-11 01:19:34 +02:00
• c425cc7efc Merge pull request #472 from merlokk/master Iceman 2017-11-10 23:45:45 +01:00
• 77499f6fb2 fix #468 merlokk 2017-11-11 00:43:29 +02:00
• d940ebfbad Merge pull request #470 from pwpiwi/mod_indent Iceman 2017-11-10 23:21:26 +01:00
• 33a9982c76 dump only leaf TLV data pwpiwi 2017-11-10 23:09:08 +01:00