Version 3.6.1

ufrisk · Oct 31, 2018 · 43b66bc · 43b66bc
1 parent 9f1bab5
commit 43b66bc
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/pcileech/devicefpga.h b/pcileech/devicefpga.h
@@ -22,18 +22,18 @@ BOOL DeviceFPGA_Open(_Inout_ PPCILEECH_CONTEXT ctx);
 * SetOption functions. For more detailed information please check sources for
 * devicefpga.c
 */
-#define DEVICE_OPT_FPGA_PROBE_MAXPAGES          1   // RW
-#define DEVICE_OPT_FPGA_RX_FLUSH_LIMIT          2   // RW
-#define DEVICE_OPT_FPGA_MAX_SIZE_RX             3   // RW
-#define DEVICE_OPT_FPGA_MAX_SIZE_TX             4   // RW
-#define DEVICE_OPT_FPGA_DELAY_PROBE_READ        5   // RW uS
-#define DEVICE_OPT_FPGA_DELAY_PROBE_WRITE       6   // RW uS
-#define DEVICE_OPT_FPGA_DELAY_WRITE             7   // RW uS
-#define DEVICE_OPT_FPGA_DELAY_READ              8   // RW uS
-#define DEVICE_OPT_FPGA_RETRY_ON_ERROR          9   // RW
-#define DEVICE_OPT_FPGA_DEVICE_ID              80   // R
-#define DEVICE_OPT_FPGA_FPGA_ID                81   // R
-#define DEVICE_OPT_FPGA_VERSION_MAJOR          82   // R
-#define DEVICE_OPT_FPGA_VERSION_MINOR          83   // R
+#define DEVICE_OPT_FPGA_PROBE_MAXPAGES         0x01   // RW
+#define DEVICE_OPT_FPGA_RX_FLUSH_LIMIT         0x02   // RW
+#define DEVICE_OPT_FPGA_MAX_SIZE_RX            0x03   // RW
+#define DEVICE_OPT_FPGA_MAX_SIZE_TX            0x04   // RW
+#define DEVICE_OPT_FPGA_DELAY_PROBE_READ       0x05   // RW uS
+#define DEVICE_OPT_FPGA_DELAY_PROBE_WRITE      0x06   // RW uS
+#define DEVICE_OPT_FPGA_DELAY_WRITE            0x07   // RW uS
+#define DEVICE_OPT_FPGA_DELAY_READ             0x08   // RW uS
+#define DEVICE_OPT_FPGA_RETRY_ON_ERROR         0x09   // RW
+#define DEVICE_OPT_FPGA_DEVICE_ID              0x80   // R
+#define DEVICE_OPT_FPGA_FPGA_ID                0x81   // R
+#define DEVICE_OPT_FPGA_VERSION_MAJOR          0x82   // R
+#define DEVICE_OPT_FPGA_VERSION_MINOR          0x83   // R
 
 #endif /* __DEVICEFPGA_H__ */
diff --git a/pcileech/pcileech.h b/pcileech/pcileech.h
@@ -7,7 +7,7 @@
 #define __PCILEECH_H__
 #include "oscompatibility.h"
 
-#define PCILEECH_VERSION_CURRENT            "3.6"
+#define PCILEECH_VERSION_CURRENT            "3.6.1"
 
 #define SIZE_PAGE_ALIGN_4K(x)                ((x + 0xfff) & ~0xfff)
 #define CONFIG_MAX_SIGNATURES                16

diff --git a/pcileech/vc140.pdb b/pcileech/vc140.pdb
diff --git a/pcileech_files/dll/pcileech.dll b/pcileech_files/dll/pcileech.dll
diff --git a/pcileech_files/dll/pcileech.lib b/pcileech_files/dll/pcileech.lib
diff --git a/pcileech_files/dll/pcileech_dll_example.c b/pcileech_files/dll/pcileech_dll_example.c
@@ -13,6 +13,7 @@
 #include <Windows.h>
 #include <stdio.h>
 #include <conio.h>
