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

• a3bd24b5dc Merge pull request #230 from zhovner/master Iceman 2017-03-08 12:20:47 +01:00
• 45095b0178 Adding homebrew tap method for macOS Pavel Zhovner 2017-03-08 14:16:33 +03:00
• 6143f8ccf1 Merge pull request #229 from marshmellow42/master Iceman 2017-03-08 06:42:08 +01:00
• 8b6abef506 add iceman1001 s lf visa2000 commands marshmellow42 2017-03-07 08:48:16 -05:00
• f45a6f4fb5 Update CHANGELOG.md Iceman 2017-03-07 14:41:08 +01:00
• 420f5fe972 Update CHANGELOG.md Iceman 2017-03-07 14:40:27 +01:00
• c9778481ff Update README.md Iceman 2017-03-07 14:39:30 +01:00
• 672d72de89 CHG: lf visa2000 demod - adding the commandcall, allowing for demods of graphbuffer. (@marshmellow42) CHG: lf visa2000 read - adapting number of samples, from 12000 -> 12500. (@marshmellow42) iceman1001 2017-03-07 08:26:17 +01:00
• 85c12bc69d Code cleanup: deduplicate crapto1 library - merge the existing 4 crapto1 sources into common/crapto1 pwpiwi 2017-03-07 08:22:21 +01:00
• 300bb58ac1 Merge pull request #227 from pwpiwi/client_fixes pwpiwi 2017-03-06 22:19:15 +01:00
• 7cb8516cb5 Client code cleanup: - cleanup some header files and respective #includes - rearrange functions (definition before first use) - use SCNxxx instead of PRIxxx macros in scanf() - use stdbool true/false instead of self defined TRUE/FALSE pwpiwi 2017-03-06 20:07:02 +01:00
• 7ea23ef5b3 Merge pull request #226 from pwpiwi/fix_defines Iceman 2017-03-06 20:46:09 +01:00
• 571324a5c4 Merge pull request #225 from pwpiwi/armsrc_header_fixes Iceman 2017-03-06 20:45:58 +01:00
• c44c2f04d9 Fix some #defines - Use -D_ISOC99_SOURCE instead of -D__USE_MINGW_ANSI_STDIO=1 - WIN32 is deprecated. Use _WIN32 instead pwpiwi 2017-03-06 19:55:23 +01:00
• 6795b3da93 CHG: compiler warning about not using fscanf return value. iceman1001 2017-03-06 19:24:50 +01:00
• b8e461ff61 Remove local armsrc/stdint.h and fix some other #includes pwpiwi 2017-03-06 19:22:35 +01:00
• 57e1e31dce chg: unused .. but not for long iceman1001 2017-03-06 19:15:01 +01:00
• 57778a4630 CHG: renamed struct sector -> sector_t CHG: defines on armside CHG: #define WIN32 -> _WIN32 CHG: started to enhance "hf mf chkkeys" REM: removed some duplicates etc in default keys. iceman1001 2017-03-06 19:11:08 +01:00
• 1daaa80b78 Merge 0e043ec0fd04d4aeab938fb778643f3c226f9afe into 8a8e7c69149cb2c7510252fd03960a4eb0085b94 pwpiwi 2017-03-06 17:04:23 +00:00
• 0e043ec0fd Fix #includes in armsrc/optimized_cypher.c pwpiwi 2017-03-06 18:02:48 +01:00
• f3866be886 add untracked (forgotten) files pwpiwi 2017-03-06 17:47:41 +01:00
• 968bce7f1d Add empty .dummy files in order to add empty directories required at compile time pwpiwi 2017-03-06 16:43:15 +01:00
• 31e4ba9219 Merge branch 'master' into cleanup pwpiwi 2017-03-06 15:02:21 +01:00
• 2d65d28fc5 Code cleanup - deduplicate crapto1 library - deduplicate mfkey32, mfkey64 and nonce2key - replace -D__USE_MINGW_ANSI_STDIO=1 by -D_ISOC99_SOURCE - replace deprecated #define WIN32 by #define _WIN32 - remove armsrc/stdint.h pwpiwi 2017-03-06 14:29:42 +01:00
• 318bae20de removed some duplicates. iceman1001 2017-03-06 14:47:24 +01:00
• 8eeb3c6a0b CHG: And that should be everything cleaned up with unneed functions and calls. iceman1001 2017-03-06 11:53:55 +01:00
• 7dfa1b021e CHG: breaking, forgot some.. iceman1001 2017-03-06 11:50:26 +01:00
• 00baf27097 FIX: since the correctionNeeded logic changed, with PR #87 (https://github.com/iceman1001/proxmark3/pull/87) this is the consequence changes to it. iceman1001 2017-03-06 11:27:15 +01:00
• 81f9cbb188 Merge pull request #87 from timhir/master Iceman 2017-03-06 11:15:25 +01:00
• 17ab9dcca0 Improved logic for determining the correct Frame Delay Time (FDT) value based on the last bit transmitted by the PCD Timo Hirvonen 2017-03-06 11:39:12 +02:00
• dfcf20d641 FIX: Coverity Scan fixes to emvcmd.c among others. FIX: emclearmem bug. iceman1001 2017-03-05 18:43:06 +01:00
• 790bb5ae49 Merge pull request #86 from egon2/fix-85 Iceman 2017-03-05 18:22:17 +01:00
• 37a71c7a96 fixes #85 egon2 2017-03-05 16:19:26 +00:00
• dc873169cf FIX: lf visa2000 actually the parity is on the whole id. iceman1001 2017-03-05 17:13:43 +01:00
• fb26bb5436 FIX: lf visa2000 - identified unknown nibble in checksum. Is not checksum, but the even parity of the last 2bytes in ID. iceman1001 2017-03-05 16:56:24 +01:00
• bdeac4021a CHG: @marshmellow42 's XL size, and em4x05 timmings. iceman1001 2017-03-04 14:37:26 +01:00
• e0a241f76e CHG: plotting of clock iceman1001 2017-03-04 14:36:09 +01:00
• 5b8cc7cf26 textual change @4m4rOk iceman1001 2017-03-04 14:35:39 +01:00
• 2ec645e9d7 chg: more keys. iceman1001 2017-03-04 14:34:08 +01:00
• 8a8e7c6914 Merge pull request #223 from 4m4rOk/master Iceman 2017-03-04 13:54:44 +01:00
• 6ef3f9f219 Typo fix for CmdPing Luca 2017-03-04 13:38:57 +01:00
• 23bd68f944 Merge pull request #221 from jamchamb/clean-mfu-dump pwpiwi 2017-03-04 12:48:37 +01:00
• d172c17ca4 make clean_ascii a util function James Chambers 2017-03-03 18:04:58 -05:00
• 4bbf5ad17d clean up unprintable characters in MFU dump output James Chambers 2017-03-03 17:38:51 -05:00
• 91e9295761 FIX: had to make it clientside only iceman1001 2017-03-03 12:27:35 +01:00
• 88e7a6bfa7 FIX: travisCI complains. dummy -> dummy_sgc. iceman1001 2017-03-03 12:24:02 +01:00
• 9833360b25 chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex. iceman1001 2017-03-03 11:36:07 +01:00
• 1ec412d97d FIX: moved from lfdemod.c -> graph.c SetGraphClock. iceman1001 2017-03-02 21:15:01 +01:00
• aa9b584f5c FIX: removing nonexistent include file. iceman1001 2017-03-02 21:10:35 +01:00
• c6e5c7ea46 CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better. Still problem with finding the startindex... iceman1001 2017-03-02 21:00:51 +01:00
• a47ded5b54 ADD: data detectclock - added clock blocks in plot window. Its a draft. Not working for all clocks. ADD: STT is now marked as a block in plot window, instead of Marshmellow42 's two lines. iceman1001 2017-03-02 14:53:50 +01:00
• 99136c6eef CHG: finalized the merge between peter filmoores 14atagfuzz branch (emv). I seriously doubt anything works. iceman1001 2017-03-01 21:51:23 +01:00
• a9eeb57698 CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220 iceman1001 2017-03-01 20:14:46 +01:00
• 00ec24b9b5 Merge b75f4c6f102b1820a7205bf25d44a98afbd36f35 into f76d6fae10cc472dd874f71da353272069a53d01 douniwan5788 2017-03-01 08:24:37 +00:00
• f76d6fae10 Merge pull request #220 from marshmellow42/master pwpiwi 2017-03-01 07:08:50 +01:00
• ebd95febb8 update changelog marshmellow42 2017-02-28 17:44:19 -05:00
• f75b313b00 fix stt mark location bug marshmellow42 2017-02-28 17:28:51 -05:00
• ab812dfae5 implement marking the second STT when detected marshmellow42 2017-02-28 16:35:01 -05:00
• f9f0e83b7c Add 2 pre-setable markers for the graph marshmellow42 2017-02-28 15:53:33 -05:00
• b1ee7eed65 fix em410x XL bug marshmellow42 2017-02-28 13:32:23 -05:00
• c24364a8a4 FIX: @marshmellow42 's ST detection fix. FIX: lfops.c and em4x05 command timings. iceman1001 2017-02-28 19:20:12 +01:00
• 62a38cc883 adjust em4x05/em4x69 command timings to... marshmellow42 2017-02-28 13:18:52 -05:00
• dda5a928f0 fix STT bug for strong waves (or cleaned ones) marshmellow42 2017-02-28 11:53:55 -05:00
• 40c6a02bc9 Add a retry loop to hf mf dump marshmellow42 2017-02-28 11:09:42 -05:00
• 4eabb8ad38 CHG: minor LF adjustments. CHG: lf visa2000 - removed askedgedetect, it seemed it destroyed more than enhanced. iceman1001 2017-02-28 16:55:16 +01:00
• a8fd088d8b FIX: lf search - em410x demod was a bit greedy. iceman1001 2017-02-28 14:47:25 +01:00
• 026ac759a5 help text iceman1001 2017-02-28 14:09:10 +01:00
• 62cdba0568 CHG: hf em commands. Client side now has same commands as Peter Fillmores 14atagfuzz repo. OBS: not all exists on deviceside yet! iceman1001 2017-02-28 14:08:15 +01:00
• 96befa9ab1 upd text iceman1001 2017-02-28 08:36:01 +01:00
• f24edfec54 CHG: hf 14a read - started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client. FIX: lf read - ophs.. it works again. ADD: lf em 4x05-- - added a chipset definition CHG: better kali fix - from @pwpivi iceman1001 2017-02-28 08:16:02 +01:00
• 38231ce012 Merge pull request #219 from marshmellow42/master Iceman 2017-02-28 08:00:00 +01:00
• fac69c3d76 Adjust global variable name marshmellow42 2017-02-27 23:03:55 -05:00
• 8db18d2f15 ADD: hf 14a read - now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer. iceman1001 2017-02-27 19:18:38 +01:00
• a9d08ed0d5 fix for Kali Linux users (Issue #218) pwpiwi 2017-02-27 08:39:12 +01:00
• 41611deef9 CHG: some of @marshmellow42 's ref: 2b11c7c750 CHG: lf em 410x - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it. iceman1001 2017-02-27 14:04:50 +01:00
• 2b11c7c750 adjust timeouts on lf read/lf search to no timeout if threshold was set. marshmellow42 2017-02-26 21:44:40 -05:00
• c3a15ba92f FIX: should be defined earlier. iceman1001 2017-02-26 22:01:38 +01:00
• d216a5711b CHG: one step closer to finish merging @marshmellow42 's 4x05 changes. iceman1001 2017-02-26 21:32:51 +01:00
• b87ad7964e FIX: some compiler problems caused by PM3 master commit 4197a3f6ff for Kali users. discussed about in isssue ref: https://github.com/Proxmark/proxmark3/issues/218 iceman1001 2017-02-26 21:30:47 +01:00
• 1b6cc9746e FIX: removing compiler warning about double const. thanks to @spaceteddy ref: https://github.com/iceman1001/proxmark3/issues/83 iceman1001 2017-02-26 21:28:06 +01:00
• aa5cba4ca3 CHG: coverity scan cpmplains.. iceman1001 2017-02-26 00:40:19 +01:00
• d24026ade8 BUG: forgot to remove iceman1001 2017-02-25 23:14:55 +01:00
• d32691f1da FIX: hf mf sim - authentication works again. CHG: lf em- renamed. CHG: removed functionality in whereami.c, not needed. iceman1001 2017-02-25 23:00:20 +01:00
• 5a6a7affc5 Fix issues with commit 4197a3f on some linux distributions and old mingw environments (issue #217) pwpiwi 2017-02-24 16:19:35 +01:00
• 17556415a9 CHG: @marshmellow42 's changes to lfops.c /lfsampling.c CHG: updated CHANGELOG.md iceman1001 2017-02-24 15:45:24 +01:00
• 6ac2301423 CHG: forgot some changes to previous commit. iceman1001 2017-02-24 15:00:49 +01:00
• b804b9cdb8 ADD: @pivipw 's changes "making lua paths". ref:: 4197a3f6ff iceman1001 2017-02-24 14:59:38 +01:00
• 01f082a60f CHG: lf read - forgot a var iceman1001 2017-02-24 14:17:36 +01:00
• 165b92dc35 CHG: lf read - optional timeout, to be used when configured a threshold limit. iceman1001 2017-02-24 14:15:36 +01:00
• c85189135e the timeout on lf read makes the threshold ... marshmellow42 2017-02-24 01:02:25 -05:00
• e88c04f924 Merge remote-tracking branch 'upstream/master' Jeff Morsch 2017-02-24 00:45:57 -05:00
• 5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 iceman1001 2017-02-24 01:14:47 +01:00
• 4913be92ac Merge remote-tracking branch 'upstream/master' marshmellow42 2017-02-23 14:08:41 -05:00
• e88096ba25 cleanup marshmellow42 2017-02-23 13:53:40 -05:00
• 4197a3f6ff Make LUA scripting work even if proxmark3 is called from arbitrary working directory - add @gpakosz whereami library (https://github.com/gpakosz/whereami) in order to ... - determine and set absolute paths for LUA scripts and LUA libraries pwpiwi 2017-02-23 18:30:29 +01:00
• 4c16ae80f0 Code cleanup: - correctly using stdtypes.h printf and scanf format string macros (PRIx64 et al) - coverity fixes to client/cmdhfmf.c - fix linker warning re missing entry point when linking fullimage.elf pwpiwi 2017-02-23 09:40:12 +01:00
• f7c1147ab8 chg; PRIu32 becomes %u. Lets return to whats working - %lu iceman1001 2017-02-23 01:21:25 +01:00
• 3919356baf CHG: 64? iceman1001 2017-02-23 00:58:52 +01:00
• 8ad1e731c8 chg: @marshmellow42 's changes. iceman1001 2017-02-23 00:52:40 +01:00
• 07bc72b880 CHG: continue code cleanup. REM: removed stdint.h , since we are using c99 when compiling. iceman1001 2017-02-23 00:32:14 +01:00