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

• adaf8d48a5
  Merge 845e4f4acbc0dc5691bd3512675af2aee0ac66b9 into 6116334485ca77343eda51c557cdc81032afcf38 Yiheng Cao 2024-02-03 21:32:39 +08:00
• 845e4f4acb
  Backport CVE-2020-24370's patch Yiheng Cao 2024-02-03 21:29:27 +08:00
• e487809711
  Merge 8a3c48ba2d8cd37cd1742c1f4e3680cdd908b044 into 6116334485ca77343eda51c557cdc81032afcf38 Michael Farrell 2021-03-30 21:08:09 -04:00
• 28fd46f124
  Merge 14c765af6a61473bc7ef33b38f4350222486c79d into 6116334485ca77343eda51c557cdc81032afcf38 Vladimir Serbinenko 2021-03-30 21:08:07 -04:00
• 85d6ad4009
  Merge ccf82d598a45a2d81eaa5516be79830cb26fa9f7 into 6116334485ca77343eda51c557cdc81032afcf38 pwpiwi 2021-03-30 21:07:48 -04:00
• 39cb41eb18
  Merge e4957716021cc279b2f32bba2c9b4e49a212bd40 into 6116334485ca77343eda51c557cdc81032afcf38 g3gg0.de 2021-03-30 21:07:46 -04:00
• b04cfa0088
  Merge 956a725adb0e87b9b06507f33896854ef64de4cf into 6116334485ca77343eda51c557cdc81032afcf38 wh201906 2021-03-30 21:07:44 -04:00
• 6116334485
  Merge pull request #969 from pwpiwi/gcc10_fixes master pwpiwi 2021-03-30 08:59:58 +02:00
