Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

unstable

#1

#101

#102

#1021

#1021

#1033

#1033

#1034

#1035

#1035

#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

• 6ca4c6463e Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops Martin Holst Swende 2015-01-03 14:16:05 +01:00
• 45dda9fcd7 Merge pull request #34 from marshmellow42/master Martin Holst Swende 2015-01-01 13:46:48 +01:00
• 7eefddcc58 Revert "problems creating pull request with the new traces" marshmellow42 2014-12-31 15:24:37 -05:00
• e33b652c53 problems creating pull request with the new traces marshmellow42 2014-12-31 15:16:02 -05:00
• ac914e56db minor adjustment to askmandemod for lf search marshmellow42 2014-12-31 14:55:58 -05:00
• 9ec1416ad2 added data rtrim command marshmellow42 2014-12-31 14:43:49 -05:00
• f822a063b3 lf demod code cleanup - added fskraw arguments marshmellow42 2014-12-31 02:27:30 -05:00
• d5a72d2fee LF demod/cmd code cleanup + new lf search marshmellow42 2014-12-30 16:08:33 -05:00
• 6bfa18eab4 Merge pull request #1 from Proxmark/master marshmellow42 2014-12-29 16:14:23 -05:00
• 2df8c07907 minor setting adjustments/cleanup marshmellow42 2014-12-29 15:58:59 -05:00
• 66707a3b3c LF Demod bug fixes and add lf em em410xdemod marshmellow42 2014-12-29 15:32:53 -05:00
• 7db5f1ca25 slight adjustment to include marshmellow42 2014-12-28 21:29:33 -05:00
• eb191de615 LF Demod streamlining marshmellow42 2014-12-28 20:33:32 -05:00
• 9e6dd4eb69 rename askrawdemod to askmandemod marshmellow42 2014-12-24 13:01:09 -05:00
• 0e74c023bd Created new detectclock function + EM decode addons marshmellow42 2014-12-24 11:48:41 -05:00
• cd48c19c31 minor askrawdemod adjustment if errors in demoding are found marshmellow42 2014-12-23 15:16:53 -05:00
• 2fc2150ea8 Add auto check for EM410x format to askrawdemod cmd marshmellow42 2014-12-23 12:00:13 -05:00
• 4be9e7507b Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-23 11:44:41 +01:00
• a088364e9c Merge branch 'master' of https://github.com/pwpiwi/proxmark3 pwpiwi 2014-12-23 11:26:10 +01:00
• 52bfb95543 bugfixes in iso14443a.c and hf 14a reader - introduced with the big frame and parity support (commit 6a1f2d82): tag responses with len%8 == 0 were dropped - thanks iceman for testing and finding - after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix. pwpiwi 2014-12-23 11:11:52 +01:00
• 7705bf4e37 fixed a bug in iso14443a.c which had been introduced with the big frame and parity support (commit 6a1f2d82) - thanks iceman for finding and testing pwpiwi 2014-12-23 11:11:52 +01:00
• ea7d657f75 minor fix - got too comment happy removing test code marshmellow42 2014-12-22 22:50:13 -05:00
• e888ed8e62 added new data askrawdemod command marshmellow42 2014-12-22 17:46:28 -05:00
• e688629475 Merge pull request #33 from pwpiwi/master pwpiwi 2014-12-20 21:56:12 +01:00
• 545f203826 adapted hf iclass list to new trace format pwpiwi 2014-12-20 18:46:13 +01:00
• ae2f73c12d put ask demod and mandemod marshmellow42 2014-12-19 12:39:41 -05:00
• b3b706693b Final touches on IO prox and HID prox demod marshmellow42 2014-12-19 12:14:27 -05:00
• db4de4d82f Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-18 19:42:49 +01:00
• 57642f63fa bugfixes hf epa cnonces - extended length (more than 1 byte) not handled correctly - nonces not printed on Windows due to type mismatch pwpiwi 2014-12-18 19:40:35 +01:00
• f10bf20c6c Format hf 14a list output for bigger frame sizes pwpiwi 2014-12-18 19:39:16 +01:00
• 8e9768399c minor change Martin Holst Swende 2014-12-18 14:46:38 +01:00
• 0eea34a2a3 Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data Martin Holst Swende 2014-12-18 14:41:17 +01:00
• 7496d8d822 Merge pull request #32 from marshmellow42/master Martin Holst Swende 2014-12-18 08:56:26 +01:00
• 2bdd68c370 unify/refactor hw tune and data tune - unified hw tune and Enio's great data tune - don't use BigBuf (and hardcoded Offset) - removed special handling of CMD_MEASURED_ANTENNA_TUNING in UsbCommandReceived() pwpiwi 2014-12-17 17:38:13 +01:00
• 083ca3de73 LF HID & IO prox fixes/options marshmellow42 2014-12-17 09:51:40 -05:00
• 471c514167 Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-12-16 07:47:02 +01:00
• 6a1f2d82bb bugfixes iso14443a (hf 14a commands) - buffers were too small to handle 256 byte frames - parity bits were only handled for up to 32 byte frames - trace format was inefficient - removed parity calculation from decoders in iclass.c (parity not used on air anyway) pwpiwi 2014-12-16 07:41:07 +01:00
• 6116c79618 Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0 Martin Holst Swende 2014-12-14 21:37:56 +01:00
• b160432340 Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2014-12-14 18:07:38 +01:00
• eabba3df7e Fix (iclass) Martin Holst Swende 2014-12-14 18:07:12 +01:00
• 4860172789 LF HID & IO prox demod translation addons marshmellow42 2014-12-13 20:23:59 -05:00
• f4bad97d92 Merge pull request #31 from dnet/patch-1 ikarus 2014-12-10 19:10:12 +01:00
• 0ff9a93966 Typofix: occurrences András Veres-Szentkirályi 2014-12-10 16:42:31 +01:00
• d6a120a25b Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060 Martin Holst Swende 2014-11-30 22:30:36 +01:00
• 8720c8f5d7 Increased Mifare Esave & Eload filename array to 255 from 20 unstable midnitesnake 2014-11-15 22:01:59 +00:00
• c936a22f19 Removed dupicate symbols midnitesnake 2014-11-09 11:40:22 +00:00
• 8b70b6e7c2 forgot one edit within the client for ultralight C and desfire midnitesnake 2014-11-09 11:37:07 +00:00
• 16a372ab75 Added the changes to armsrc for milfare ultralight C and Desfire commands midnitesnake 2014-11-09 11:30:29 +00:00
• a88dc6ab3b Added some previous work of splitting ultralight to its own c-file, ported Pentura_Prox's initial PoC for ultralight C and Desfire Cards. Needs more work but hopefully we can finish this. midnitesnake 2014-11-09 10:57:51 +00:00
• ca4714cd23 More coverity fixes Martin Holst Swende 2014-10-30 21:49:18 +01:00
• 0ce5620254 Merge pull request #23 from holiman/master Martin Holst Swende 2014-10-30 20:08:29 +01:00
• 4c6f2d48fb Merge pull request #2 from holiman/coverity_fixes Martin Holst Swende 2014-10-28 21:46:28 +01:00
• 2ed270a854 Coverity-fixes in armsrc Martin Holst Swende 2014-10-28 21:44:17 +01:00
• 97d582a692 More coverity findings Martin Holst Swende 2014-10-27 22:33:37 +01:00
• 90e278d3da Fixed several issues found using a coverity-scan Martin Holst Swende 2014-10-27 21:46:04 +01:00
• 77dfaa26db Merge pull request #1 from holiman/ioprox_fixes Martin Holst Swende 2014-10-27 19:13:30 +01:00
• 9cc8a1e588 Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now Martin Holst Swende 2014-10-25 22:42:27 +02:00
• b225678574 Some minor changes and some documentation Martin Holst Swende 2014-10-24 21:12:31 +02:00
• 1a5a0d7590 Fixed compilation issues, but functionality not tested Martin Holst Swende 2014-10-24 20:53:43 +02:00
• f97d4e2378 First try att merging with head Martin Holst Swende 2014-10-24 20:46:02 +02:00
• 92d255d3dc Merge pull request #22 from Proxmark/PenturaLabs-iclass-research Martin Holst Swende 2014-09-19 09:50:56 +02:00
• e6ee6c4cd1 Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research Martin Holst Swende 2014-09-19 09:45:38 +02:00
• c626c56ef5 hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition pwpiwi 2014-09-12 07:45:04 +02:00
• 79db03ef63 hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file - hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case. - hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin). if there are unknown keys, write 0xffffffffffff instead to the file. - provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from mf_default_keys.lua pwpiwi 2014-09-11 20:58:34 +02:00
• baeaf57950 fix/add support for 4K (and other non 1K) card sizes in hf mf commands - hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39 - hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards - hf mf dump (add): added (optional) card size parameter and support for non 1K cards - hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A) - hf mf restore (add): added (optional) card size parameter and support for non 1K cards - hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39 - hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number - hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number - hf mf eget (fix): displayed three instead of one block - hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility) - hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only - hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards pwpiwi 2014-09-10 19:04:50 +02:00
• fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys Martin Holst Swende 2014-08-29 09:11:36 +02:00
• 5b1311fba2 Various scripts from iceman Martin Holst Swende 2014-08-29 09:09:23 +02:00
• 6e2f51a06e add *.eml to .gitignore pwpiwi 2014-08-05 18:45:37 +02:00
• bfb6a143ea bugfix hf mf sim - an additional erronous byte was sent after SAK pwpiwi 2014-08-05 18:40:19 +02:00
• b03c0f2d86 bugfixes hf mf sim - output of debug messages caused communication failures due to timing issues. hf mf dbg 4 now required to see these debug messages. - changed help text for hf mf dbg - fixed minor bugs in help texts for hf mf sim and hf mf ecset - display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim pwpiwi 2014-07-30 21:23:02 +02:00
• c3c18b0632 hack to add missing directory structure for loclass binaries midnitesnake 2014-07-26 10:01:42 +01:00
• f028213f0e Unstable branch: ported iclass research from Pentura_Prox's previous proxmark implentation. midnitesnake 2014-07-17 11:09:30 +01:00
• 2e656c39eb Unstable Branch: commited minor improvments to io fskdemod midnitesnake 2014-07-17 09:38:08 +01:00
• 991f13f27d minor bugfixes to hf mf sniff and hf 14a snoop - tracing was not always enabled when starting hf mf sniff or hf 14a snoop - ATQA was displayed in wrong byte order in hf mf sniff - 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff - same for logfile names. - assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though) pwpiwi 2014-07-15 08:39:56 +02:00
• 9a573554e0 minor bugfix and enhancement to hf 14a reader - "SAK incorrectly claims ... " message was displayed incorrectly - now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp. pwpiwi 2014-07-15 08:35:27 +02:00
• c7324bef28 Bugfix hf 14a raw: number of bits sent was wrong when option -c was used without option -b v1.1.0 pwpiwi 2014-07-01 08:28:28 +02:00
• 1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 pwpiwi 2014-07-01 07:09:21 +02:00
• 9e28ee9f14 Only documentation and minor changes Martin Holst Swende 2014-06-30 11:23:14 +02:00
• 19d6d91fd5 hf 14a reader enhancement pwpiwi 2014-06-30 08:21:50 +02:00
• 9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( Martin Holst Swende 2014-06-30 00:20:40 +02:00
• aa41c6058a Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo Martin Holst Swende 2014-06-29 23:34:24 +02:00
• d2d0af8ca6 Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research Martin Holst Swende 2014-06-29 13:52:05 +02:00
• dbf732ee41 Minor Martin Holst Swende 2014-06-29 13:48:13 +02:00
• 74a3880283 Changes inorder for iclass dump to work correctly Midnitesnake 2014-06-29 09:25:31 +01:00
• 26c0d833ac Some minor changes [iclass-related] Martin Holst Swende 2014-06-28 22:57:48 +02:00
• 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research Martin Holst Swende 2014-06-28 20:52:37 +02:00
• 6c0f60ca7b Merge pull request #17 from Proxmark/iclass-fixes Martin Holst Swende 2014-06-28 12:50:09 +02:00
• 6db28145ea Merge remote-tracking branch 'origin/master' into iclass-fixes Martin Holst Swende 2014-06-28 12:47:40 +02:00
• 238c503c38 fpga/min_max_tracker.v: english iZsh 2014-06-27 23:28:56 +02:00
• 0dcf1ee3fd git housekeeping: - added *.log files to .gitignore - new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files pwpiwi 2014-06-27 19:23:42 +02:00
• 3b2fee43ea New LF edge detection algorithm + lowpass filter iZsh 2014-06-22 00:26:38 +02:00
• 42f57e0294 Merged with master Martin Holst Swende 2014-06-27 13:16:31 +02:00
• 77abe781af fix for better csns Martin Holst Swende 2014-06-27 12:52:28 +02:00
• c6b492aea1 Add images for wiki. gh-pages ikarus 2014-06-26 10:55:47 +02:00
• e17437f985 Keep the PM3 code repo clean of website/wiki stuff. ikarus 2014-06-26 10:50:23 +02:00
• 72b1090acf Bugfixes: - Byteorder was wrong when displaying ATQA in hf 14a read - 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids pwpiwi 2014-06-26 07:57:49 +02:00
• b014c96d68 new command "lf snoop" to snoop raw ADC values iZsh 2014-06-21 21:33:54 +02:00
• fa57f6e12e fpga/fpga_hf.v, fpga_lf.v, lo_edge_detect.v, lo_passthru.v, lo_read.v: copyright notice iZsh 2014-06-20 12:38:58 +02:00
• 62638f87db armsrc/fpgaloader.c: forgot the copyright notice iZsh 2014-06-20 12:29:58 +02:00
• 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. iZsh 2014-06-20 01:02:59 +02:00