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

• 395905943a
  Merge branch 'master' into fido2 Oleg Moiseenko 2018-11-30 19:09:59 +02:00
• e3ef65ff03 added 4k cards merlokk 2018-11-30 19:06:47 +02:00
• 7b6e320533 HitagS Improvements (#721) florianrock 2018-11-30 17:42:22 +01:00
• f5b90234d2 add changelog merlokk 2018-11-30 18:01:09 +02:00
• 9d03013df9 https://github.com/Proxmark/proxmark3/pull/725 merlokk 2018-11-30 17:57:48 +02:00
• f2db695998 hf fido commands merlokk 2018-11-30 17:55:35 +02:00
• 7d0562a4d7 add test file with options for fido2 merlokk 2018-11-30 17:55:00 +02:00
• 230af6226c add client/fido merlokk 2018-11-30 17:54:33 +02:00
• df773e0ab9 add tinycbor merlokk 2018-11-30 17:53:29 +02:00
• 3ed5369c1b util.h merlokk 2018-11-30 17:52:50 +02:00
• dd3c12a718
  Merge branch 'master' into feature/hitagS_standardmode_and_improvements florianrock 2018-11-30 16:27:14 +01:00
• 06b19cd231 Merge branch 'feature/hitagS_standardmode_and_improvements' of https://github.com/florianrock/proxmark3 into feature/hitagS_standardmode_and_improvements Florian Rock 2018-11-30 16:23:54 +01:00
• 9137ca4339 Provided Changelog Florian Rock 2018-11-30 15:53:48 +01:00
• 0eae8b9d01 added mifare trailer block decoding merlokk 2018-11-30 14:35:45 +02:00
• 118556c55c
  Fix public key lenght to 65 bytes Fl0-0 2018-11-30 11:18:13 +01:00
• 994f21fe01 Fix format-truncation warning, missing string.h inclusion and strnlen warning (#723) Fl0-0 2018-11-30 09:03:44 +01:00
• e419db2672 Dynamic string width field Fl0-0 2018-11-30 08:50:57 +01:00
• 6a2bd85719 jansson update. 2.11 to 2.12 (#724) Oleg Moiseenko 2018-11-30 09:43:46 +02:00
• 5594c6215e
  fix "hf mf chk" <t|d|s|ss> flags (based on PR #700) (#718) pwpiwi 2018-11-30 07:45:01 +01:00
• 13b1ca7ff0 revert #679 merlokk 2018-11-29 22:17:08 +02:00
• bbe6683aa6 jansson update. 2.11 to 2.12 merlokk 2018-11-29 12:15:16 +02:00
• 538d10d651 Support TCP ports for proxmark Vladimir Serbinenko 2018-11-24 16:07:32 +00:00
• e04132b9aa Fix format-truncation warning, missing string.h inclusion and strnlen warning Fl0-0 2018-11-26 09:52:31 +01:00
• 03439be30f Fix util.c:116:2: error: unknown type name ‘va_list’ (#722) Fl0-0 2018-11-26 08:11:11 +01:00
• af2dfa97d8 Fix util.c:116:2: error: unknown type name ‘va_list’ Fl0-0 2018-11-26 07:49:44 +01:00
• 6b882a3918 Fido U2F complete (#716) Oleg Moiseenko 2018-11-25 17:56:12 +02:00
• b953903ddd
  corrected hitagS reader cmd help florianrock 2018-11-24 18:48:34 +01:00
• 2ee14543e9
  corrected hitagS reader cmd help florianrock 2018-11-24 18:47:30 +01:00
• 3626cce414 - support of HITAG S standard communication mode - fixed wrong AC (Anti Collision) decoding - support of block read mode - fixed wrong uid send when using simulation - support of communication mode parameter (client is backward compatible) - support of start-page parameter (important for some weird tags) (client is backward compatible) - also expect pages if tag memory size in con0 is 11 (we got some tags) Florian Rock 2018-11-24 18:33:59 +01:00
• e0991f6aa7 Get rid of polarssl (#717) Oleg Moiseenko 2018-11-23 20:03:46 +02:00
• 46fbe19dac fix "hf mf chk" <t|d|s|ss> flags (based on PR #700) pwpiwi 2018-11-20 17:45:37 +01:00
• 3a69679d17 forget 2 files merlokk 2018-11-19 20:06:48 +02:00
• 55e33c2540 change linux make merlokk 2018-11-19 19:39:06 +02:00
• 5a367ac805 armsrc not compiled. fixed merlokk 2018-11-19 17:52:45 +02:00
• 64e60843cd get rid of polarssl files merlokk 2018-11-19 11:58:17 +02:00
• 42b0d50686 elite_crack and make merlokk 2018-11-19 11:57:38 +02:00
• 5c3eaed840 ikeys merlokk 2018-11-19 11:53:44 +02:00
• e0398dceb0 cmdhficlass merlokk 2018-11-19 11:50:26 +02:00
• 24e6092bb7 changelog merlokk 2018-11-19 11:40:35 +02:00
• d535391708 added PrintAndLogEx for merge commits between repo easier than now merlokk 2018-11-19 11:36:57 +02:00
• a6e2ec60ff merge fido merlokk 2018-11-19 11:17:26 +02:00
• 94feba0d60 jsonloadstr merlokk 2018-11-19 11:16:39 +02:00
• 2b73f4f973 asn1dump and CA merlokk 2018-11-19 11:16:20 +02:00
• 92cc9f5d25 public_key_from_pk merlokk 2018-11-19 11:15:39 +02:00
• 6f7f3c1a88 FillBuffer merlokk 2018-11-19 11:14:35 +02:00
• 62e9d0cd84 asn1print merlokk 2018-11-19 11:14:17 +02:00
• d11a6864fd add pkwrite merlokk 2018-11-19 11:13:54 +02:00
• 700d868794 move from polarssl to mbedtls (#708) Oleg Moiseenko 2018-11-19 10:02:38 +02:00
• 39cc1c879e FIDO U2F NFC authenticators (#697) Oleg Moiseenko 2018-11-17 20:22:21 +02:00
• 8fa6838476 fix - some card cant reset so quick. (#713) Oleg Moiseenko 2018-11-17 19:04:56 +02:00
• 1429030854 fix get length in tlv (#714) Oleg Moiseenko 2018-11-17 19:04:25 +02:00
• f4a0f70a66 fix get length in tlv merlokk 2018-11-15 13:54:02 +02:00
• 22176dd661 fix - some card cant reset so quick. merlokk 2018-11-12 16:36:38 +02:00
• ab0ac673d8 add hard_autopwn.lua as a auto hardnested script for people who want save their time and keyboard ryan 2018-11-09 17:32:01 +08:00
• 9ad3a10c2d refactoring merlokk 2018-11-07 17:34:15 +02:00
• abd6fd4f0f move crypto lib to client directory merlokk 2018-11-07 17:12:34 +02:00
• ef744d8b1a small fix in printf's merlokk 2018-11-07 17:01:25 +02:00
• 02e656c5ad test functionality restored. can be merged merlokk 2018-11-07 16:56:51 +02:00
• 7d60dcab7d ecdsa works. added error handling merlokk 2018-11-07 16:55:23 +02:00
• 916ba0c84f added signature check to test merlokk 2018-11-06 19:55:12 +02:00
• ea10cbcc13 refactoring merlokk 2018-11-06 16:11:14 +02:00
• 3f68942451 deleted unused parts merlokk 2018-11-02 23:52:29 +02:00
• 17d042747b added random generator and ecdsa test merlokk 2018-11-02 19:41:34 +02:00
• 64cb771757 small refactoring merlokk 2018-11-01 15:09:01 +02:00
• 9ac78341c5 aes_cmac use function from mbedtls merlokk 2018-11-01 14:51:56 +02:00
• b887641ae8
  Merge pull request #1 from Proxmark/master Artem V Gnatyuk 2018-11-01 17:27:55 +07:00
• bdf96aae39 fix hf 15 reader (merge error) pwpiwi 2018-10-31 22:00:36 +01:00
• c311476792
  Merge branch 'master' into mbedtls Oleg Moiseenko 2018-10-31 22:39:20 +02:00
• 6eeb5f1c29 fix warning under linux (#709) Oleg Moiseenko 2018-10-31 20:47:37 +02:00
• 4b5d696c17 changes to mifare plus code (#706) drhatson 2018-10-31 18:46:12 +00:00
• 0713594776 "Plain" flag drhatson 2018-10-31 17:13:02 +00:00
• 464f0b4cf8 fix warning under linux merlokk 2018-10-31 16:58:51 +02:00
• 4f04819a82 aes_cmac fix merlokk 2018-10-31 16:39:26 +02:00
• f4411336c3 fix a warning in armsrc/iso15693 merlokk 2018-10-31 16:19:13 +02:00
• 4490e13c56 add travis merlokk 2018-10-31 15:53:35 +02:00
• 0f6cb6af8c delete unused polarssl parts merlokk 2018-10-31 15:49:29 +02:00
• 817f148e85 update polarssl to mbedtls merlokk 2018-10-31 15:44:57 +02:00
• e1cabdd474 changes drhatson 2018-10-27 07:31:11 +00:00
• 941691eb9d add error handling merlokk 2018-10-27 00:49:43 +03:00
• b2db22b134 json works merlokk 2018-10-27 00:38:57 +03:00
• c8a0f55031 Mfp read plain (#704) Oleg Moiseenko 2018-10-26 20:18:53 +03:00
• 167fbc8620 load works. needs some refactoring... merlokk 2018-10-26 19:50:37 +03:00
• c1a23412ba save to json merlokk 2018-10-26 19:25:13 +03:00
• dc78d947c9 typo fix merlokk 2018-10-26 16:52:02 +03:00
• dde1b2413c add DropField(); merlokk 2018-10-26 16:48:45 +03:00
• 528c3c6fc2 added fido2 info merlokk 2018-10-26 16:44:48 +03:00
• cdc9a7562d inc timeouts (#705) Oleg Moiseenko 2018-10-26 15:43:06 +03:00
• a649296d25 inc timeouts merlokk 2018-10-26 15:02:25 +03:00
• 8dbe4330e8
  Merge branch 'master' into fido Oleg Moiseenko 2018-10-25 20:25:07 +03:00
• 4f053ca0ef small fix merlokk 2018-10-25 16:45:46 +03:00
• 6bb33f3776 added verbose mode merlokk 2018-10-25 16:44:17 +03:00
• ec8b84e42f added license merlokk 2018-10-25 16:26:06 +03:00
• cd1eca73fa aes-cmac added to cryptosystem. not works( merlokk 2018-10-25 15:17:32 +03:00
• 091f80bb1f added aes-cmac-128 merlokk 2018-10-25 15:16:51 +03:00
• dea1b37104 logic fixes. works merlokk 2018-10-24 23:55:09 +03:00
• 9f8098f1e7 read plain works merlokk 2018-10-24 23:45:17 +03:00
• ae3340a0fb Mfp commands (#698) Oleg Moiseenko 2018-10-24 19:58:12 +03:00
• 3685f89cbd small fix to please @dmaij's compiler (issue #703) pwpiwi 2018-10-23 19:50:37 +02:00
• fc1ba37cd4 add changelog merlokk 2018-10-23 09:52:08 +03:00
• 8c6cca0ba1
  Fix hf 15 sim (#696) pwpiwi 2018-10-23 08:22:13 +02:00