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

• 0c8200f11c text cleanup t55xx cmds marshmellow42 2015-10-23 13:05:40 -04:00
• 0472d76de4 The great work of Enio hf snoop is now ported into latest version in git you can find original work here https://github.com/EnioArda/proxmark3 etmatrix 2015-10-23 15:29:12 +02:00
• be2d41b73a updates to lf t55xx commands marshmellow42 2015-10-22 16:19:23 -04:00
• 1c8fbeb93e ADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command with password to wake tag up and be able to do a "LF SEARCH" etc on it. iceman1001 2015-10-21 09:12:33 +02:00
• f82894ba69 CHG: move some methods, its easier to read now. Cosmetic change. iceman1001 2015-10-21 09:07:36 +02:00
• 2efd639484 CHG: some cleanup of pcf7931.c iceman1001 2015-10-20 19:02:03 +02:00
• 9276e859a6 ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md iceman1001 2015-10-20 19:00:02 +02:00
• 00950b1c16 implementing hf mf hardnested - implemented nonce file reading (hf mf hardnested r) - implemented function to calculate the sum property of nonces - implemented functions to calculate the partial sum properties of crypto states - for testing only: calculate sum property of random crypto states and show probability distribution pwpiwi 2015-10-20 08:25:27 +02:00
• b87f99f4bb ADD: some more keys found on a pastebin iceman1001 2015-10-19 22:41:53 +02:00
• a826cb0df1 FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps... iceman1001 2015-10-19 22:39:08 +02:00
• 8e99ec25ed add wake option to t55xx read command marshmellow42 2015-10-17 15:01:26 -04:00
• 21a615cb3b begin update lf commands with help text and marshmellow42 2015-10-17 10:48:54 -04:00
• f14c9bf915 FIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIFARE_EML_MEMSET needs to sent the bytewitdh now with recent changes in code to deal with different sizes in emulatormemory. the third argument should be 16 instead of 0. iceman1001 2015-10-17 14:35:04 +02:00
• d8a3b6c117 FIX: @tony pointed out that there was a method name lost... its been reinstated :) iceman1001 2015-10-17 14:16:42 +02:00
• a739812e89 FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua ADD: @marshmello42 fixs for t55x7 iceman1001 2015-10-16 23:16:46 +02:00
• f1b74c3089 add lf t5 read w/pwd warning and checks marshmellow42 2015-10-15 21:26:23 -04:00
• 1da61a02fe started hf mf hardnested - acquire encrypted nonces - save nonces to file - modified iso14443a_select() to allow select without anticollision pwpiwi 2015-10-15 21:28:06 +02:00
• 7cfc777b0e lf t55xx code cleanup + marshmellow42 2015-10-15 14:53:49 -04:00
• 2f5436ff0d test iceman1001 2015-10-15 19:30:11 +02:00
• 952a812c00 FIX: a suggested fix for #136 where the "lf t55x7 read" command when called with a password. The call will now try loading the config block, decode it and see if PWD is set. If PWD Bit is set, the call will be allowed to execute. If PWD Bit is NOT set, the call will print a message and excute the call but without sending the password. If config block is not being able to read or decode, the call with print a warning message and exit the call. iceman1001 2015-10-15 19:17:20 +02:00
• 6a09bea427 CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong.. iceman1001 2015-10-15 11:30:37 +02:00
• e16054a468 CHG: minor updates in the T55x7 methods. added the LED_A_ON / LED_A_OFF to indicate when a T55x7 command is running. CHG: added some more comments to T55x7, next person who looks at this will have it easier. iceman1001 2015-10-15 11:00:07 +02:00
• ac2df3460a ADD: @marshmellows fixes for t55x7 reading signal. ADD: @marshmellows "diphase" definition for T55x7. MOV: extracted the aquisition from the t55x7 methods and put them inside lfsampling.c FIX: pcf7931 write, there is 16bytes in a block.. not 4 as I thought before. FIX: t55x7 lowered the WRITE_0 to 16. Even bigger gap. iceman1001 2015-10-15 10:23:15 +02:00
• 59b5b7e14c PCF-fix bytepos range from 0-3 to 0-15 marshmellow42 2015-10-15 01:31:52 -04:00
• f4eadf8a50 adjust lf t55xx read commands marshmellow42 2015-10-15 01:09:49 -04:00
• d10e08ae6e Clean up pcf7931 marshmellow42 2015-10-14 16:17:56 -04:00
• 368044201a FIX: The T55x7ReadBlock method, should not have the startgap since it indicats that it might be a write command. See if this fixes the bug. iceman1001 2015-10-14 11:39:51 +02:00
• 274e7dd110 FIX: fixed the "lf pcf7931 write" input validation. *untested* iceman1001 2015-10-14 11:16:43 +02:00
• be6250d31b Merge pull request #140 from marshmellow42/iclass Martin Holst Swende 2015-10-13 09:39:04 +02:00
• ba52aac40e FIX: Removed a arrat from the struct configPcf in "LF PCF7931" iceman1001 2015-10-12 21:49:11 +02:00
• 2285d9dd94 FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done. FIX: Added some more "clearCommandBuffer" calls before sending.. iceman1001 2015-10-12 21:30:54 +02:00
• 5ee53a0e75 ADD: There were lot of calls to enable tracing, but very few to turn it of afterwards in the methods. Don't know if it has some influence but can't hurt calling "set_tracing(FALSE);" when method returns. iceman1001 2015-10-11 19:14:17 +02:00
• 3bc7b13d23 ADD: @marshmellow42's decrypt crypto-1 method, ADD: @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare". iceman1001 2015-10-11 09:07:29 +02:00
• 8c6b22980c hf mf mifare: (finally) fix watchdog reset - minor changes to sync - try alternative strategies when debugging pwpiwi 2015-10-09 07:49:06 +02:00
• e98572a1e2 I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work* iceman1001 2015-10-07 23:00:46 +02:00
• f1f1aceaba fix changelog conflict marshmellow42 2015-10-07 09:38:07 -04:00
• c54dff4f4a Merge remote-tracking branch 'Proxmark/master' into iclass marshmellow42 2015-10-07 09:34:47 -04:00
• 4ff341efff fix help typo marshmellow42 2015-10-07 09:32:50 -04:00
• 1a5a73abae Add mifare crypto trace decryption utility marshmellow42 2015-10-07 00:24:55 -04:00
• f3cfe428f8 ADD: fixed some spelling misstakes in luascript. ADD: fixed some spelling misstakes in "hf mfu eload" help iceman1001 2015-10-05 21:25:00 +02:00
• 0de8e3874d A lot of changes... .. ntag simulation stuff from @marshmellows branch "ntag/sim" .. hf mf mifare fixes from @pwpivi. .. hw status command .. speedtest function from @pwpivi .. Viking Functionalities, (not a proper DEMOD, but a start) .. GetCountUS better precision from @pwpivi .. bin2hex, hex2bin from @holiman iceman1001 2015-10-04 18:01:33 +02:00
• dfb387bf0f hf mf mifare: - gracefully exit on unsuccessful syncs instead of hard watchdog reset pwpiwi 2015-09-30 20:59:50 +02:00
• 7624e8b21b hf topaz reader implementation: - read and display dynamic memory as well - display "locked" status per byte instead per block pwpiwi 2015-09-28 08:26:00 +02:00
• 14e2290be7 reversed first part. leave it with only 6 keys tested (6 out of 14 possibles) Johannes 2015-09-10 22:33:50 +02:00
• 0ee816d0d9 nested attack: really testing default/known keys and restarts nested attack with different found key if not all has been found, but last round added new ones. Johannes 2015-09-10 19:31:40 +02:00
• 9dd0ac57ed Merge pull request #138 from Dake01/master Martin Holst Swende 2015-09-08 21:04:24 +02:00
• 29c90533eb remove debug Dake 2015-08-27 08:58:15 +02:00
• fff58476af syntax corrective Dake 2015-08-26 16:01:08 +02:00
• 940d53098c corrective values Dake 2015-08-26 15:57:41 +02:00
• dc4300bafb add : writing on PCF7931 tags Dake 2015-08-26 15:53:49 +02:00
• b9ac0b18cb Merge 6c59a056162cc28180990c9a50a5aa2ba592e1b3 into 5d01f50ae1be5c7de81cc089d60d3bdbf80dc738 Dake01 2015-08-26 13:32:54 +00:00
• 6c59a05616 corrective of default value Dake 2015-08-26 15:31:44 +02:00
• d8766b8cd6 add : writing on PCF7931 tags Dake 2015-08-26 15:18:45 +02:00
• 8e21541e77 Merge branch 'master' into topaz pwpiwi 2015-08-25 07:53:00 +02:00
• 05beaa8dd8 MINOR CHG: help text change for the "lf t55xx config" command. change NZ into NRZ iceman1001 2015-08-12 21:39:29 +02:00
• a71c68bdf0 Merge pull request #4 from gcohen55/ubuntu_makefile Iceman 2015-08-04 09:34:24 +02:00
• 8fac5452b8 updated makefile, readme Gil Cohen 2015-08-03 23:07:57 -05:00
• 5d01f50ae1 Minor corrections Martin Holst Swende 2015-07-31 23:30:48 +02:00
• f68211671c Implemented data hex2bin and data bin2hex as per suggestion in http://www.proxmark.org/forum/viewtopic.php?pid=17504 Martin Holst Swende 2015-07-31 23:27:09 +02:00
• 67b7d6fa31 fix: avoid USB Speed Test timeout in case of slow transfer speeds fix: don't add CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K commands into command buffer pwpiwi 2015-07-31 20:05:30 +02:00
• a82c1ac827 FIX: A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command, where it causes the USB_COMMAND_BUFFER to overfill is corrected. The message: "WARNING: Command buffer about to overwrite command! This needs to be fixed!" was showing when it happens. The solution is not to add the CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K to the storeCommand function. iceman1001 2015-07-31 18:48:58 +02:00
• f62b5e1204 added @piwi 's usb speed test. iceman1001 2015-07-31 10:37:24 +02:00
• bfb01844fb add: USB Speed Test to hw status fix: choose Real Time Clock divider based on actual slow clock frequency pwpiwi 2015-07-29 18:52:43 +02:00
• 0db6ed9a71 Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags in SimulateIso14443aTag iceman1001 2015-07-29 01:10:06 +02:00
• b50b72551c Merge branch 'master' of https://github.com/iceman1001/proxmark3 iceman1001 2015-07-28 21:35:15 +02:00
• 5de79e20f1 MOD:: reverse back changes to 14443b.c ADD: the hid-flasher/usb_cmd.h wasn't up to date with how it's other file /common/usb_cmd.h looks like. ADD: utils.lua 14443v crc inside LUA. ADD: utils.lua ConvertAsciiToHex method and minor adjustments checks. iceman1001 2015-07-28 21:33:09 +02:00
• 75e4ee2f46 Merge pull request #3 from gcohen55/gitigupdate Iceman 2015-07-28 21:30:16 +02:00
• e1c6e9e8f1 iclass Write doMAC_N - rename variables to correct descriptions. marshmellow42 2015-07-28 15:20:19 -04:00
• 925e8aa978 gitignore updated because of new bin Gil Cohen 2015-07-28 14:05:42 -04:00
• da721c6b30 Merge pull request #134 from VERTCraig/master Martin Holst Swende 2015-07-28 19:00:19 +02:00
• 73d336ae1d Adding STL files for 3D printed coil forms Craig Young 2015-07-26 11:55:50 -04:00
• bbd19beced update books to app_areas. clearer. marshmellow42 2015-07-25 23:24:53 -04:00
• b82d809852 update iClass chip identification marshmellow42 2015-07-25 23:09:07 -04:00
• 85f581c79f fix typo marshmellow42 2015-07-25 22:22:19 -04:00
• 7a8344d0c9 document iclass additions marshmellow42 2015-07-25 22:11:54 -04:00
• d976c9ddb2 Merging changes from main repo Craig Young 2015-07-25 14:38:57 -04:00
• c89274cc60 Stand Alone Mode changes for NFC (part 2) Craig Young 2015-07-25 14:35:14 -04:00
• 3b4fa54235 REM: Remove a double pasted section of local variables. iceman1001 2015-07-24 20:34:31 +02:00
• 14e1862537 REM: removed a comment ADD: added the ISO14443b command to commands.lua iceman1001 2015-07-24 16:45:52 +02:00
• 3ac22ee1cf use read instead of readcheck except to auth marshmellow42 2015-07-23 01:12:02 -04:00
• 6427695bb4 ADD: using @holiman's "ubs_poll_validate_length() function in some device-side functions. -hitag2, -legicrf, HIDdemodFSK, CmDAWIDdemodFSK, CmdEM410xdemod, CmdIOdemodFSK iceman1001 2015-07-22 23:45:41 +02:00
• 11fe3a8975 REM: Removed a debugstatment iceman1001 2015-07-22 23:36:28 +02:00
• 7838f4beba MERGED: @holimans changes MERGED: @piwi changes MERGED: @marshmellows changes. iceman1001 2015-07-22 23:00:52 +02:00
• f445df401e ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list. iceman1001 2015-07-22 11:19:15 +02:00
• 987dfb66e2 changelog docs Martin Holst Swende 2015-07-21 23:21:16 +02:00
• e2012d1bd3 Implemented 'hw status' and 'hw ping', put back client-side cacheing of 'hw version' Martin Holst Swende 2015-07-21 23:18:51 +02:00
• 4d68ec02b2 iclass refactor/cleanup marshmellow42 2015-07-21 14:26:46 -04:00
• 6b659d2406 Merge remote-tracking branch 'upstream/master' into iclass marshmellow42 2015-07-20 21:26:35 -04:00
• de97b450a3 Merge 7f995242094dd4ccadb5a3ae15d2af2523746d3d into 85f011a55047c1249958f61cce69471536429c78 gustothebun 2015-07-20 22:37:01 +00:00
• 85f011a550 Merge pull request #133 from marshmellow42/master Martin Holst Swende 2015-07-21 00:27:09 +02:00
• 86a83668b5 Minor changes in iso1443-standalone mode Martin Holst Swende 2015-07-21 00:13:06 +02:00
• a40680f3ac Merge remote-tracking branch 'upstream/master' marshmellow42 2015-07-20 17:29:52 -04:00
• 865279ba89 Merge pull request #130 from VERTCraig/StandAlone14a Martin Holst Swende 2015-07-20 23:23:44 +02:00
• 1adb2023ce Merge pull request #131 from holiman/master Martin Holst Swende 2015-07-20 23:22:53 +02:00
• 23931c11d5 Minor fix with previous cache-removal Martin Holst Swende 2015-07-20 23:22:33 +02:00
• d2deaf7bcf Fixed some indentation Martin Holst Swende 2015-07-20 23:18:46 +02:00
• db2dc28d34 Reverted previous change to , I made it no longer cache previous results Martin Holst Swende 2015-07-20 23:17:55 +02:00
• aa53efc340 iclass additions marshmellow42 2015-07-20 13:41:40 -04:00
• 5b59bf20c7 FIX: "hf list 7816", the s-blocks is now also printed. FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me. I still have the problem with powerup of a 14b tag. I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer. iceman1001 2015-07-19 23:24:19 +02:00
• db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c ADD: @VERTCraig's AVID commands. iceman1001 2015-07-18 20:43:14 +02:00