RRG-Proxmark3

github/RRG-Proxmark3

Fork 0

mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-11 21:32:54 -08:00

Commit Graph

Select branches

Hide Pull Requests

master

swig_experiments

umm_wip

#10

#1000

#1001

#1002

#1005

#1007

#1009

#101

#1010

#1011

#1013

#1014

#1015

#1018

#1019

#102

#1022

#1023

#1025

#1027

#103

#1034

#1037

#1038

#1039

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1049

#1051

#1054

#1057

#106

#1061

#1063

#1064

#1066

#1067

#1068

#1069

#107

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#108

#1080

#1081

#1082

#1084

#1086

#1087

#1088

#1089

#109

#1090

#1091

#1092

#1093

#1095

#1096

#1097

#1098

#1099

#11

#110

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#111

#1110

#1111

#1112

#1113

#1114

#1115

#1116

#1118

#1119

#112

#1120

#1121

#1122

#1123

#1124

#1125

#1126

#1128

#1129

#113

#1130

#1131

#1132

#1133

#1134

#1137

#1139

#114

#1140

#1141

#1142

#1143

#1144

#1145

#1146

#1147

#1148

#1149

#115

#1150

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#116

#1160

#1161

#1162

#1164

#1165

#1166

#1167

#1169

#117

#1170

#1171

#1174

#1176

#1177

#1178

#1179

#1180

#1181

#1182

#1185

#1185

#1188

#1189

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1199

#1200

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#1210

#1211

#1212

#1213

#1214

#1215

#1217

#1218

#1219

#122

#1220

#1221

#1222

#1223

#1223

#1224

#1224

#1225

#1226

#1226

#1227

#1228

#1230

#1231

#1235

#1236

#1237

#1238

#1239

#1240

#1241

#1242

#1243

#1247

#1248

#1249

#1250

#1251

#1253

#1254

#1256

#1257

#1258

#1259

#1260

#1262

#1263

#1264

#1266

#1267

#1269

#1271

#1272

#1273

#1275

#1276

#1277

#1279

#1280

#1281

#1284

#1290

#1291

#1293

#1294

#1295

#1297

#1299

#13

#1300

#1301

#1303

#1304

#1306

#1309

#131

#1310

#1312

#1313

#1314

#1315

#1316

#1317

#1318

#1319

#1320

#1321

#1322

#1323

#1324

#1327

#1328

#1329

#1330

#1331

#1332

#1333

#1334

#1335

#1337

#1338

#1339

#1342

#1343

#1344

#1346

#1347

#1348

#1349

#1350

#1351

#1352

#1353

#1354

#1355

#1356

#1357

#1358

#1359

#136

#1360

#1361

#1362

#1364

#1365

#1366

#1367

#1369

#137

#1370

#1371

#1372

#1373

#1374

#1375

#1376

#1377

#1378

#1379

#1380

#1381

#1382

#1385

#1386

#1387

#1388

#1389

#1390

#1392

#1393

#1394

#1395

#1396

#1397

#1398

#1400

#1401

#1402

#1403

#1404

#1405

#1406

#1407

#1409

#1410

#1412

#1413

#1414

#1415

#1416

#1417

#1418

#1419

#142

#1420

#1422

#1423

#1424

#1425

#1427

#1428

#1429

#143

#1430

#1431

#1432

#1433

#1434

#1435

#1436

#1437

#1439

#144

#1440

#1441

#1442

#1443

#1444

#1445

#1446

#1447

#1448

#1449

#145

#1450

#1451

#1452

#1453

#1454

#1456

#1457

#1458

#1459

#146

#1460

#1463

#1464

#1465

#1466

#1468

#1469

#147

#1470

#1471

#1472

#1473

#1474

#1475

#1476

#1477

#1478

#1479

#148

#1480

#1481

#1482

#1483

#1484

#1486

#1487

#1488

#1489

#1490

#1491

#1492

#1493

#1494

#15

#15

#150

#1501

