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

• 940b282f54
  Merge pull request #550 from pwpiwi/fix_warnings Iceman 2018-01-23 17:43:07 +01:00
• ffac601022 small refactoring merlokk 2018-01-23 18:31:00 +02:00
• 19060effb0 refactoring merlokk 2018-01-23 18:23:41 +02:00
• ec0872181b fix clang compiler warnings identified in http://www.proxmark.org/forum/viewtopic.php?id=5388 pwpiwi 2018-01-23 08:27:58 +01:00
• c3a4f4c7ed added TBD code merlokk 2018-01-23 17:00:04 +02:00
• b45ac1c912 add testing prng merlokk 2018-01-23 12:48:46 +02:00
• acaa71ffe3
  Merge pull request #549 from rkblackfire/master Iceman 2018-01-22 19:33:41 +01:00
• f3ffd5a24f Revert "dbg: Watchdog resets while 'hw tune lf'" rkblackfire 2018-01-22 19:25:22 +01:00
• 095173f72d chg: print only valid tuning data rkblackfire 2018-01-22 18:59:48 +01:00
• fc175230f4 dbg: Watchdog resets while 'hw tune lf' rkblackfire 2018-01-22 18:54:29 +01:00
• 30bb6d6591
  Merge pull request #548 from merlokk/mfsniff_fix Iceman 2018-01-17 23:16:08 +01:00
• 2ba37081ec added nested authentication "not implemented" warning merlokk 2018-01-17 18:16:37 +02:00
• af1940a5d8
  Merge pull request #546 from pwpiwi/fix_tune Iceman 2018-01-17 16:11:56 +01:00
• a034948363 fix eml file format merlokk 2018-01-17 16:12:50 +02:00
• f7887fa82e added magic cards merlokk 2018-01-17 16:01:56 +02:00
• 3e77c7a7b4 ignore SELECT ALL merlokk 2018-01-17 15:57:24 +02:00
• 543a6ed3c9 SNF_WUPREQ and SNF_SAK harmonized) merlokk 2018-01-17 15:48:01 +02:00
• 968cb35498 deleted save UID from card merlokk 2018-01-17 14:14:36 +02:00
• 35cc71b075 delete opposite states fix merlokk 2018-01-17 14:10:26 +02:00
• 3544b99715 fixed #541 merlokk 2018-01-16 17:54:54 +02:00
• feb328c90a hf mf sniff small fix merlokk 2018-01-16 14:34:04 +02:00
• 138a0e7a6b
  Merge pull request #503 from merlokk/travis Iceman 2018-01-15 16:06:37 +01:00
• d1f9ec06ae
  Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types (#547) pwpiwi 2018-01-15 15:29:14 +01:00
• c014256778 Revert changes in hardnested nonces collection. Sacrifice some speed in favor of stability for some card types pwpiwi 2018-01-15 08:28:51 +01:00
• 8ec06f5ef3 hf mf sniff: small fixes Oleg Moiseenko 2018-01-12 23:37:55 +02:00
• 078e2bd238 fix: SIMD instruction set detection on non-x86 hardware Oleg Moiseenko 2018-01-12 23:04:16 +02:00
• d040cb9024 hw tune: * scale results to allow higher LF voltages * remove historic comments pwpiwi 2018-01-12 21:48:42 +01:00
• e9f411517e fix #542 merlokk 2018-01-12 18:55:47 +02:00
• 613df0cf36 small fix strings merlokk 2018-01-12 16:27:09 +02:00
• 9b4f07e64a hf mf sniff small fix merlokk 2018-01-11 19:42:50 +02: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
• a39c9a9686
  HW TUNE adapting for powerful antennas. Iceman 2018-01-09 15:03:53 +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
• b761cb0a46
  Merge branch 'master' into argtable Oleg Moiseenko 2018-01-03 17:53:33 +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
• 45c406fb47
  Update ikeys.c Iceman 2018-01-01 14:20:19 +01: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
• bb93659c57
  Merge branch 'master' into argtable Oleg Moiseenko 2017-12-23 23:37:31 +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
• b5bf911725 travis removed merlokk 2017-12-23 15:58:27 +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
• 1c8f6acadc added free(udol_data_tlv) merlokk 2017-12-20 13:25:25 +02:00
• 77ad886938 fix warning merlokk 2017-12-20 13:21:15 +02:00
• 899b27aa06 fix warning merlokk 2017-12-19 15:57:23 +02:00
• edc99a8679 fix warnings merlokk 2017-12-19 15:48:24 +02:00
• 330868020b fix travis compile in linux merlokk 2017-12-19 15:37:56 +02:00
• b74905f63b fixed free memory merlokk 2017-12-19 11:25:33 +02:00
• 670cf98254 added get_my_executable_directory() to finding capk file merlokk 2017-12-18 19:22:02 +02:00
• 179f2904d0 travis. added brew tap - do not filter ENV merlokk 2017-12-18 18:32:09 +02:00
• eef53c5be3 fix travis merlokk 2017-12-17 23:52:32 +02:00
• c3314b41bd fix travis merlokk 2017-12-17 23:50:36 +02:00
• bdfc73fd97 fix echo travis merlokk 2017-12-17 23:45:58 +02:00
• 3adc68f356 fix travis merlokk 2017-12-17 23:42:17 +02:00
• da89e97d03 add echo to travis cfg merlokk 2017-12-17 23:40:01 +02:00
• a2bc3b70a9 fixed free structures on exit merlokk 2017-12-17 20:48:26 +02:00
• e34fbb6df7 define simplification merlokk 2017-12-17 20:25:25 +02:00
• 4f26318889 fix travis merlokk 2017-12-17 20:18:13 +02:00
• 75200a9dc2 small fix merlokk 2017-12-17 20:14:56 +02:00
• 80c5958041 fix hf emv help merlokk 2017-12-17 20:12:56 +02:00
• 5e4932e846 'hf iclass chk' part3 (#525) Iceman 2017-12-17 12:53:21 +01:00
• 1d0aded6c3
  'hf iclass chk' part3 Iceman 2017-12-17 07:23:33 +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
• bf486a2949 Merge 741566957dfa279f4dcefe3f3f471b57d260c603 into feb1bf41848aa8e618d4926aa4beef885fd7b32d Pierre Pronchery 2017-12-13 22:18:27 +00:00
• 741566957d Do not use "extern" in header files Pierre Pronchery 2017-12-13 16:21:13 +01:00
• 75e9fc825b Avoid a crash in "script list" Pierre Pronchery 2017-12-13 17:03:22 +01:00
• 9707ba5567 Avoid a warning in client/util.c Pierre Pronchery 2017-12-13 16:56:26 +01:00
• e0b2de0cce Fix warnings and missing #include for <ctype.h> Pierre Pronchery 2017-12-13 16:54:32 +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