Version 1.6

ufrisk · Jan 7, 2020 · 0c1aa94 · 0c1aa94
1 parent a2a1214
commit 0c1aa94
Show file tree

Hide file tree

Showing 54 changed files with 207 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -123,6 +123,7 @@ v1.3
 * [RawUDP](https://github.com/ufrisk/LeechCore/wiki/Device_RawUDP) device ([NeTV2 FPGA](https://github.com/ufrisk/pcileech-fpga) over UDP).
 * ELF Core Dump support (VirtualBox VBoxManage debugvm dumpvmcore).
 
-Latest
-* Bug fixes.
+[v1.6](https://github.com/ufrisk/LeechCore/releases/tag/v1.6)
+* Code Signing.
+* FPGA: Support for writing to custom shadow configuration space.
 * FPGA: Examples: PCIe Configuration Space & Dynamic Reconfiguration Port Interface.
diff --git a/files/leechcore.h b/files/leechcore.h
@@ -131,10 +131,10 @@
 //           EXISTINGREMOTE
 //
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
-// Header Version: 1.5
+// Header Version: 1.6
 //
 #ifndef __LEECHCORE_H__
 #define __LEECHCORE_H__
@@ -484,8 +484,13 @@ DLLEXPORT BOOL LeechCore_SetOption(_In_ ULONG64 fOption, _In_ ULONG64 qwValue);
 #define LEECHCORE_COMMANDDATA_FPGA_WRITE_TLP            0x00000101  // R
 #define LEECHCORE_COMMANDDATA_FPGA_LISTEN_TLP           0x00000102  // R
 #define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE         0x00000103  // R
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGDRP            0x00000106  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG_MARKWR     0x00000107  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE_MARKWR    0x00000108  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE_WR      0x00000109  // W
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREG_DEBUGPRINT    0x0000010a  //
 #define LEECHCORE_COMMANDDATA_FILE_DUMPHEADER_GET       0x00000201  // R
 #define LEECHCORE_COMMANDDATA_STATISTICS_GET            0x80000100  // R
 

diff --git a/files/leechcore.lib b/files/leechcore.lib
diff --git a/files/x86/leechcore.h b/files/x86/leechcore.h
@@ -131,10 +131,10 @@
 //           EXISTINGREMOTE
 //
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
-// Header Version: 1.5
+// Header Version: 1.6
 //
 #ifndef __LEECHCORE_H__
 #define __LEECHCORE_H__
@@ -484,8 +484,13 @@ DLLEXPORT BOOL LeechCore_SetOption(_In_ ULONG64 fOption, _In_ ULONG64 qwValue);
 #define LEECHCORE_COMMANDDATA_FPGA_WRITE_TLP            0x00000101  // R
 #define LEECHCORE_COMMANDDATA_FPGA_LISTEN_TLP           0x00000102  // R
 #define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE         0x00000103  // R
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGDRP            0x00000106  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG_MARKWR     0x00000107  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE_MARKWR    0x00000108  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE_WR      0x00000109  // W
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREG_DEBUGPRINT    0x0000010a  //
 #define LEECHCORE_COMMANDDATA_FILE_DUMPHEADER_GET       0x00000201  // R
 #define LEECHCORE_COMMANDDATA_STATISTICS_GET            0x80000100  // R
 

diff --git a/files/x86/leechcore.lib b/files/x86/leechcore.lib
diff --git a/leechagent/leechagent.c b/leechagent/leechagent.c
@@ -1,6 +1,6 @@
 //	leechagent.c : Implementation the LeechAgent service related functionality.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "leechagent.h"

diff --git a/leechagent/leechagent.h b/leechagent/leechagent.h
@@ -1,6 +1,6 @@
 // leechagent.h : definitions related to the leech agent.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __LEECHAGENT_H__

diff --git a/leechagent/leechagent_proc.h b/leechagent/leechagent_proc.h
@@ -4,7 +4,7 @@
 //                 Child processes are spawned and controlled by the main
 //                 LeechAgent process.
 //
-// (c) Ulf Frisk, 2019
+// (c) Ulf Frisk, 2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __LEECHAGENT_PROC_H__

diff --git a/leechagent/leechagent_procchild.c b/leechagent/leechagent_procchild.c
@@ -2,7 +2,7 @@
 //                 Child processes host execution environments such as the
 //                 Python environment which allows for execution of scripts.
 //
-// (c) Ulf Frisk, 2019
+// (c) Ulf Frisk, 2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 // In general, this child process is meant to be a temporary host process to
@@ -141,8 +141,10 @@ VOID LeechAgent_ProcChild_Close_ForceTerminateThread(PVOID pv)
 */
 VOID LeechAgent_ProcChild_Close()
 {
+    HANDLE hThread;
     ctxProcChild.fStateRunning = FALSE;
-    CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)LeechAgent_ProcChild_Close_ForceTerminateThread, NULL, 0, NULL);
+    hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)LeechAgent_ProcChild_Close_ForceTerminateThread, NULL, 0, NULL);
+    if(hThread) { CloseHandle(hThread); }
     if(ctxProcChild.pfnLeechCorePyC_EmbClose) {
         ctxProcChild.pfnLeechCorePyC_EmbClose();
     }

diff --git a/leechagent/leechagent_procparent.c b/leechagent/leechagent_procparent.c
@@ -3,7 +3,7 @@
 //                 Python environment which allows for execution of scripts.
 //                 The Parent process controls the child processes.
 //
-// (c) Ulf Frisk, 2019
+// (c) Ulf Frisk, 2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "leechagent_proc.h"