+#define _WINDLL
 #include "pcileech_dll.h"
 
 #pragma comment(lib, "pcileech")
@@ -226,6 +227,7 @@ int main(_In_ int argc, _In_ char* argv[])
     // some processes.
     ULONG64 cMemMapEntries;
     PPCILEECH_VMM_MEMMAP_ENTRY pMemMapEntries;
+    ShowKeyPress();
     printf("CALL:    PCILeech_VmmProcessGetMemoryMap #1\n");
     result = PCILeech_VmmProcessGetMemoryMap(dwPID, NULL, &cMemMapEntries, TRUE);
     if(result) {
@@ -273,6 +275,7 @@ int main(_In_ int argc, _In_ char* argv[])
     // memory map may use alternative parsing techniques to list DLLs.
     ULONG64 cModules;
     PPCILEECH_VMM_MODULEMAP_ENTRY pModules;
+    ShowKeyPress();
     printf("CALL:    PCILeech_VmmProcessGetModuleMap #1\n");
     result = PCILeech_VmmProcessGetModuleMap(dwPID, NULL, &cModules);
     if(result) {
@@ -357,6 +360,7 @@ int main(_In_ int argc, _In_ char* argv[])
     // List the sections from the module of crypt32.dll.
     DWORD cSections;
     PIMAGE_SECTION_HEADER pSectionHeaders;
+    ShowKeyPress();
     printf("CALL:    PCIleech_VmmProcess_GetSections #1\n");
     result = PCIleech_VmmProcess_GetSections(dwPID, "crypt32.dll", NULL, 0, &cSections);
     if(result) {
@@ -401,6 +405,7 @@ int main(_In_ int argc, _In_ char* argv[])
     LPCSTR DIRECTORIES[16] = { "EXPORT", "IMPORT", "RESOURCE", "EXCEPTION", "SECURITY", "BASERELOC", "DEBUG", "ARCHITECTURE", "GLOBALPTR", "TLS", "LOAD_CONFIG", "BOUND_IMPORT", "IAT", "DELAY_IMPORT", "COM_DESCRIPTOR", "RESERVED" };
     DWORD cDirectories;
     IMAGE_DATA_DIRECTORY pDirectories[16];
+    ShowKeyPress();
     printf("CALL:    PCIleech_VmmProcess_GetDirectories\n");
     result = PCIleech_VmmProcess_GetDirectories(dwPID, "crypt32.dll", pDirectories, 16, &cDirectories);
     if(result) {
@@ -425,6 +430,7 @@ int main(_In_ int argc, _In_ char* argv[])
     // Retrieve the export address table (EAT) of crypt32.dll
     DWORD cEATs;
     PPCILEECH_VMM_EAT_ENTRY pEATs;
+    ShowKeyPress();
     printf("CALL:    PCIleech_VmmProcess_GetEAT #1\n");
     result = PCIleech_VmmProcess_GetEAT(dwPID, "crypt32.dll", NULL, 0, &cEATs);
     if(result) {
@@ -462,6 +468,7 @@ int main(_In_ int argc, _In_ char* argv[])
     // Retrieve the import address table (IAT) of crypt32.dll
     DWORD cIATs;
     PPCILEECH_VMM_IAT_ENTRY pIATs;
+    ShowKeyPress();
     printf("CALL:    PCIleech_VmmProcess_GetIAT #1\n");
     result = PCIleech_VmmProcess_GetIAT(dwPID, "crypt32.dll", NULL, 0, &cIATs);
     if(result) {
@@ -497,6 +504,9 @@ int main(_In_ int argc, _In_ char* argv[])
     }
 
 
-
+    // Exit the test program.
+    printf("!!! EXIT !!! \n");
+    ShowKeyPress();
+    PCILeech_Close();
     return 0;
-}
+}
diff --git a/pcileech_files/pcileech.exe b/pcileech_files/pcileech.exe