#1504

#1505

#1506

#1507

#1509

#151

#1510

#1511

#1515

#1515

#1516

#1517

#1519

#152

#1520

#1521

#1522

#1525

#1528

#1529

#153

#1530

#1531

#1532

#1534

#1535

#1537

#1538

#154

#1542

#1544

#1545

#1546

#1547

#1549

#155

#1550

#1551

#1552

#1553

#1554

#1556

#1557

#1558

#1559

#1560

#1561

#1562

#1563

#1564

#1565

#1566

#1567

#1568

#1569

#157

#1570

#1571

#1572

#1573

#1574

#1575

#1576

#1577

#1578

#1579

#158

#1580

#1584

#1585

#1586

#1587

#1588

#1589

#1590

#1591

#1592

#1594

#1594

#1595

#1596

#1596

#16

#1601

#1602

#1603

#1605

#1606

#1607

#161

#1610

#1614

#1617

#1618

#1619

#162

#1620

#1621

#1625

#1626

#1627

#1628

#1629

#163

#1630

#1631

#1632

#1633

#1634

#1635

#1636

#1637

#1638

#1639

#1641

#1642

#1643

#1644

#1645

#1646

#1647

#1649

#165

#1650

#1651

#1654

#1655

#1657

#1658

#1659

#1660

#1666

#1668

#1669

#167

#1670

#1672

#1675

#1676

#1678

#168

#1685

#1687

#1688

#1689

#169

#1690

#1691

#1692

#1693

#1695

#1696

#1697

#17

#170

#1700

#1702

#1703

#1704

#1706

#1710

#1711

#1712

#1713

#1715

#1717

#1718

#1719

#172

#1720

#1721

#1723

#1724

#1726

#1727

#1728

#1729

#1730

#1731

#1732

#1733

#1735

#1737

#1738

#1739

#1740

#1741

#1742

#1743

#1744

#1745

#1746

#1747

#1749

#175

#1751

#1752

#1755

#1756

#1757

#1758

#1759

#176

#1761

#1763

#1765

#1766

#1767

#1768

#1769

#1770

#1772

#1774

#1775

#1779

#178

#1781

#1783

#1784

#1785

#1787

#1788

#1789

#179

#1790

#1792

#1794

#1797

#1802

#1805

#1806

#1807

#1809

#181

#1810

#1811

#1813

#1814

#1815

#1816

#1817

#1818

#1819

#1820

#1821

#1823

#1824

#1825

#1826

#1827

#1828

#1830

#1831

#1833

#1834

#1836

#1838

#1839

#184

#1840

#1841

#1841

#1842

#1844

#1846

#1847

#1850

#1851

#1855

#1856

#1857

#1858

#1859

#186

#1860

#1862

#1863

#1864

#1867

#1869

#187

#1871

#1872

#1873

#1875

#1876

#1877

#1878

#1879

#1880

#1881

#1882

#1883

#1884

#1885

#1886

#1887

#1888

#1889

#1890

#1891

#1892

#1893

#1894

#1895

#1896

#1897

#1898

#1899

#190

#1900

#1902

#1903

#1905

#1906

#1907

#1908

#191

#1910

#1912

#1913

#1914

#1916

#1918

#1919

#1920

#1921

#1922

#1925

#1926

#1926

#1927

#1927

#1928

#1929

#1930

#1931

#1932

#1933

#1934

#1935

#1936

#1937

#1938

#1940

#1941

#1942

#1943

#1945

#1946

#1947

#1948

#1949

#195

#1950

#1951

#1952

#1955

#1956

#1958

#1959

#196

#1961

#1962

#1963

#1964

#1965

#1966

#1967

#1969

#197

#1970

#1971

#1973

#1975

#1976

#1977

#1978

#1982

#1983

#1984

#1985

#1987

#1988

#1989

#1990

#1991

#1992

#1993

#1994

#1995

#1996

#1997

#1998

#1999

#2

#20

#2000

#2001

