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

• f168b2633b MF Ultralight - Iceman's updates + mine marshmellow42 2015-04-29 18:27:31 -04:00
• 5023d4cea8 Merge pull request #99 from Drewgoo/patch-1 Martin Holst Swende 2015-04-29 08:00:25 +02:00
• b0c76dd2cf Update README.txt Drewgoo 2015-04-28 22:47:49 -06:00
• 2b90e3e670 Merge pull request #98 from marshmellow42/master Martin Holst Swende 2015-04-28 23:08:28 +02:00
• bdfb62b405 Iceman's script aes fix #93 marshmellow42 2015-04-28 15:53:07 -04:00
• e9b8d0dd6e Iceman's mf sim 7bt UID fix from #97 marshmellow42 2015-04-28 15:43:58 -04:00
• 4745afb647 Iceman's Issue #96 fix marshmellow42 2015-04-28 15:35:23 -04:00
• a3abb02897 Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-04-23 09:51:04 +02:00
• 0e6c7336b0 Fixed issue with dumping iclass tags > 2KB in size Martin Holst Swende 2015-04-23 09:50:44 +02:00
• cb8220ee76 Merge pull request #92 from marshmellow42/master Martin Holst Swende 2015-04-14 20:36:10 +02:00
• 8e0cf02308 minor change to lf em4x menu & iceman script... marshmellow42 2015-04-10 00:06:59 -04:00
• 664f658650 nexwatch fix .h file + icemans mf csetblk w arg marshmellow42 2015-04-08 15:08:05 -04:00
• 25d3e5cc83 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-04-08 14:19:19 -04:00
• 411105e036 added nexwatch demod & iceman lua marshmellow42 2015-04-08 14:19:03 -04:00
• 322f7eb111 fix to lf t5 detect/read cmds marshmellow42 2015-04-08 11:18:29 -04:00
• 9632ecbe3d update t5 detection test() marshmellow42 2015-04-08 10:12:24 -04:00
• 83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 Martin Holst Swende 2015-04-08 13:31:04 +02:00
• fef74fdce4 lf ask consolidation marshmellow42 2015-04-08 01:07:39 -04:00
• 49bbc60af3 lf cleaning++ marshmellow42 2015-04-07 00:53:06 -04:00
• cc15a1187b lf cleanup - fixes marshmellow42 2015-04-06 23:17:30 -04:00
• 2c772e6cf0 Added info to changelog about bootroom update Martin Holst Swende 2015-04-06 21:47:09 +02:00
• 1f918317e2 add maxErr to data manrawdecode marshmellow42 2015-04-05 21:59:36 -04:00
• 224ce36eb1 lf t5xx - icemans update marshmellow42 2015-04-05 16:37:41 -04:00
• 6306ff4bac Merge branch 'master' into topaz pwpiwi 2015-04-05 19:32:12 +02:00
• 2767fc0291 lf cleaning marshmellow42 2015-04-05 00:58:57 -04:00
• 643fb10b2d Merge remote-tracking branch 'upstream/master' marshmellow42 2015-04-04 21:29:16 -04:00
• acaeccf841 update changelog marshmellow42 2015-04-03 00:40:38 -04:00
• 6e98444637 lfdemod reduce duplicate code marshmellow42 2015-04-02 23:55:12 -04:00
• 23f0a7d862 lfem4x cleanup/add/fix marshmellow42 2015-04-02 12:48:52 -04:00
• 9795e535c9 Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf Martin Holst Swende 2015-04-01 09:24:29 +02:00
• f83c41c75b Merge pull request #89 from pwpiwi/image_shrink pwpiwi 2015-03-31 22:57:33 +02:00
• d5d6f22718 Merge pull request #91 from marshmellow42/master Martin Holst Swende 2015-03-31 22:11:19 +02:00
• 7009555e44 temporarily revert lfdemod float removal pwpiwi 2015-03-31 21:38:58 +02:00
• a4669d6ef3 small fix in t5 trace data marshmellow42 2015-03-31 11:30:16 -04:00
• 75cbbe9a69 remove floats per piwi marshmellow42 2015-03-31 10:49:06 -04:00
• e335ca2846 Reclaim more than 19K of ARM flash memory. - added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint) - removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image - moved the fpga images to the data section to avoid reserving unused space for a separate section pwpiwi 2015-03-31 08:01:23 +02:00
• c5847ae8af refactoring hf topaz reader pwpiwi 2015-03-28 18:06:21 +01:00
• 616970b3d1 Created a changelog, to be used in accordance with http://keepachangelog.com Martin Holst Swende 2015-03-30 07:51:45 +02:00
• caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found Martin Holst Swende 2015-03-29 21:49:58 +02:00
• 070e3c4305 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-27 23:49:14 -04:00
• f8f894a50f rawdemod param cleanup marshmellow42 2015-03-27 23:47:31 -04:00
• 2eec55c8a4 lfdemods streamline & bug fixes marshmellow42 2015-03-27 00:02:30 -04:00
• de15fc5fe3 add: hf topaz reader (basic functionality) pwpiwi 2015-03-24 07:17:00 +01:00
• 337288f9ac Merge pull request #86 from marshmellow42/master Martin Holst Swende 2015-03-25 20:23:41 +01:00
• e0165dcf3a Fixed indents to Tabs from Spaces marshmellow42 2015-03-25 14:24:36 -04:00
• 062e28912c Merge pull request #84 from marshmellow42/master Martin Holst Swende 2015-03-25 11:10:51 +01:00
• 327a690813 EM410x bug fix marshmellow42 2015-03-24 23:05:46 -04:00
• c7d169ec02 clean up em410x output marshmellow42 2015-03-24 22:11:32 -04:00
• 90677ad99b EM410x bug fix marshmellow42 2015-03-24 20:26:14 -04:00
• 90a8b82fb4 Merge pull request #82 from marshmellow42/master v2.0.0 Martin Holst Swende 2015-03-24 11:10:16 +01:00
• 9680b11d9e remove debugging print calls marshmellow42 2015-03-23 20:25:54 -04:00
• 1fbf895616 lf updates marshmellow42 2015-03-23 16:29:50 -04:00
• 13d77ef964 lf t5 read plus lf demod adjustments marshmellow42 2015-03-22 15:28:48 -04:00
• 48ece4a750 add: Topaz mode for "hf 14a raw" (new option -T) chg: allow tracing without parity chg: make "hf list topaz" aware of additional commands for Dynamic Memory Model pwpiwi 2015-03-20 21:06:51 +01:00
• 05ddb52c43 fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding() chg: use -O2 instead of -Os when compiling ARM sources chg: don't clear the Miller decoders input buffer on reset chg: be more specific for the Miller decoders start bit pattern add: new option c in hf list: mark CRC bytes (default is off) pwpiwi 2015-03-18 17:12:09 +01:00
• ef00343cb1 revert change "hf list topaz" to "hf list nfc" refactored Startbit detection in MillerDecoding() relaxed startbit detection in MillerDecoding() fixed CRC checking and CRC bytes marking in hf list fixed topaz multi frame command listing in hf list topaz pwpiwi 2015-03-17 07:41:08 +01:00
• 29a7954177 Merge pull request #80 from marshmellow42/master Martin Holst Swende 2015-03-16 14:03:48 +01:00
• 2147c30778 FIX EM Error marshmellow42 2015-03-16 08:39:18 -04:00
• 2e7e107c82 Merge pull request #78 from marshmellow42/master Martin Holst Swende 2015-03-16 11:39:03 +01:00
• b41534d142 adjust ask/biphase handling - more complete marshmellow42 2015-03-15 22:03:50 -04:00
• a8904ebd46 Change "hf list topaz" to "hf list nfc" fix: reduce length of expected unmodulated signal in Miller decoder in order to allow decoding of NFC reader communications add: hf list nfc: aggregate reader commands into one line add: hf list nfc: CRC check for NFC communications pwpiwi 2015-03-15 16:40:34 +01:00
• 7a8a982bde adjust pskdemod marshmellow42 2015-03-13 20:49:34 -04:00
• e74fc2ecba give credit where credit is due marshmellow42 2015-03-13 14:00:11 -04:00
• ee1eadee0f add: start to support Topaz tags - hf 14a reader now exits gracefully in case of proprietary anticollision sequence - changed miller decoder to handle Topaz 8 data bits/no parity frames from reader - started to implement hf list topaz pwpiwi 2015-03-13 07:36:52 +01:00
• 9f7bbd24c9 data autocorr additions marshmellow42 2015-03-13 12:23:26 -04:00
• 5279085ae7 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-13 11:20:00 -04:00
• d9d41e0f3f minor g-prox-ii demod fix marshmellow42 2015-03-13 11:18:55 -04:00
• 73d04bb417 data psk demod minor fixes, pyramid demod add CS marshmellow42 2015-03-13 11:09:12 -04:00
• 9185099ed8 Merge pull request #75 from pwpiwi/qtmakefile pwpiwi 2015-03-13 07:24:56 +01:00
• aaa9f05e31 Merge pull request #77 from Proxmark/usb_check Martin Holst Swende 2015-03-12 18:15:08 +01:00
• f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB Martin Holst Swende 2015-03-12 16:32:01 +01:00
• 04bc1c660b fix: hf 14a raw was broken (see http://www.proxmark.org/forum/viewtopic.php?id=2351) pwpiwi 2015-03-11 20:17:24 +01:00
• 8c04722db6 (issue #47) use Qt5 includes and libraries, if present pwpiwi 2015-03-10 19:00:39 +01:00
• 58e93ff593 Merge pull request #74 from marshmellow42/master Martin Holst Swende 2015-03-10 00:25:51 +01:00
• 1302428367 finish data printdemodbuffer command marshmellow42 2015-03-09 16:56:00 -04:00
• 16a95d76ac fix: (issue #73) hf mf cload didn't work. Add more annotations for Magic Cards operation. pwpiwi 2015-03-09 21:36:27 +01:00
• 5658e82e1e sim buffer max settings tests marshmellow42 2015-03-09 15:58:06 -04:00
• ada339a10f biphase bug fixes marshmellow42 2015-03-09 15:27:20 -04:00
• 30364d2711 fix: broken edge detector implementation in hi_iso14443a.v resulted in decreased sensitivity pwpiwi 2015-03-09 20:01:37 +01:00
• d66d484347 fixed rawdemod help options marshmellow42 2015-03-08 18:07:01 -04:00
• 712ebfa6df 1 bug fix + code trimming marshmellow42 2015-03-07 23:31:23 -05:00
• df51693f95 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-06 12:30:16 -05:00
• 78f5b1a77c lf sim fixes/creations correct now marshmellow42 2015-03-06 12:28:54 -05:00
• e09f21fa7b Revert "lf sim fixes/creations" marshmellow42 2015-03-06 12:26:33 -05:00
• 293de1bad7 lf sim fixes/creations marshmellow42 2015-03-06 12:25:36 -05:00
• 7843130a58 fix: (issue #72) LF simulation didn't work with lo_edge_detect.v v2.0.0-rc2 pwpiwi 2015-03-06 07:39:34 +01:00
• 9cefee6f42 Fixed issue #36 & improved file consistency. ikarus 2015-03-04 11:00:39 +01:00
• 39676885b4 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-03-03 20:44:37 -05:00
• 11081e0459 finish gProxII_Demod marshmellow42 2015-03-03 16:20:18 -05:00
• c8387e85e3 iClass full simulation of tags now officially works, with some cheating regarding reader update and write commands v2.0.0-rc1 Martin Holst Swende 2015-03-02 21:30:22 +01:00
• 27eabcdccb Added brackets around crc field in protocol listings Martin Holst Swende 2015-03-02 21:05:44 +01:00
• 40b9bb85e6 oops... should this file should not have been there marshmellow42 2015-03-02 14:44:05 -05:00
• 8d960002c8 lf cmds fix, add, show marshmellow42 2015-03-02 14:42:55 -05:00
• e5cd4ee4b4 Tag MAC finally works! (Full sim not yet, though) Martin Holst Swende 2015-03-02 20:14:35 +01:00
• 61fe90736b Implemented the correct way to calculate MAC from a tag, feeding it an extra 32 zeroes. Also divided it up into two parts, one of which can be precalculated by the device before the simulation begins Martin Holst Swende 2015-03-02 00:38:36 +01:00
• 73da818743 lf simulation tests marshmellow42 2015-02-28 14:33:05 -05:00
• c99dc845b1 Added the ciphers also.. doh Martin Holst Swende 2015-02-27 20:19:10 +01:00
• 188b2dbec4 Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-02-26 20:35:54 +01:00
• 10a8875c72 Implemented new optimized version of MAC-calculation for iclass Martin Holst Swende 2015-02-26 20:35:35 +01:00
• ec9882b18c PSKDemod Bug Fix marshmellow42 2015-02-22 21:11:25 -05:00