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

• 43912d6349 add: proper indentation when printing TLV objects pwpiwi 2017-11-10 21:39:10 +01:00
• 7c8115b273
  Merge pull request #466 from pwpiwi/mod_14areader Iceman 2017-11-10 20:53:20 +01:00
• f5adb06fae revert field on/off in hf 14a reader fix typo pwpiwi 2017-11-10 20:11:51 +01:00
• e464f62258
  Merge pull request #462 from pwpiwi/fix_hfmfsim Iceman 2017-11-10 18:07:25 +01:00
• 881eacc8aa
  Merge pull request #461 from merlokk/14a_rework3 Iceman 2017-11-10 17:14:38 +01:00
• 9658b9e137 move include modules from h to c file merlokk 2017-11-10 09:15:56 +02:00
• 86a1c1dc25 eliminate double DropField command merlokk 2017-11-09 22:01:00 +02:00
• b7d3e89923 changed iso14aapdu arm side and client merlokk 2017-11-09 16:39:40 +02:00
• eb6e8de45d moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443 stream merlokk 2017-11-03 13:42:38 +02:00
• 82f4955245 Merge branch 'master' into fix_hfmfsim pwpiwi 2017-11-02 21:37:42 +01:00
• b35e04a7c6 fix hf mf sim: * more timing fixes * correctly determine correction bit (taken from iceman's fork) * add checking of Access Conditions for Read command * never allow reading KeyA pwpiwi 2017-10-24 07:49:14 +02:00
• 1d6f7bc8ac added changelog merlokk 2017-11-02 14:28:05 +02:00
• 378d3406ca
  Merge branch 'master' into 14a_rework3 Oleg Moiseenko 2017-11-02 14:14:55 +02:00
• 23207d748f tlv decoder works. merlokk 2017-11-02 14:11:42 +02:00
• 75e42ef5df added changelog (#460) Oleg Moiseenko 2017-11-01 21:37:18 +02:00
• fe6bf3c58c improve hf 14a info (#457) Oleg Moiseenko 2017-11-01 18:48:59 +02:00
• 83df98d691 change comment in iso14443a.c (#459) Oleg Moiseenko 2017-11-01 18:44:43 +02:00
• 499df9088d fix behavier reading iso14443-3 and iso14443-4 cards merlokk 2017-11-01 18:34:15 +02:00
• 7376da5c44 revert SAK check merlokk 2017-11-01 18:22:03 +02:00
• bed3e4c20d Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3 merlokk 2017-11-01 17:13:27 +02:00
• 89ec86abd2 now SAK check is OK merlokk 2017-11-01 17:02:35 +02:00
• c5e9a0212e deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88 merlokk 2017-11-01 16:55:12 +02:00
• 9d139870cb
  Merge pull request #456 from merlokk/hfreaderfix marshmellow42 2017-11-01 07:57:30 -04:00
• fe842bed9c fixed bug with hf search 14a merlokk 2017-11-01 13:54:03 +02:00
• a2bb2735d5 TLV decoding works merlokk 2017-11-01 13:38:29 +02:00
• 7dac1034e5 Add hf mf info, change hf mf reader (#452) Oleg Moiseenko 2017-11-01 09:51:05 +02:00
• 78a94ff902 improved GetAPDUCode() merlokk 2017-10-31 19:19:49 +02:00
• 5bcb3496fa small refactoring merlokk 2017-10-31 19:11:23 +02:00
• fe346768b3 added showing apdu response codes merlokk 2017-10-31 18:14:32 +02:00
• a23f000182 move strucrture to .h file merlokk 2017-10-31 16:25:42 +02:00
• 6fc6cd0f57 export apdu function merlokk 2017-10-31 16:20:23 +02:00
• d1300b47ae apdu sending refactoring merlokk 2017-10-31 16:08:58 +02:00
• 8019540b19 param parsing convert to procedures merlokk 2017-10-31 15:15:57 +02:00
• f2b0169cc6 apdu works. merlokk 2017-10-31 13:28:16 +02:00
• f1a983a330 fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway... merlokk 2017-10-30 17:58:43 +02:00
• 980417eacd iso14_apdu works via logical channel. not as it needs. it needs to change to raw( merlokk 2017-10-30 17:29:03 +02:00
• 618c220c38 small fixes in ReaderIso14443a() (#446) Oleg Moiseenko 2017-10-29 17:34:51 +02:00
• 1208cdcb45 added sketch for command hf 14a apdu merlokk 2017-10-27 19:02:45 +03:00
• 7710983be3 added hf 14a apdu command. merlokk 2017-10-27 18:45:42 +03:00
• fefb7f5376 appveyor.yml. display return values (#451) Oleg Moiseenko 2017-10-27 17:58:24 +03:00
• 3851172d81 Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450) pwpiwi 2017-10-27 09:56:46 +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
• 5d7d0c3af9 small improvement in tests (test result in green or red) (#448) Oleg Moiseenko 2017-10-26 19:32:18 +03:00
• 8dd0118673 Merge pull request #440 from merlokk/c3 Iceman 2017-10-26 11:46:20 +02:00
• 8bdb6043b0 identification fix for magic chinese cards (#444) Oleg Moiseenko 2017-10-25 08:56:03 +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
• 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
• 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
• aa757f71d9 proxmark3 refactoring command line parameters (#417) Oleg Moiseenko 2017-10-20 07:49:53 +03:00
• 36b1cdd1b4 fix fpga_comress sending no-error messages to stderr (#430) Oleg Moiseenko 2017-10-19 13:23:09 +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
• 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
• 9d0a333449 wrong define used (#421) Iceman 2017-10-16 18:16:39 +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
• 77aecdd286 Merge pull request #407 from pwpiwi/no_rats Iceman 2017-10-06 02:36:06 +02:00
• 7085af051d fix LUA script errors pwpiwi 2017-10-05 18:07:26 +02:00
• adf023ffe3 hf mf nested add some functionality (#403) Oleg Moiseenko 2017-10-05 14:37:51 +03:00
• 5d8f664d7a Adjust LUA scripts to new ISO14A_NO_RATS option pwpiwi 2017-10-04 18:25:34 +02:00
• c04a4b60ce Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, ...) pwpiwi 2017-10-01 17:52:10 +02:00
• 5191ad9e55 Merge pull request #405 from ZenSecurity/master Iceman 2017-09-29 12:02:10 +02:00
• 0060e3daa2 Merge pull request #402 from pwpiwi/env_flags Iceman 2017-09-29 12:01:54 +02:00
• ab92e6c301 Added bus blaster (http://dangerousprototypes.com/docs/Bus_Blaster) configuration for AT91SAM7S512 support in openocd. Mikhail Yushkovskiy 2017-09-27 23:37:46 +03:00
• 340f50a53c Don't ignore environment variables CFLAGS and LDFLAGS for tools as well pwpiwi 2017-09-26 18:15:19 +02:00
• f53eb07de0 Don't ignore environment variables CFLAGS and LDFLAGS * they are be set by some build environments to find include and lib dirs pwpiwi 2017-09-25 18:31:10 +02:00
• c19f26b05d Merge pull request #393 from pwpiwi/fix_getclocktime Iceman 2017-09-26 17:08:50 +02:00
• a2d058f3aa Fix typo and gcc-7 warnings (#401) Fl0-0 2017-09-26 16:36:05 +02:00
• 1ece662f0f Merge pull request #400 from merlokk/master marshmellow42 2017-09-26 07:38:24 -04:00
• 2ce43a28f7 fixed #395 merlokk 2017-09-26 14:29:08 +03:00
• 3a05a1e739 reworking magic cheneese card wipe (#365) Oleg Moiseenko 2017-09-22 20:40:42 +03:00
• d47c8c701a Fix clock_gettime() for Apple OSX (also fixes hf mf hardnested) pwpiwi 2017-09-20 07:32:15 +02:00
• 08b7cd17a5 Merge pull request #392 from pwpiwi/expr_fix Iceman 2017-09-13 19:02:05 +02:00
• de1e68d34b Fix detection of AVX512 support for Apple clang compiler pwpiwi 2017-09-11 21:08:09 +02:00
• 8c8317a5e9 fix lf sim fpga download overwrites sim buffer (#391) marshmellow42 2017-09-11 13:18:32 -04:00
• 1dae9811f2 Indala fixes - set accurate preamble and start of.. (#385) marshmellow42 2017-08-27 06:10:28 -04:00
• c6c0449105 Don't try to display the GUI when running in textmode (#387) uzlonewolf 2017-08-27 03:09:39 -07:00
• a221bacd43 Fix gcc version detection (from iceman1001 fork), fix issue #386 (#388) Fl0-0 2017-08-27 12:08:48 +02:00
• 14d7657703 fix: 'hf mf nested' - got an initialized bug from the monster merge iceman1001 2017-08-27 00:32:22 +02:00
• 5c814c3a9f helptext fixes (#384) marshmellow42 2017-08-22 12:33:12 -04:00
• 930763e86d Use PolarSSL DES implementation (GPL 2 or later) for both client and firmware (#378) pwpiwi 2017-08-22 10:04:47 +02:00
• fe087813f6 Merge pull request #356 from pwpiwi/low_frequencies marshmellow42 2017-08-21 15:29:56 -04:00
• d0067d0768 Fix compile issues for mfkey32 and mfkey64 after Pull Request #380 pwpiwi 2017-08-18 07:50:03 +02:00
• 4efdfbe638 Fixes 2 bugs in mifare simulate (#380) etmatrix 2017-08-17 16:59:48 +02:00
• 6b758d652d Prevent using x86 SIMD compiler flags on aarch64 (ARM) architecture pwpiwi 2017-08-16 08:50:31 +02:00
• f2081c4356 adjust lf simulation - fix one bug + attempt... (#369) marshmellow42 2017-08-08 15:08:59 -04:00
• 8cf533fd98 FIX: 'lf hid sim' - it now prints the id correct ref https://github.com/Proxmark/proxmark3/issues/364 pwpiwi 2017-07-27 18:35:12 +02:00