#2003

#2004

#2005

#2008

#2009

#201

#2010

#2011

#2012

#2014

#2016

#202

#2020

#2021

#2022

#2023

#2024

#2025

#2026

#2028

#2029

#203

#2030

#2031

#2032

#2033

#2034

#2035

#2036

#2039

#2040

#2041

#2043

#2045

#2049

#205

#2050

#2051

#2052

#2054

#2057

#2059

#206

#2061

#2063

#2064

#2065

#2066

#2068

#2069

#207

#2070

#2071

#2072

#2074

#2077

#2078

#2079

#208

#2080

#2081

#2082

#2084

#2085

#2086

#2087

#2088

#2090

#2091

#2092

#2093

#2094

#2095

#2096

#2098

#2099

#21

#210

#2102

#2103

#2105

#2106

#2107

#2108

#2109

#2110

#2111

#2116

#2117

#2118

#212

#2121

#2123

#2124

#2125

#2126

#2127

#2128

#2129

#213

#2130

#2131

#2132

#2133

#2134

#2135

#2136

#2137

#2138

#2139

#214

#2140

#2142

#2143

#2144

#2145

#2146

#2147

#2149

#2150

#2151

#2152

#2153

#2154

#2155

#2156

#2157

#2159

#2160

#2161

#2162

#2163

#2164

#2166

#2167

#2168

#2169

#2172

#2173

#2174

#2175

#2176

#2177

#2178

#2179

#218

#2181

#2183

#2185

#2186

#2187

#2188

#2189

#2190

#2191

#2192

#2193

#2194

#2195

#2196

#2198

#2199

#22

#2201

#2202

#2203

#2205

#2206

#2207

#2208

#2209

#221

#2210

#2211

#2214

#2215

#2216

#2217

#2218

#2219

#222

#2220

#2222

#2223

#2224

#2225

#2226

#2227

#2229

#2230

#2231

#2232

#2233

#2234

#2237

#2238

#2239

#2240

#2242

#2245

#2247

#2249

#225

#2250

#2251

#2253

#2254

#2255

#2257

#2258

#226

#2260

#2261

#2262

#2263

#2264

#2265

#2267

#2269

#227

#2270

#2271

#2272

#2273

#2274

#2277

#228

#2281

#2282

#2283

#2284

#2285

#2287

#229

#2291

#2292

#2293

#2295

#2297

#2298

#2299

#23

#2300

#2301

#2302

#2303

#2304

#2306

#2307

#2308

#2309

#2312

#2313

#2316

#2317

#2319

#232

#2320

#2324

#2326

#2327

#2328

#2329

#233

#2330

#2331

#2332

#2333

#2335

#2337

#2338

#2339

#234

#2340

#2341

#2342

#2343

#2345

#2347

#2348

#2349

#235

#2351

#2352

#2353

#2354

#2355

#2356

#2358

#2359

#236

#2360

#2361

#2362

#2364

#2365

#2366

#2367

#2369

#2370

#2373

#2375

#2377

#2378

#2379

#238

#2380

#2381

#2385

#2386

#2387

#2388

#2390

#2391

#2393

#2394

#2395

#2396

#2397

#2398

#2399

#24

#2400

#2401

#2402

#2404

#2406

#2407

#2408

#2409

#2411

#2412

#2414

#2415

#2416

#2417

#2419

#242

#2420

#2422

#2423

#2424

#2425

#2426

#2427

#2428

#2429

#243

#2430

#2431

#2432

#2433

#2434

#2435

#2438

#2439

#244

#2441

#2442

#2444

#2445

#2446

#2447

#2448

#2449

#245

#2450

#2452

#2453

#2454

#2456

#2458

#2459

#246

#2460

#2461

#2462

#2463

#2464

#2466

#2467

#2468

#2469

#247

#2470

#2471

#2472

#2473

#2474

#2475

#2476

#2477

#2478

#2479

#2480

#2481

#2482

#2483

#2484