diff --git a/leechagent/leechagent_rpc.c b/leechagent/leechagent_rpc.c
@@ -1,6 +1,6 @@
 // leechsvc_rpc.c : implementation of RPC related functionality.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "leechagent.h"

diff --git a/leechagent/leechagent_rpc.h b/leechagent/leechagent_rpc.h
@@ -1,6 +1,6 @@
 // leechagent_rpc.h : definitions of RPC related functionality.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __LEECHAGENT_RPC_H__

diff --git a/leechagent/leechcore.h b/leechagent/leechcore.h
@@ -131,10 +131,10 @@
 //           EXISTINGREMOTE
 //
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
-// Header Version: 1.5
+// Header Version: 1.6
 //
 #ifndef __LEECHCORE_H__
 #define __LEECHCORE_H__
@@ -484,8 +484,13 @@ DLLEXPORT BOOL LeechCore_SetOption(_In_ ULONG64 fOption, _In_ ULONG64 qwValue);
 #define LEECHCORE_COMMANDDATA_FPGA_WRITE_TLP            0x00000101  // R
 #define LEECHCORE_COMMANDDATA_FPGA_LISTEN_TLP           0x00000102  // R
 #define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE         0x00000103  // R
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW
-#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE           0x00000104  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG            0x00000105  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGDRP            0x00000106  // RW - [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGCFG_MARKWR     0x00000107  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREGPCIE_MARKWR    0x00000108  // W  - write with mask [bytes: 0-1: data, 2-3: mask] [high-part fOption = address]
+#define LEECHCORE_COMMANDDATA_FPGA_PCIECFGSPACE_WR      0x00000109  // W
+#define LEECHCORE_COMMANDDATA_FPGA_CFGREG_DEBUGPRINT    0x0000010a  //
 #define LEECHCORE_COMMANDDATA_FILE_DUMPHEADER_GET       0x00000201  // R
 #define LEECHCORE_COMMANDDATA_STATISTICS_GET            0x80000100  // R
 

diff --git a/leechagent/leechrpc.h b/leechagent/leechrpc.h
@@ -1,6 +1,6 @@
 // leechrpcclient.h : definitions related to the leech rpc service.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __LEECHRPC_H__

diff --git a/leechagent/leechrpcserver.c b/leechagent/leechrpcserver.c
@@ -1,6 +1,6 @@
 // leechrpc.c : implementation of RPC server-side functionality.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "leechagent.h"

diff --git a/leechagent/leechrpcshared.c b/leechagent/leechrpcshared.c
@@ -1,6 +1,6 @@
 // leechrpcshared.c : implementation of the remote procedure call (RPC) shared functionality (client/server).
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include <stdio.h>

diff --git a/leechagent/util.c b/leechagent/util.c
@@ -1,6 +1,6 @@
 // util.h : implementations of various utility functions.
 //
-// (c) Ulf Frisk, 2019
+// (c) Ulf Frisk, 2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "util.h"

diff --git a/leechagent/util.h b/leechagent/util.h
@@ -1,6 +1,6 @@
 // util.h : definitions of various utility functions.
 //
-// (c) Ulf Frisk, 2019
+// (c) Ulf Frisk, 2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __UTIL_H__

diff --git a/leechagent/version.h b/leechagent/version.h
@@ -2,9 +2,9 @@
 #define STRINGIZE(s) STRINGIZE2(s)
 
 #define VERSION_MAJOR               1
-#define VERSION_MINOR               5
-#define VERSION_REVISION            1
-#define VERSION_BUILD               3
+#define VERSION_MINOR               6
+#define VERSION_REVISION            0
+#define VERSION_BUILD               4
 
 #define VER_FILE_DESCRIPTION_STR    "LeechAgent Memory Acquisition Service"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
@@ -19,4 +19,4 @@
 #define VER_PRODUCT_VERSION_STR     VER_FILE_VERSION_STR
 #define VER_ORIGINAL_FILENAME_STR   VER_PRODUCTNAME_STR ".exe"
 #define VER_INTERNAL_NAME_STR       VER_ORIGINAL_FILENAME_STR
-#define VER_COPYRIGHT_STR           "Copyright (c) Ulf Frisk 2018-2019"
+#define VER_COPYRIGHT_STR           "Copyright (c) Ulf Frisk 2018-2020"
diff --git a/leechcore/Makefile b/leechcore/Makefile
@@ -8,7 +8,7 @@ OBJ = fpga_libusb.o oscompatibility.o leechcore.o util.o memmap.o device_file.o
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 leechcore: $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS) -o leechcore.so
+	$(CC) -o $@ $^ $(CFLAGS) -o leechcore.so $(LDFLAGS)
 	rm *.o
 	mv leechcore.so ../files/ |true
 

diff --git a/leechcore/device.h b/leechcore/device.h
@@ -1,6 +1,6 @@
 // device.h : internal header file containing device-common defines.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __DEVICE_H__

diff --git a/leechcore/device_file.c b/leechcore/device_file.c
@@ -1,6 +1,6 @@
 // device_file.c : implementation related to file backed memory acquisition device.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #include "device.h"

diff --git a/leechcore/device_file.h b/leechcore/device_file.h
@@ -1,6 +1,6 @@
 // device_file.h : definitions related to file backed memory acquisition device.
 //
-// (c) Ulf Frisk, 2018-2019
+// (c) Ulf Frisk, 2018-2020
 // Author: Ulf Frisk, pcileech@frizk.net
 //
 #ifndef __DEVICE_FILE_H__