• cbecb8a209 gcc10 compiler fixes: - Check for availability of getenv_s() in argtable3.c pwpiwi 2021-03-18 08:25:16 +01:00
• d3f8d76d6c Fix gcc10 compiler warnings - update argtable3 to latest versions pwpiwi 2021-01-29 09:33:19 +01:00
• 8ac5d5cba1 Fix gcc10 compiler warnings - fix attribute format for MINGW in tinycbor/cbor.h - add pragma to prevent "unaligned pointer" warning in cmddata.c. We know what we are doing there. - whitespace fixes pwpiwi 2021-01-29 08:26:33 +01:00
• ad326d84ad Fix gcc 10 link issues - avoid linker error by providing string.[ch] in bootrom pwpiwi 2021-01-28 09:00:08 +01:00
• 555fa19773
  Cleanup armsrc/string.c and string.h (#964) pwpiwi 2021-01-25 09:27:38 +01:00
• efd0327132
  Avoid link error due to duplicate definition of blocknr in hitag.c and hitagS.c (#963) pwpiwi 2021-01-25 09:26:27 +01:00
• 91592df4ec Cleanup armsrc/string.c and string.h - remove unnecessary memxor(), strreverse(), and itoa() functions - Use correct types in function declarations and definitions - add memmove() function. Gcc may generate calls to memcmp(), memcpy(), memset() and memmove() pwpiwi 2021-01-25 09:16:59 +01:00
• 4f81d9007b Avoid link error due to duplicate definition of blocknr in hitag.c and hitagS.c pwpiwi 2021-01-24 18:50:57 +01:00
• 622dd1af3b
  Merge pull request #938 from pwpiwi/fix_printf_scanf pwpiwi 2021-01-22 17:34:42 +01:00
• 18ab921cd2
  Update cmdhf14a.c libin-ka 2020-10-16 13:19:05 +08:00
• e495771602 return an error when READBLOCK goes beyond tag size during emulation g3gg0 2020-09-13 15:42:25 +02:00
• 956a725adb Align the usage message wh201906 2020-08-23 10:10:47 +08:00
• 3aaa9c45ba Add downlinks mode for lf t55xx dump wh201906 2020-08-20 16:40:57 +08:00
• e6158a48ec
  Update README.md Iceman 2020-07-29 17:33:56 +02:00
• 4b27ca5cf6
  Merge pull request #943 from dgorbunov/patch-1 pwpiwi 2020-07-14 09:00:27 +02:00
• 79d9ddc584
  Add string.h Daniel Gorbunov 2020-07-12 10:13:15 -04:00
• dddbb67c40 send an ACK back upon emulation end g3gg0 2020-06-09 22:01:20 +02:00
• 8be3a37bb9 fix transmitting too many bytes to host in case of a failed SetPassSlixLIso15693 g3gg0 2020-05-19 01:19:27 +02:00
• 3d411bee02 removed some commands again moved internal commands to only build in standalone mode send NACK if DisablePrivacySlixLIso15693 fails g3gg0 2020-05-19 01:11:55 +02:00
• 98a67bc908 Fix some printf/scanf format strings pwpiwi 2020-05-11 14:46:22 +02:00
• 31e4c66f00 when emulating ISO15693, check for the correct address when addressed mode was selected g3gg0 2020-04-13 22:09:34 +02:00
• 2e69d17693 cancel blocking ISO15693 operations or standalone mode whenever USB packets appear g3gg0 2020-04-12 01:15:51 +02:00
• a9b59a1b07 added SLIX-L functions and extended hf 15 sim g3gg0 2020-04-11 23:03:42 +02:00
• ebf1404a81
  Merge pull request #926 from pwpiwi/fix_iso15693_fpga pwpiwi 2020-04-11 08:56:14 +02:00
• c85805b8a2
  update CI/.travis.yml (#929) pwpiwi 2020-04-09 09:19:25 +02:00
• e1d815d4a4 update CI/.travis.yml * drop checks for MacOS 10.11 and 10.12 * add checks for Ubuntu 16.04 and 18.04 * add libnewlib-arm-none-eabi as prerequisite on Ubuntu pwpiwi 2020-04-08 17:07:33 +02:00
• 852ecedc16
  compatibility fix: get_clocktime() is not always available pwpiwi 2020-04-07 09:04:47 +02:00
• 6792435739 fixing iso15693 * NOISE_THRESHOLD /= 2 (starting with c41dd5f it became a relative threshold) * remove superfluous reader initialization pwpiwi 2020-04-03 17:41:11 +02:00
• f66d28afcc Merge branch 'master' into fix_iso15693_fpga pwpiwi 2020-03-31 08:55:35 +02:00
• 7a53739728 fixing some fpga and iclass issues * make fpga_version_info.c phony and delete it on 'make clean' * wait for transfer to complete before returning from FpgaSendCommand() * log correct tag times in iclass simulation * shorten pulse from TC1 to TC0 in StartCountSspClk() * shorten ssp_frame pulse in fpga/hi_reader.v * some reformatting and whitespace fixes pwpiwi 2020-03-06 17:14:35 +01:00
• ccf82d598a
  minor fix pwpiwi 2020-03-21 12:11:16 +01:00
• 056f80a141 fix 'make install_kext' for hid-flasher * based on https://www.tonymacx86.com/threads/guide-installing-3rd-party-kexts-el-capitan-sierra-high-sierra-mojave-catalina.268964/ pwpiwi 2020-03-19 08:52:28 +01:00
• 5bc3841ad1
  fix 'hf mf perso' result feedback (#920) pwpiwi 2020-03-16 13:33:19 +01:00
• aa8ff592ae
  add a specific check function for static nonces (used in 'hf mf nested') (#911) pwpiwi 2020-03-16 13:32:00 +01:00
• 2b77cf710b fix 'hf mf perso' result feedback pwpiwi 2020-03-06 18:13:49 +01:00
• 9dd8c2af44 a simpler fix. Force POSIX compliance pwpiwi 2020-03-06 17:35:59 +01:00
• 687ee7236e compatibility fix: get_clocktime() is not a available with older glibc pwpiwi 2020-02-24 11:37:38 +01:00
• 05820ee736 minor fix, CHANGELOG update pwpiwi 2020-02-13 20:01:05 +01:00
• bedae7768c
  Merge pull request #913 from 0x2b3bfa0/patch-1 pwpiwi 2020-02-13 08:37:17 +01:00
• d5975d4dfc
  Merge pull request #1 from Proxmark/master andrerodr 2020-02-12 00:02:35 +01:00
• 8f831ceb0b Fix #912 Helio Machado 2020-02-09 18:04:46 +01:00
• d6e1d48284
  Merge pull request #910 from pwpiwi/small_USB_response pwpiwi 2020-02-06 21:49:15 +01:00
• ab1d75a294 add a specific check function for static nonces in 'hf mf nested' * uses a fixed nr_enc and does all the crypto operations on client * for all possible keys calculate par_enc and ar_enc and send them to device pwpiwi 2019-12-24 15:38:33 +01:00
• df7b80fecc fix WaitForResponse (without timeout) pwpiwi 2020-02-06 07:59:18 +01:00
• 01aa068b6f reenable intermediate "Waiting for a response from the proxmark..." message pwpiwi 2020-02-04 08:21:17 +01:00
• 3458bb279b replace msleep() by thread signalling in comms.c pwpiwi 2020-01-27 14:55:40 -05:00
• d2ca5dbfe8 uart_posix.c rework * added some LED handling in appmain.c (helped with debugging) * finally replaced the infamous device unlink by msleep(1000) * fixed some format strings in comms.c (with -DCOMMS_DEBUG) * made uart_receive() and uart_send() behave as described in header * some formating pwpiwi 2020-01-27 13:28:34 -05:00
• fd66752193 cleaning up uart_posix.c * whitespace fixes * sorting out #includes pwpiwi 2020-01-24 03:24:39 -05:00
• ac37ee816b Add missing includes pwpiwi 2020-01-23 17:02:33 -05:00
• 929b61c670 Always enable fast response mode (was enabled for flasher only) * ensure that CMD_ACK is used exclusively for the very last response of each PM3 operation. All Dbprintf() must be before. * always switch off field before exiting * append null packet for USB transfers % 64 bytes * reformatting and whitespace fixes pwpiwi 2020-01-23 22:07:17 +01:00
• b8ed9975e5 modify USB communications * use different data types for commands and responses * use variable length responses * maintain client/flasher compatibility with old format (e.g. when using old bootloader) * maintain bootloader compatibility with old format (e.g. when using old or RRG flasher.exe) * fix length of version string in appmain.c pwpiwi 2020-01-12 17:29:07 +01:00
• 867e10a5fd usb communication (device side) refactoring * merge cmd.c into usb_cdc.c * move back usb_cdc.[ch] to common/ * declare low level functions usb_read() and usb_write() and more functions as static * use cmd_receive() in bootrom.c and appmain.c * remove unused memory wasting csrTab[100] in usb_cdc.c * replace more byte_t by uint8_t * more whitespace fixes pwpiwi 2020-01-11 22:10:40 +01:00
• 72622d6429 usb communication (device side) housekeeping * move cmd.[ch] and usb_cdc.[ch] to armsrc * sorting out #includes * replace byte_t by uint8_t * some reformatting * whitespace fixes * (no functional changes) pwpiwi 2020-01-11 17:11:19 +01:00
• d00a30d56f
  Merge pull request #909 from pwpiwi/fix_button_break pwpiwi 2020-01-15 18:31:56 +01:00
• 6b34699adc fix "Sending bytes to proxmark failed" after BUTTON_PRESS() pwpiwi 2020-01-10 08:33:50 +01:00
• 1d04b933df appmain.c cleanup * reformatting * whitespace fixes * replace byte_t by uint8_t pwpiwi 2020-01-10 08:21:07 +01:00
• a749b1e58b
  speedup 'hf mf chk' (#901) pwpiwi 2020-01-09 15:42:31 +01:00
• d1009af506 speedup 'hf mf chk' * fix abort by pressing the PM3 button pwpiwi 2020-01-09 07:43:11 +01:00
• f0c48553cb
  fix hf search (#908) pwpiwi 2020-01-07 22:33:55 +01:00
• cff093d075 fix hf search * fix memory access violation in HF14B_Other_Reader() pwpiwi 2020-01-07 19:21:59 +01:00
• fef3084ec2
  fix gcc8 compiler warnings on string overflows (#905) pwpiwi 2020-01-03 07:17:21 +01:00
• ac2668f898 speedup hf mf chk * revert queuing change * instead allow arbitrary number of keys in MifareChkKeys() * and move progress printing to MifareChkKeys() pwpiwi 2019-12-30 14:55:52 +01:00
• 829b3b299b fix gcc8 compiler warnings on string overflows pwpiwi 2019-12-29 16:15:23 +01:00
• 766c978bd0 mf chk queue up the next set of keys to check (#1) uzlonewolf 2019-12-29 06:10:51 -08:00
• 24683e5381 fix drop_field handling pwpiwi 2019-12-29 12:51:30 +01:00
• a4ff62be63
  fix 'hf iclass writebl' and 'hf iclass clone' (#896) pwpiwi 2019-12-28 17:03:20 +01:00
• 1d4b67cb3d "hf mf ekeyprn d" doesn't works properly (#904) Phil 2019-12-28 14:04:46 +01:00
• d89dd848b7
  "hf mf ekeyprn d" doesn't works properly Phil 2019-12-27 22:44:04 +01:00
• 7d7d514ca6 speedup 'hf mf chk' * fishing for microseconds in TransmitFor14443a() * some reformatting pwpiwi 2019-12-24 16:01:04 +01:00
• e0ca05575c speedup 'hf mf chk' * add separate timeout for tag response to nr_ar * measure response time and use it for response timeout * don't drop field between keyblocks * some reformatting * some whitespace fixes pwpiwi 2019-12-19 18:38:38 +01:00
• 5a03ea993f Nested loop fix for static nonces uzlonewolf 2019-12-23 07:08:23 -08:00
• d7a3d17819 More column tweaks for 'N keys left' message LW 2019-12-23 06:40:15 -08:00
• 1f4789fe53
  fix 'hf 15 csetuid' (#890) pwpiwi 2019-12-20 08:25:14 +01:00
• 1f0ef06374 iso15693: decode WRITE_MULTI_BLOCK in 'hf list 15' pwpiwi 2019-12-20 08:22:23 +01:00
• fcf36b8b62 Column width tweaks for 'N keys left' message LW 2019-12-19 13:32:33 -08:00
• f3d287b9ad Fix width of 'N keys left' message LW 2019-12-19 02:06:25 -08:00
• ed58af887c Print keys remaining only every 10 seconds, and add estimated worst-case time LW 2019-12-19 01:56:20 -08:00
• 4792fbdf9b more cleanup LW 2019-12-18 19:21:00 -08:00
• a906a0f457 some cleanup and better error passing LW 2019-12-18 19:12:42 -08:00
• 4701e6111c finish removing 'not vulnerable to nested' error message LW 2019-12-18 02:32:30 -08:00
• 74da62269b remove 'not vulnerable to nested' error message LW 2019-12-18 02:29:39 -08:00
• 3772d1651a modify mfCheckKeys() to pass button press events upstream, don't abort nested when a static nonce is encountered, and modify nested to try multiple keys in a single operation LW 2019-12-18 02:26:40 -08:00
• b461e6e367 add tag nonce to error message LW 2019-12-17 19:56:14 -08:00
• fd32c73b4a fix a comment and remove unrelated 14b fix LW 2019-12-17 18:54:38 -08:00
• 141283ef1f add detection of static tag nonces LW 2019-12-17 18:50:03 -08:00
• 2f00f5a9b9 fix nested loop with cards that do not NACK LW 2019-12-14 01:43:44 -08:00
• 9b6d1f74da fix nested loop with cards that do not NACK LW 2019-12-14 01:41:16 -08:00
• 98a94f7000 fix 'hf iclass clone' * Drop field after dump and clone functions * If dumping AA1 with Credit Key, authenticate as Debit Key * Initialize reader when beginning to clone pwpiwi 2019-12-12 12:55:54 +01:00
• 72096cac73 fix 'hf iclass writebl' and 'hf iclass clone' * check for correct responses after block updates * reduce number of tries from 10 to 3 * Allow to override warning on attempt to clone blocks < 5 * add same warning and override option to 'hf iclass writebl' * some reformatting and minor refactoring pwpiwi 2019-12-06 18:41:43 +01:00
• e73c9f1bd4
  fix 'hf iclass chk' (#894) pwpiwi 2019-12-09 08:27:42 +01:00
• 763d1befc1 Bugfix: Output typing on print of HID card formats (#895) grauerfuchs 2019-12-06 10:06:24 -05:00
• 329f495fe9
  Update hidcardformats.c grauerfuchs 2019-12-06 09:51:18 -05:00