#2485

#2486

#2487

#2488

#2489

#249

#2490

#2491

#2492

#2493

#2498

#2499

#25

#2502

#2503

#2505

#2506

#2507

#2508

#2509

#251

#2510

#2512

#2513

#2514

#2515

#2516

#2517

#2518

#2519

#252

#2520

#2521

#2522

#2523

#2524

#2525

#2526

#2527

#2528

#2529

#253

#2530

#2531

#2532

#2533

#2534

#2535

#2536

#2537

#2538

#2539

#2540

#2542

#2543

#2544

#2545

#2546

#2548

#2549

#2550

#2551

#2552

#2554

#2555

#2556

#2557

#2558

#2559

#256

#2560

#2561

#2562

#2564

#2566

#2567

#2570

#2571

#2572

#2573

#2575

#2576

#2577

#2578

#2579

#2580

#2581

#2582

#2583

#2584

#2585

#2586

#2587

#2588

#2589

#259

#2590

#2591

#2592

#2593

#2595

#2596

#2597

#2598

#2599

#2600

#2601

#2602

#2603

#2604

#2605

#2606

#2607

#2608

#2609

#261

#2610

#2613

#2614

#2615

#2616

#2617

#2618

#2619

#262

#2620

#2621

#2623

#2625

#2626

#2627

#2628

#2629

#263

#2630

#2631

#2632

#2634

#2636

#2638

#2639

#264

#2640

#2641

#2643

#2644

#2645

#2647

#2648

#2649

#2650

#2651

#2652

#2652

#2653

#2654

#2655

#2656

#2657

#2658

#2659

#2662

#2663

#2664

#2665

#2666

#2668

#2669

#2670

#2671

#2672

#2673

#2675

#2676

#2677

#2678

#2679

#2680

#2681

#2682

#2683

#2684

#2685

#2686

#2687

#2688

#269

#2691

#2692

#2694

#2695

#2696

#2697

#2698

#2699

#27

#27

#270

#2700

#2703

#2704

#2706

#2707

#2708

#2709

#2711

#2711

#2713

#2713

#272

#274

#275

#276

#277

#278

#279

#281

#283

#284

#286

#287

#288

#289

#291

#292

#297

#298

#299

#302

#303

#304

#305

#306

#307

#308

#310

#311

#312

#313

#315

#317

#318

#32

#33

#330

#331

#333

#334

#335

#336

#337

#338

#339

#340

#341

#342

#343

#344

#345

#346

#348

#352

#353

#359

#36

#360

#361

#362

#363

#364

#366

#369

#37

#370

#371

#373

#378

#379

#380

#381

#382

#383

#387

#388

#39

#391

#393

#395

#398

#399

#40

#403

#404

#405

#409

#41

#410

#415

#416

#42

#420

#422

#423

#424

#425

#426

#430

#431

#432

#433

#434

#435

#438

#44

#440

#443

#446

#447

#449

#45

#451

#452

#453

#456

#457

#459

#462

#463

#464

#465

#466

#467

#47

#471

#476

#478

#48

#480

#481

#484

#485

#487

#488

#493

#495

#496

#50

#501

#504

#506

#508

#509

#510

#513

#514

#515

#517

#518

#52

#521

#522

#53

#530

#531

#532

#534

#535

#537

#539

#54

#544

#546

#547

#548

#549

#55

#553

#554

#559

#561

#563

#565

#567

#568

#57

#572

#573

#574

#575

#578

#579

#58

#580

#581

#585

#59

#590

#591

#594

#595

#596

#597

#598

#599

#60

#600

#603

#605

#606

#607

#608

#610

#611

#612

#615

#62

#620

#621

#622

#623

#624

#625

#626

#629

#630

#631

#632

#633

#634

#635

#636

#639

#64

#640

#641

#644

#645

#647

#649

#65

#650

#651

#653

#654

#655

#656

#657

#658

#660

#661

#662

#664

#665

#666

#668

#669

