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

• 3991b2ec6a Fix data mtrim marshmellow42 2017-03-30 12:05:03 -04:00
• 1f1f1955dc Fixed compile error in MinGW (#260) m2otech 2017-03-30 03:39:39 +02:00
• 2f967dc9e2 Removed _ftime_s redefine, calling _ftime directly m2otech 2017-03-30 02:32:54 +02:00
• 254e80c24b Fixed compile error in MinGW m2otech 2017-03-30 02:14:35 +02:00
• 107b43d31c Merge pull request #92 from RobDeBagel/patch-1 Iceman 2017-03-29 22:48:31 +02:00
• 48bb16e840 Merge pull request #93 from angelsl/android Iceman 2017-03-29 22:35:37 +02:00
• 396772c93a Fixes for compiling on Android angelsl 2017-03-30 01:41:07 +08:00
• f25c62c5ec Merge pull request #256 from pwpiwi/fast_select Iceman 2017-03-29 17:36:37 +02:00
• 06da1c3f4b Merge pull request #259 from marshmellow42/master Iceman 2017-03-29 17:12:55 +02:00
• f2ea55fb3c fix/update removeParity & fix securakey detection marshmellow42 2017-03-29 10:02:29 -04:00
• 2938b3cb12 Merge pull request #258 from marshmellow42/master Iceman 2017-03-29 07:39:40 +02:00
• c3caf0409c add lf securakey marshmellow42 2017-03-29 00:37:16 -04:00
• 9640aa75a6 Remove unnecessary x86 SSE 4.2 popcnt GCC flag Robert Jones 2017-03-29 14:09:00 +11:00
• 199c74a47f fix build error on kali in new noralsy marshmellow42 2017-03-28 18:15:43 -04:00
• a9968da347 add jablotron+noralsy lf tag definitions/cmds marshmellow42 2017-03-28 18:01:45 -04:00
• 160dba8697 Merge pull request #257 from marshmellow42/master Iceman 2017-03-28 16:04:27 +02:00
• b2f565142c fix copy paste header issue marshmellow42 2017-03-28 09:11:29 -04:00
• 5bce72d5e3 split lf paradox/nexwatch into own files marshmellow42 2017-03-27 18:04:20 -04:00
• f7639bc338 FIX: lf sim was broken since my little tests. Should work again. iceman1001 2017-03-27 14:59:49 +02:00
• de77d4acde add: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedup hf mf chk (see http://www.proxmark.org/forum/viewtopic.php?id=2920) pwpiwi 2017-03-27 10:28:06 +02:00
• 9331855865 Merge pull request #254 from marshmellow42/master Iceman 2017-03-26 23:39:37 +02:00
• 488d309804 fix indentation warning marshmellow42 2017-03-26 17:35:16 -04:00
• 8169040a0a Merge pull request #253 from marshmellow42/master marshmellow42 2017-03-26 13:35:32 -04:00
• 3e8c61a522 fix missing header marshmellow42 2017-03-26 13:34:38 -04:00
• 79375850fd Merge pull request #252 from marshmellow42/master Iceman 2017-03-26 15:24:07 +02:00
• 9b99a6dbdb adjust lf menu descriptions marshmellow42 2017-03-26 08:46:45 -04:00
• d95878f802 Merge pull request #251 from marshmellow42/master Iceman 2017-03-26 14:35:42 +02:00
• 4db6f3bbb9 split fdx-b demod to its own file marshmellow42 2017-03-26 08:09:40 -04:00
• 7cd25ae5a3 Merge pull request #250 from pwpiwi/fix_mfkey Iceman 2017-03-26 13:05:26 +02:00
• dc2349ae77 fix mfkey tools (issue #247) - add -std=c99 -D_ISOC99_SOURCE to compiler flags - fix: include <string.h> instead of <strings.h> in mfkey64.c pwpiwi 2017-03-26 12:28:07 +02:00
• 1ee7925609 Merge pull request #249 from pwpiwi/parity Iceman 2017-03-26 08:28:43 +02:00
• fecfd86d3d Merge pull request #248 from marshmellow42/master Iceman 2017-03-26 08:26:30 +02:00
• 1f065e1dad Refactor parity functions - get rid of __asm function in crapto1.h, use gcc builtin function instead - make parity functions available in common directory pwpiwi 2017-03-24 23:50:50 +01:00
• 946a84c35b Split data askgproxiidemod to own file marshmellow42 2017-03-25 15:51:31 -04:00
• a7e0d39ce3 Merge pull request #246 from marshmellow42/master Iceman 2017-03-25 13:12:05 +01:00
• 28598e80c0 hitag sim fix marshmellow42 2017-03-25 07:49:53 -04:00
• edf751bb62 Merge pull request #245 from marshmellow42/master Iceman 2017-03-25 07:28:53 +01:00
• 0fb65a262b split lf indala[cmd] to lf indala [cmd] marshmellow42 2017-03-24 19:18:33 -04:00
• e1778858dd FIX: lf hitag : Mea culpa, simulation should not have reader_field on. thanks to @Tiberius and @aczid for pointing out one of my mistakes from 2014. iceman1001 2017-03-24 21:03:09 +01:00
• f513388ee0 Merge pull request #243 from pwpiwi/cleanup Iceman 2017-03-24 08:19:23 +01:00
• 42a6a3f87b Remove duplicate #include stdio.h pwpiwi 2017-03-24 07:53:52 +01:00
• 41f4bcabc6 Merge pull request #244 from marshmellow42/master Iceman 2017-03-24 07:46:34 +01:00
• 2b4898ec71 fix lf file includes to include own .h marshmellow42 2017-03-23 22:32:38 -04:00
• 4cb4b588c2 Deduplicate mfkey32 and mfkey64 - rename client/nonce2key.[ch] to mfkey.[ch] - leave only main() wrapper in tools/mfkey - add mfkey32 and mfkey64 to .gitignore pwpiwi 2017-03-23 18:06:14 +01:00
• bd2797de15 fix: compile issue on RasPi (http://www.proxmark.org/forum/viewtopic.php?id=4678) pwpiwi 2017-03-23 06:42:56 +01:00
• 275111f6ff Merge pull request #242 from marshmellow42/master pwpiwi 2017-03-23 06:38:22 +01:00
• f2fc0a9c4d move viking demod to respective file marshmellow42 2017-03-22 22:59:55 -04:00
• 9b952b29eb Merge pull request #241 from pwpiwi/ukbhit_fix Iceman 2017-03-22 22:39:28 +01:00
• dc0bd4169f Merge pull request #240 from marshmellow42/master pwpiwi 2017-03-22 22:27:02 +01:00
• cf4640b973 split io demod/pyramid demod to respective files marshmellow42 2017-03-22 17:16:43 -04:00
• 8c0ccdef35 fix: ukbhit() for OS X - don't use CMIN and CTIME - corrected comments pwpiwi 2017-03-22 22:15:24 +01:00
• bcec0edb97 Merge pull request #239 from marshmellow42/master Iceman 2017-03-22 21:02:52 +01:00
• ecbf82fe20 fix headers marshmellow42 2017-03-22 15:54:32 -04:00
• 6cd2eef44b split hid demod/awid demod to respective files marshmellow42 2017-03-22 15:49:01 -04:00
• 2f337fe8a3 Merge pull request #237 from marshmellow42/master Iceman 2017-03-22 15:51:00 +01:00
• 35aa230ee4 move em410x demod functions to cmdlfem4x.c marshmellow42 2017-03-21 18:42:11 -04:00
• bad2eb8587 Merge remote-tracking branch 'upstream/master' marshmellow42 2017-03-21 10:40:29 -04:00
• 7ac59a82ab Merge pull request #235 from marshmellow42/lfdemod_refactors pwpiwi 2017-03-21 15:38:18 +01:00
• 86b8ecb56e adjust ManchesterEncode marshmellow42 2017-03-21 09:53:14 -04:00
• bea6e7b0b6 Merge pull request #234 from pwpiwi/nonce2key Iceman 2017-03-21 08:49:27 +01:00
• 2d42ea1e4d add bitswap option for lf em 4x05write (#236) marshmellow42 2017-03-21 03:26:26 -04:00
• 7779d73c71 Code cleanup: Refactoring nonce2key - include nonce2key() in mifarehost.c - remove tools/nonce2key - simplify mifare_autopwn.lua pwpiwi 2017-03-11 18:32:53 +01:00
• de867f502f fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) (#233) pwpiwi 2017-03-20 21:05:26 +01:00
• dbb4e93ad7 Merge pull request #90 from 4m4rOk/master Iceman 2017-03-18 16:34:06 +01:00
• 8361ba2266 Updated clone/sim cmd help + minor text fixes Luca 2017-03-18 15:19:51 +01:00
• ef6e8a0a91 Merge 9002c20dfd into 02069dbbdb bigboyq 2017-03-17 06:48:10 +00:00
• ec187c2f9f line break marshmellow42 2017-03-15 11:07:52 -04:00
• 6f36848f9e refactor pskdemod - remove nrz.._ext marshmellow42 2017-03-15 10:53:32 -04:00
• 56de46b466 further refactor marshmellow42 2017-03-14 17:08:58 -04:00
• d87bf1567a move new functions to utilities area marshmellow42 2017-03-14 16:24:14 -04:00
• c83d6dc6fa continue refactor detectST marshmellow42 2017-03-14 16:20:15 -04:00
• c9ad641b61 Merge remote-tracking branch 'upstream/master' marshmellow42 2017-03-14 14:48:31 -04:00
• 713045f819 add bitswap option for lf em 4x05write marshmellow42 2017-03-14 14:42:01 -04:00
• cb86f8d69f wasn't ready for these yet... marshmellow42 2017-03-14 13:18:20 -04:00
• 127f149075 add first attempt at lf miller decoding marshmellow42 2017-03-14 13:16:30 -04:00
• e2b9033bde fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all NACK) added readme.txt again in tools/nonce2key pwpiwi 2017-03-14 08:48:19 +01:00
• 966c111e8c chg: too many \ slashes iceman1001 2017-03-14 08:37:13 +01:00
• f1202c3fa9 textual (piwi) iceman1001 2017-03-14 08:30:46 +01:00
• 76a608af8e CHG: extern methods. ADD: BSWAP_64 iceman1001 2017-03-14 08:30:17 +01:00
• 549daaf778 fixed bug in new refactored detectST marshmellow42 2017-03-13 13:27:38 -04:00
• 14d6c4fc34 chg: cleaning out timing. chg: makefile (piwi) iceman1001 2017-03-13 09:45:46 +01:00
• d5051b9817 meant to put clock detection before demods marshmellow42 2017-03-12 23:11:52 -04:00
• bf74114d50 refactor detectST a little... marshmellow42 2017-03-12 22:57:01 -04:00
• 4d3c179669 re-organize lfdemod.c marshmellow42 2017-03-12 22:47:50 -04:00
• 02069dbbdb fix: add missing #includes pwpiwi 2017-03-12 18:39:47 +01:00
• 0691975406 fix: add missing #includes pwpiwi 2017-03-12 18:36:24 +01:00
• acf0582d53 Provide msclock() as Milliseconds timer for performance measures (#231) pwpiwi 2017-03-12 15:06:27 +01:00
• 0ca9bc0e99 Upgrade crapto1 library to v3.3 (#232) pwpiwi 2017-03-12 15:05:54 +01:00
• 9298eeae95 Upgrade crapto1 library to v3.3 - fix standalone tools mfkey32, mfkey64 and nonce2key to use common crapto1 library - fix compiler warnings in tools/mfkey/mfkey64.c and tools/nonce2key/nonce2key.c - allow crapto1.c to compile on ARM hosts - add @iceman1001's readme.txt to tools/mfkey pwpiwi 2017-03-11 08:46:09 +01:00
• 669959bc5c started to enable demod graphing marshmellow42 2017-03-11 19:21:53 -05:00
• 62fab50902 Create directory client/obj/crapto1 (missing in commit 33443e7) pwpiwi 2017-03-11 08:50:32 +01:00
• 33936c2155 Merge pull request #89 from angelsl/mfsetmod Iceman 2017-03-10 16:46:12 +01:00
• d6a00902fc Provide msclock() as Milliseconds timer for performance measures - don't use clock(). It has different functionalities in Windows and Linux - move sleep functions to util.h pwpiwi 2017-03-09 18:08:18 +01:00
• 905c55de2b ADD: analyse nuid - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1 has this option as a activation sequences. This NUID is also used for authenticate (cuid), not the block0 data. ref: http://www.gorferay.com/mifare-and-handling-of-uids/ iceman1001 2017-03-10 09:48:36 +01:00
• ece631fd06 Add Mifare Classic EV1 set load modulation command angelsl 2017-03-09 21:36:19 +08:00
• 86fdf240e0 ADD: starting merge @holiman 's graphic branch. iceman1001 2017-03-09 11:21:25 +01:00
• be67483e63 syntax sugar iceman1001 2017-03-09 11:19:30 +01:00
• 33443e7caa Code cleanup: deduplicate crapto1 library (#228) pwpiwi 2017-03-09 11:12:50 +01:00
• 7663c35c73 Merge branch 'master' of https://github.com/iceman1001/proxmark3 iceman1001 2017-03-09 10:26:16 +01:00
• b9534ca070 FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHexToAscii. Now its optional. iceman1001 2017-03-09 10:26:01 +01:00