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

• 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
• 3f41e73c7f PSK demod adjustment marshmellow42 2015-02-22 20:09:58 -05:00
• 3bc66a96fe added PSK2 to lf simpsk marshmellow42 2015-02-21 22:54:52 -05:00
• 872e3d4d6f NEW lf simpsk marshmellow42 2015-02-21 21:36:02 -05:00
• b4a2fcf676 Split output from nrz raw demod function marshmellow42 2015-02-21 18:37:15 -05:00
• b19caaefc2 Fixed minor bugs in iclass fullsim, does not work yet though Martin Holst Swende 2015-02-21 20:47:40 +01:00
• 4ac906d1c2 split output from rawdemod functions marshmellow42 2015-02-21 00:27:48 -05:00
• 40148ab609 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-19 21:38:17 -05:00
• abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" marshmellow42 2015-02-19 21:35:34 -05:00
• e396001c47 Revert "lf simask, lf simfsk and bug fixes" marshmellow42 2015-02-19 21:22:05 -05:00
• fb0c84c3df lf simask, lf simfsk and bug fixes marshmellow42 2015-02-19 21:21:11 -05:00
• f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-19 11:32:11 +01:00
• 0387cd3393 Merge pull request #68 from iceman1001/feature Martin Holst Swende 2015-02-19 10:51:10 +01:00
• 181e6db6a9 Merge pull request #67 from marshmellow42/master Martin Holst Swende 2015-02-19 10:50:51 +01:00
• 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing Martin Holst Swende 2015-02-19 10:48:33 +01:00
• b67f7ec359 Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode Martin Holst Swende 2015-02-18 20:02:44 +01:00
• 9a9bcea82b Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper Martin Holst Swende 2015-02-17 23:17:43 +01:00
• 41524d8a39 Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem Martin Holst Swende 2015-02-17 22:07:40 +01:00
• 0853ffa29c ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's iceman1001 2015-02-16 19:01:09 +01:00
• 33315928fb CHG: added some more token-tags. iceman1001 2015-02-16 19:00:17 +01:00
• 3a72fdf5b0 CHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed. iceman1001 2015-02-16 19:01:52 +01:00
• 5b3811fc0e ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's iceman1001 2015-02-16 19:01:09 +01:00
• bd8baee9df CHG: added some more token-tags. iceman1001 2015-02-16 19:00:17 +01:00
• d716ca2fc1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-16 18:59:44 +01:00
• 8db0534ed1 Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-14 21:16:27 -05:00
• cc2ea5ed82 Clean up Helps and command descriptions marshmellow42 2015-02-14 21:15:13 -05:00
• e80aeb9695 Started iclass emulator support on device side. Not functional yet Martin Holst Swende 2015-02-14 21:30:26 +01:00
• a4749080d9 Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side Martin Holst Swende 2015-02-14 21:18:39 +01:00
• 534445139c Reformatted Martin Holst Swende 2015-02-14 21:17:08 +01:00
• 7781a65656 Started work on 'hf iclass eload' - only client side so far, not yet supported in the device Martin Holst Swende 2015-02-14 21:15:53 +01:00
• 428d622160 Fixed bug with iclass dump which prevented saving to file Martin Holst Swende 2015-02-14 20:42:23 +01:00
• 0cd2a41ac0 Made 125KHz default sampling, instead of 134KHz for LF Martin Holst Swende 2015-02-14 19:55:23 +01:00
• 6af88242eb Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-14 12:30:08 +01:00
• 68008fb517 add: timeouts for "lf read" chg: change command consistency "lf t55xx rd" -> "lf t55xx read" chg: buffer size used for armside is quite big. maybe to big. takes too long to read. iceman1001 2015-02-14 12:29:02 +01:00
• abd16c456a fix help on data rawdemod commands marshmellow42 2015-02-13 21:17:15 -05:00
• 2e2fc9fa6b Merge branch 'master' of github.com:Proxmark/proxmark3 Martin Holst Swende 2015-02-13 19:59:50 +01:00
• 699bb9dc27 Removed some dev- printouts Martin Holst Swende 2015-02-13 19:59:28 +01:00
• b359cee677 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-13 10:16:39 +01:00
• 4e7af352b4 chg: step two for t55xx commnads iceman1001 2015-02-13 10:16:21 +01:00
• 17c60b1248 Merge pull request #63 from marshmellow42/master Martin Holst Swende 2015-02-13 10:11:40 +01:00
• 37735250ca Merge pull request #66 from iceman1001/feature Martin Holst Swende 2015-02-13 10:11:09 +01:00
• 31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-12 09:54:21 +01:00
• 8b9393d3bd fixed issue #65 Martin Holst Swende 2015-02-12 08:21:58 +01:00
• 19a700a8b5 hf 14a: if the tag supports it, set default timeout according to ATS hf epa: remove explicit but arbitrary timeout settings Bugfix: don't timeout when frame transmission has already started pwpiwi 2015-02-11 18:30:36 +01:00
• 7554370c30 bugfix hf 14a sim / hf mf sim: polarity of tag subcarrier modulation was wrong pwpiwi 2015-02-11 21:14:34 +01:00
• 070e36d421 ADD: identification of EM4233 iceman1001 2015-02-11 17:08:16 +01:00
• 0310364d23 chg: the inital modification of t55xx commands to use Marshmellows new demod functions. fix: merged readblock & readblockPWD command. New syntax: "lf t55xx rd <block> <password>" -- OPTIONAL password iceman1001 2015-02-11 17:13:30 +01:00
• 00a863f9ad ADD: identification of EM4233 iceman1001 2015-02-11 17:08:16 +01:00
• 4ecde0e1ff Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 21:53:16 +01:00
• 24cbeb3d27 Merge pull request #58 from Proxmark/GenericTracing Martin Holst Swende 2015-02-10 21:27:47 +01:00
• 61972abbdd Merge branch 'master' into GenericTracing Martin Holst Swende 2015-02-10 21:25:14 +01:00
• 1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 09:01:31 +01:00
• 2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 iceman1001 2015-02-10 08:58:14 +01:00
• 92bf686817 Merge pull request #64 from jessegit/csetuidfix pwpiwi 2015-02-10 07:27:06 +01:00
• 3bba7deac0 Add settable ATQA and SAK to hf mf csetuid command. Jesse Hallio 2015-02-10 04:31:53 +02:00
• 7e72f90a7f Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-09 16:47:24 -05:00
• 0d0d049967 hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected. pwpiwi 2015-02-09 08:53:39 +01:00
• 19ff0210fa lf data combine rawdemods & depreciate cmds marshmellow42 2015-02-09 16:25:12 -05:00
• 904a96cd80 Merge pull request #59 from marshmellow42/master Martin Holst Swende 2015-02-09 20:28:12 +01:00
• f3bf15e484 lf/data combined detectclock functions to one marshmellow42 2015-02-09 11:11:04 -05:00
• 0c8d25ebd8 Fixed: hf mf sim failed on fast reader responses In Miller Decoder: don't wait too long for a stable signal In Miller Decoder: Don't accept sequences of four or more zeroes as start bit In EmSendCmd14443aRaw: don't wait for emptying the FPGA delay queue if it isn't filled pwpiwi 2015-02-08 22:14:20 +01:00
• 6d3e6c740b Merge pull request #60 from pwpiwi/master pwpiwi 2015-02-08 22:09:42 +01:00
• b4fb11ba92 fix inconsistent spacing within functions marshmellow42 2015-02-08 00:48:00 -05:00
• beefe5bc4d Minor dox Martin Holst Swende 2015-02-07 21:22:53 +01:00
• 665775c844 Some documentation and formatting to LogTraceHitag Martin Holst Swende 2015-02-07 21:05:14 +01:00
• aabb719dc4 Moved LogTraceHitag to BigBuf (no changes to the function ... yet) Martin Holst Swende 2015-02-07 20:55:17 +01:00
• 3000dc4e7e Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible Martin Holst Swende 2015-02-07 20:49:40 +01:00
• 3b692427ac Bugfix hw tune, hf tune: voltage measures were VERY wrong Modified hw detectreader: display reader field strength in mV units and to be less phony pwpiwi 2015-02-03 07:21:57 +01:00
• be2cf126bf Merge remote-tracking branch 'upstream/master' marshmellow42 2015-02-06 14:45:46 -05:00
• 6de4350803 data askraw patches, data askedgedetect demod, marshmellow42 2015-02-06 14:36:25 -05:00
• 7d5ebac993 Merge branch 'master' into GenericTracing Martin Holst Swende 2015-02-06 08:41:02 +01:00
• e770c64824 lf psk/nrz split, add maxErr argument marshmellow42 2015-02-05 17:01:18 -05:00
• 146c201cbe Merge pull request #55 from jessegit/master Martin Holst Swende 2015-02-05 19:43:46 +01:00
• b37235637f Merge pull request #57 from iceman1001/feature Martin Holst Swende 2015-02-05 19:43:26 +01:00
• bb42a03ef1 Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission Martin Holst Swende 2015-02-05 19:40:47 +01:00
• 5c2b11eb3c FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead. iceman1001 2015-02-05 15:43:50 +01:00
• e57fe796f5 FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead. iceman1001 2015-02-05 15:43:50 +01:00
• 73a1c1bb97 Merge pull request #56 from iceman1001/feature Martin Holst Swende 2015-02-05 15:28:18 +01:00
• a6cfa75035 add: lots of new toytypes in default_toys.lua fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua) add: showing bytes for trap-types in tnp3dump.lua iceman1001 2015-02-04 11:40:49 +01:00
• 385f398740 prepare to update the LF T55XX commands iceman1001 2015-02-04 11:48:36 +01:00
• a8d4906ba5 add: lots of new toytypes in default_toys.lua fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua) add: showing bytes for trap-types in tnp3dump.lua iceman1001 2015-02-04 11:40:49 +01:00
• e9281ae812 Add flasher from SVN r623 for HID bootprom and current Mac OS X kext Jesse Hallio 2015-02-03 23:22:39 +02:00
• 1f78a4d305 Merge pull request #54 from Proxmark/lf_recorder Martin Holst Swende 2015-02-02 19:54:07 +01:00
• 0644d5e3a3 Merged with master Martin Holst Swende 2015-01-31 18:21:38 +01:00
• c856ceae8a Fixed undecimation command Martin Holst Swende 2015-01-31 12:42:40 +01:00
• 698b649e0e Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side Martin Holst Swende 2015-01-31 00:05:04 +01:00