#67

#670

#671

#672

#673

#674

#677

#678

#679

#68

#680

#684

#685

#687

#688

#689

#69

#690

#691

#692

#694

#696

#697

#698

#699

#7

#70

#701

#702

#703

#704

#707

#71

#710

#712

#713

#719

#72

#721

#722

#725

#726

#727

#728

#73

#731

#732

#733

#735

#738

#739

#74

#740

#741

#743

#748

#749

#75

#750

#759

#76

#760

#761

#762

#763

#768

#769

#770

#771

#772

#773

#774

#775

#776

#78

#784

#786

#787

#79

#791

#792

#794

#795

#796

#797

#798

#799

#80

#802

#805

#808

#81

#810

#813

#818

#820

#821

#822

#825

#828

#829

#834

#835

#84

#86

#87

#88

#89

#9

#90

#902

#906

#907

#912

#913

#914

#92

#922

#923

#93

#932

#936

#938

#939

#94

#940

#941

#942

#945

#947

#949

#95

#951

#952

#954

#955

#957

#958

#959

#96

#962

#963

#964

#965

#966

#967

#969

#97

#970

#971

#972

#974

#975

#976

#978

#979

#98

#980

#981

#982

#983

#984

#985

#988

#989

#99

#990

#991

#993

#995

#997

#998

#999

v4.13441

v4.14434

v4.14831

v4.15864

v4.16191

v4.16717

v4.17140

v4.17511

v4.17768

v4.18218

v4.18341

v4.18589

v4.18994

v4.19552

v4.9237

312ec79e48 added sketch sc apdu merlokk 2018-12-05 17:27:28 +02:00
898484f642 FIX: compilation for OS X, see https://github.com/Proxmark/proxmark3/pull/730/ (@jmichelp) iceman1001 2018-12-04 13:51:28 +01:00
4c7e5757f3 added channel parameter merlokk 2018-12-03 19:29:31 +02:00
01a10bade7 Mastercard compute cryptographic checksum result will print anyway merlokk 2018-12-03 18:49:54 +02:00
2245673262 fix search big loop merlokk 2018-12-03 18:46:11 +02:00
e8671e6c18 fix emv command's help merlokk 2018-12-03 18:21:05 +02:00
7fd3536b29 fix appveyor merlokk 2018-12-03 18:16:39 +02:00
47d954c79f move emv commands to root merlokk 2018-12-03 18:16:25 +02:00
259dbadbe9 chg: output unified iceman1001 2018-12-02 10:05:31 +01:00
2eee1663df chg: iso15693 small fix... iceman1001 2018-11-30 21:04:32 +01:00
0372cb8a04 chg: iso15693 lua lib works. iceman1001 2018-11-30 20:58:47 +01:00
2fb8805ee9

Merge pull request #65 from merlokk/merge_trailer RFID Research Group 2018-11-30 19:47:00 +01:00
7c8377839e 4k fix merlokk 2018-11-30 20:33:46 +02:00
2d932e49ac https://github.com/Proxmark/proxmark3/pull/725 merlokk 2018-11-30 20:28:34 +02:00
71435fb824

Merge pull request #64 from merlokk/trailer_decode Iceman 2018-11-30 14:08:25 +01:00
a10bf3ac05 added changelog merlokk 2018-11-30 14:17:46 +02:00
9f77f2741f added trailer decoding merlokk 2018-11-30 14:16:34 +02:00
c5c75d494b chg.. moved into defined iceman1001 2018-11-30 09:13:09 +01:00
8bef04f94b ADD: Support TCP ports for proxmark (@phcoder) iceman1001 2018-11-30 09:03:55 +01:00
a5898158c5 FIX: basic fixes for lua reader14a, reader14b, reader15 ADD: utils got iso15693 crc support iceman1001 2018-11-30 01:41:39 +01:00
ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now iceman1001 2018-11-30 01:19:57 +01:00
bd7ac487cd FIX: 'hf mf hardnested' - output misalignment iceman1001 2018-11-29 23:44:50 +01:00
c948911f71 chg... iceman1001 2018-11-29 23:37:05 +01:00
dcd1a62ce3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2018-11-29 23:33:47 +01:00
2accb7d3f4 CHG: remove different clocks calls. iceman1001 2018-11-29 23:32:59 +01:00
24fc3fdb58

