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

• c08aac69ed unified lengths and increased buffer. 50 bytes for AID is enough merlokk 2017-11-19 19:16:02 +02:00
• 234f079a99 help fixes merlokk 2017-11-19 19:09:44 +02:00
• 0ec1c2d66a small fix) merlokk 2017-11-19 19:05:50 +02:00
• 8fe3366af0 fix message merlokk 2017-11-19 19:04:45 +02:00
• fff49b2ee0 delete emv.h merlokk 2017-11-19 19:02:21 +02:00
• ac59d20c96 small fix merlokk 2017-11-19 18:47:42 +02:00
• 496cf2fbd3 forget to free memory merlokk 2017-11-19 18:46:46 +02:00
• 4d314995d6 and better.... merlokk 2017-11-19 18:37:55 +02:00
• f5a1e26f9f compress some code. lets look. merlokk 2017-11-19 18:29:09 +02:00
• 2d5cb77890 change file header merlokk 2017-11-19 18:16:53 +02:00
• d05d53c6b1 implement argtable in hf 14a apdu merlokk 2017-11-19 18:06:49 +02: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
• e110dbafd9 fix comment pwpiwi 2017-11-15 08:09:01 +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
• 85532701a9 fix: avoid SspClk overflow due to incomplete reset * should fix watchdog reset during hf mf mifare. Thanks @iceman for the hint. pwpiwi 2017-11-14 18:42:43 +01:00
• 9588dbe98b increase NESTED_SECTOR_RETRY value to get all keys Tim 2017-11-14 19:55:07 +01:00
• aa264aba1d
  Merge pull request #480 from pwpiwi/fix_nested marshmellow42 2017-11-13 09:42:56 -05:00
• 8d004b5d55 emv_tag_dump_bitmask works merlokk 2017-11-13 13:40:06 +02:00
• add83dc908 fixed %zd for size_t merlokk 2017-11-13 13:29:49 +02:00
• ae616398b4 fixed AFL merlokk 2017-11-13 13:19:05 +02:00
• 10b5ebf388 fixed pdol and so on merlokk 2017-11-13 13:12:13 +02:00
• 4bbcad6dfe fixed string merlokk 2017-11-13 13:10:21 +02:00
• eb906d6a7e fixed compiler errors merlokk 2017-11-13 13:01:57 +02:00
• 2acff2ef06 merge master merlokk 2017-11-13 12:54:04 +02:00
• 51b28bc954 fix timeout set in #481 and fix printf in util.c warning merlokk 2017-11-13 12:30:09 +02:00
• ebc46dd139 Complete WTX handling (pull request #477) pwpiwi 2017-11-12 21:41:44 +01: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
• cb593491df fix incorrect variable name marshmellow42 2017-11-10 16:03:55 -05:00
• 217cfb6b29 fix lf search bugs when no tag is on antenna marshmellow42 2017-11-10 15:56:52 -05:00
• 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
• c6b5cebe07 small fix merlokk 2017-11-10 18:33:48 +02:00
• 620b1be410 added break to exec command - it uses only tested functionality merlokk 2017-11-10 18:30:18 +02:00
• f3aef7fb5b add changelog merlokk 2017-11-10 18:29:06 +02:00
• 19fa30fc24 Added EMV commands part 1. hf emv search hf emv pse hf emv select merlokk 2017-11-10 18:23:59 +02: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
• 14fa371813 added changelog merlokk 2017-11-01 18:59:06 +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
• 5fdb7e97e4 all is OK. Just need to fix comment. merlokk 2017-11-01 18:10:11 +02:00
• 4300dd4e93 Merge c871d243f34fd8bf4fa5a7c37858023669966461 into 9d139870cb3569144616c8752d68e30f9b9b9074 Oleg Moiseenko 2017-11-01 16:05:40 +00:00
• c871d243f3 maybe like this merlokk 2017-11-01 18:05:22 +02:00
• 4f9f47b4ca deleted lib include merlokk 2017-11-01 17:44:40 +02:00
• c11b129c23 removed code from library merlokk 2017-11-01 17:42:40 +02:00
• bed3e4c20d Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3 merlokk 2017-11-01 17:13:27 +02:00
• 7539a4f4ed fix SAK problem ij iso14443a select procedure. very old bug) merlokk 2017-11-01 17:05: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
• 951a27e35e added detect classic prng to hf mf info merlokk 2017-11-01 16:19:34 +02:00
• fe07beefa1 added DetectClassicPrng from iceman1001 fork merlokk 2017-11-01 16:18:57 +02:00
• 3d81da6d1a added validate_prng_nonce from iceman1001 fork merlokk 2017-11-01 16:18:13 +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
• 2662dbaa42 as in #447. hf 14a reader may start and end acting as reader merlokk 2017-10-31 18:56:48 +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
• 4ece69610f added command hf 14a info, copy functionality from hf 14a reader to hf 14a info, added command hf 14a reader with simple anticollision-select procedure #447 merlokk 2017-10-27 18:16:14 +03:00