libwdi 1.2.5

* Also fix MinGW warnings

README.md

@@ -0,0 +1,38 @@
+libwdi: A Windows Driver Installation library for USB devices
+=============================================================
+
+Main features
+-------------
+
+* Automated inf creation, using reported USB device name
+* Automated catalog file creation and signing, using autogenerated certificate
+* Automated driver files extraction, for both 32 and 64 bit platforms
+* Automated driver installation, including UAC elevation where necessary
+* Single library embedding all the required files
+* Supports all Windows platform from Windows XP to Windows 10
+
+Additional features
+-------------------
+
+* Embedding of WinUSB, libusb0.sys or libusbK.sys, USB Serial (CDC) or your own 
+  USB drivers (eg. WHQL)
+* Full locale support with UTF-8 API strings and UTF-16 autogenerated inf files
+* Resolution of USB Vendor IDs, based on the data maintained by Stephen J. Gowdy 
+  at http://www.linux-usb.org/usb.ids
+* Fully Open Source (LGPL v3), with multiple sample applications
+* Supports MinGW32, MinGW-w64, Visual Studio, WDK
+
+Installation and Compilation
+----------------------------
+
+See: https://github.com/pbatard/libwdi/wiki/Install
+
+API usage
+---------
+
+See: https://github.com/pbatard/libwdi/wiki/Usage
+
+FAQ
+---
+
+See: https://github.com/pbatard/libwdi/wiki/FAQ

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT([libwdi], [1.2.5], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
-AM_INIT_AUTOMAKE([-Wno-portability 1.11])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 foreign])
 AC_CONFIG_SRCDIR([libwdi/libwdi.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])

examples/wdi-simple.rc

@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,5,688
- PRODUCTVERSION 1,2,5,688
+ FILEVERSION 1,2,5,689
+ PRODUCTVERSION 1,2,5,689
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.2.5.688"
+            VALUE "FileVersion", "1.2.5.689"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "wdi-simple.exe"
             VALUE "ProductName", "WDI-Simple"
-            VALUE "ProductVersion", "1.2.5.688"
+            VALUE "ProductVersion", "1.2.5.689"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

examples/zadic.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,5,688
- PRODUCTVERSION 1,2,5,688
+ FILEVERSION 1,2,5,689
+ PRODUCTVERSION 1,2,5,689
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.2.5.688"
+            VALUE "FileVersion", "1.2.5.689"
             VALUE "InternalName", "Zadic"
             VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.2.5.688"
+            VALUE "ProductVersion", "1.2.5.689"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

examples/zadig.h

@@ -59,7 +59,7 @@
 #define FIELD_ORANGE                RGB(255,240,200)
 #define ARROW_GREEN                 RGB(92,228,65)
 #define ARROW_ORANGE                RGB(253,143,56)
-#define APP_VERSION                 "Zadig 2.2.688"
+#define APP_VERSION                 "Zadig 2.2.689"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {

examples/zadig.rc

@@ -248,8 +248,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,682,688
- PRODUCTVERSION 2,2,682,688
+ FILEVERSION 2,2,682,689
+ PRODUCTVERSION 2,2,682,689
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -266,13 +266,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.2.688"
+            VALUE "FileVersion", "2.2.689"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.2.688"
+            VALUE "ProductVersion", "2.2.689"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

examples/zadig_README.creole

@@ -1,3 +1,10 @@
+=== v2.2 (2016.01.22) ===
+* Add USB Serial (CDC) support (**EXPERIMENTAL**)
+* Use SHA-256 instead of SHA-1 wherever possible
+* Fix a possible crash when deleting the private key
+* Other improvements
+* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
+
 === v2.1.2 (2015.04.30) ===
 * Fix freezout when listing all devices on some systems
 * Update version detection for Windows 10

libwdi/installer.h

@@ -138,6 +138,9 @@ typedef RETURN_TYPE CONFIGRET;
 #ifndef ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED
 #define ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED 0xE0000243
 #endif
+#ifndef ERROR_FILE_HASH_NOT_IN_CATALOG
+#define ERROR_FILE_HASH_NOT_IN_CATALOG    0xE000024B
+#endif
 
 typedef enum {
 	DIFXAPI_SUCCESS,

libwdi/libwdi.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,5,688
- PRODUCTVERSION 1,2,5,688
+ FILEVERSION 1,2,5,689
+ PRODUCTVERSION 1,2,5,689
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
-            VALUE "FileVersion", "1.2.5.688"
+            VALUE "FileVersion", "1.2.5.689"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.2.5.688"
+            VALUE "ProductVersion", "1.2.5.689"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END

libwdi/pki.c

@@ -39,10 +39,13 @@
 #include "libwdi.h"
 #include "logging.h"
 
-#define KEY_CONTAINER   L"libwdi key container"
-#define PF_ERR          wdi_err
+#define KEY_CONTAINER               L"libwdi key container"
+#define PF_ERR                      wdi_err
 #ifndef CERT_STORE_PROV_SYSTEM_A
-#define CERT_STORE_PROV_SYSTEM_A ((LPCSTR) 9)
+#define CERT_STORE_PROV_SYSTEM_A    ((LPCSTR) 9)
+#endif
+#ifndef szOID_RSA_SHA256RSA
+#define szOID_RSA_SHA256RSA         "1.2.840.113549.1.1.11"
 #endif
 
 /*