Merge pull request #62 from merlokk/err Iceman 2018-11-29 21:34:00 +01:00
9584074c00 fix memory error merlokk 2018-11-29 22:06:49 +02:00
0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. iceman1001 2018-11-29 17:59:46 +01:00
3c88bb5e59 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2018-11-29 17:53:57 +01:00
b64fdafc40 ADD: basic iso15693 comms in lua support. Not fully functional iceman1001 2018-11-29 17:53:24 +01:00
55dff20530

Merge pull request #54 from merlokk/json_loclass Iceman 2018-11-29 16:50:27 +01:00
4dece3e30d del line merlokk 2018-11-29 17:13:00 +02:00
efabdde248 small fixes. done merlokk 2018-11-29 17:09:37 +02:00
6baf579fe0 hf mf cload works merlokk 2018-11-29 16:56:57 +02:00
955ced6c28 hf mf csave works merlokk 2018-11-29 16:05:57 +02:00
e6d7a05721 csave works merlokk 2018-11-29 13:42:07 +02:00
0ffddd8470 raw load file merlokk 2018-11-29 13:21:38 +02:00
ed7d46c685

Merge pull request #60 from merlokk/jansson_update Iceman 2018-11-29 11:07:29 +01:00
5d5e273982 jansson update. 2.11 to 2.12 fix warnings merlokk 2018-11-29 12:00:23 +02:00
91809c6d94 FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0) CHG: remove some warnings when compiling on 32/64 bit systems. Messy messy iceman1001 2018-11-28 23:53:31 +01:00
21118ed6b8 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass merlokk 2018-11-28 00:09:11 +02:00
f979907d17

Merge pull request #59 from merlokk/fido2 Iceman 2018-11-27 18:49:35 +01:00
04b436ce5e del annoying comment merlokk 2018-11-27 19:44:03 +02:00
f8cac71aa0 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass merlokk 2018-11-27 19:40:30 +02:00
4e89ef7c24

Merge branch 'master' into fido2 Oleg Moiseenko 2018-11-27 19:37:08 +02:00
c51e0a58f4 added allowList to authenticatorGetAssertion command merlokk 2018-11-27 19:33:51 +02:00
305c0c099b refactoring merlokk 2018-11-27 15:59:28 +02:00
71215aa4c9 added changelog merlokk 2018-11-27 15:49:37 +02:00
d253364d2c added numberOfCredentials merlokk 2018-11-27 15:47:17 +02:00
ac5448a117 GetAssertion works merlokk 2018-11-27 14:57:00 +02:00
a0a979abc6 added show GetAssertion results merlokk 2018-11-27 14:34:51 +02:00
f26d3396e8 get credential merlokk 2018-11-27 14:01:47 +02:00
317ea30529 refactoring and GetAssertion works merlokk 2018-11-27 13:45:29 +02:00
26cf350713 refactoring merlokk 2018-11-27 12:34:28 +02:00
a9be05dbf7 refactoring merlokk 2018-11-27 12:31:39 +02:00
5efc2eced6 refactoring merlokk 2018-11-27 12:28:36 +02:00
ee92b8a097 refactoring make credentials and add some sketch to get assertion merlokk 2018-11-27 12:24:55 +02:00
bad7b80036 added file name to fido2 command merlokk 2018-11-27 12:07:33 +02:00
fc9558b18f get assertion command sketch merlokk 2018-11-27 00:18:44 +02:00
890173a623 verify signature OK, added some logging options merlokk 2018-11-27 00:11:53 +02:00
66d994920f added command and some parameters merlokk 2018-11-26 20:17:50 +02:00
d36bfd5829 add some cose key checks merlokk 2018-11-26 19:49:41 +02:00
065773377d get cose public key and fix some printing merlokk 2018-11-26 19:42:37 +02:00
0a2f874ac3 added cose_key descriptions merlokk 2018-11-26 19:22:44 +02:00
f7354c705d extract some descriptions from cose_key merlokk 2018-11-26 19:16:47 +02:00
56c9270574 added json save values merlokk 2018-11-26 18:57:44 +02:00
1f3086a028 added json save merlokk 2018-11-26 18:39:31 +02:00
b0e0ccb05f added showCBOR merlokk 2018-11-26 18:37:21 +02:00
b9c4bd1e0c added showing cose_key in cbor text type merlokk 2018-11-26 18:30:14 +02:00
44ed826840 added hints merlokk 2018-11-26 17:54:50 +02:00
705d0b7a6b added signature verify merlokk 2018-11-26 17:52:02 +02:00
b67bcac28e check rpIdHash and unpack signature ok merlokk 2018-11-26 17:38:45 +02:00
1099c6923d added COSE algorithms merlokk 2018-11-26 16:12:28 +02:00
bf7f33b0a7 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 Chris 2018-11-25 14:36:19 +01:00
3beb14a25c chg: 'hf iclass lookup' - its not an online command... Chris 2018-11-25 14:35:47 +01:00
9e89da3c0c remove debug merlokk 2018-11-25 00:12:06 +02:00
1a0f7e93de refactoring and some functions in cbortools merlokk 2018-11-24 23:36:02 +02:00
6c63e74ffb decode DER certificate merlokk 2018-11-24 15:05:08 +02:00
376abd2d92 get DER works merlokk 2018-11-24 14:57:55 +02:00
0bbdc7f150 added CborGetArrayBinStringValue merlokk 2018-11-24 14:57:36 +02:00
c57a2c2c41 added map credential parsing. not completed merlokk 2018-11-23 19:48:17 +02:00
a37082a825 added some cbor tools merlokk 2018-11-23 19:47:30 +02:00
7d8f69f8bc

Merge pull request #58 from jmichelp/patch-1 RFID Research Group 2018-11-23 00:41:32 +01:00
7943ba7d91

Fix logic op being used instead of bitwise op Jean-Michel Picod 2018-11-22 23:57:30 +01:00
156f9b677c refactoring merlokk 2018-11-22 13:41:44 +02:00
7bb24819ad small fix merlokk 2018-11-21 20:39:26 +02:00
e33ddad40c added options and some refactoring merlokk 2018-11-21 20:35:57 +02:00
979a14d978 added CBOR description for queries merlokk 2018-11-21 20:11:41 +02:00
f705402b7a make credentional command works. and refactoring merlokk 2018-11-21 19:46:57 +02:00
da45b1db39 added jsontocbor function merlokk 2018-11-21 19:46:09 +02:00
dae4ecc60f removed ismap and added not-writable parameters merlokk 2018-11-21 19:45:11 +02:00
7b943a4a16 add check string - if string is hex merlokk 2018-11-21 19:44:31 +02:00
b6866ee8f5

Merge pull request #57 from merlokk/emv_scan RFID Research Group 2018-11-21 14:46:49 +01:00
ea3472b0e0 load json OK merlokk 2018-11-20 19:31:08 +02:00
38e0d7de32 add load json merlokk 2018-11-20 19:21:36 +02:00
291321f01d add changelog merlokk 2018-11-20 17:34:29 +02:00
9df1d14ca4 printandlogex in hf emv commands merlokk 2018-11-20 17:29:17 +02:00
d7d681ab51 cmdhf apdu move to argtable merlokk 2018-11-20 17:28:41 +02:00
6d896ca603 cmdemv merge merlokk 2018-11-20 16:26:54 +02:00
fb14d665dd emvcore merlokk 2018-11-20 16:26:35 +02:00