[pki] use SHA1 for self signed certificate on Windows 7

geovie · pbatard · commit 029b7e5af541 · 2018-02-20T16:54:39.000Z
* Prevents Windows 7 from showing a "Trusted Publisher" dialog due to the use of SHA256 * Closes pbatard#114
diff --git a/examples/wdi-simple.rc b/examples/wdi-simple.rc
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,716,0
- PRODUCTVERSION 1,3,716,0
+ FILEVERSION 1,3,717,0
+ PRODUCTVERSION 1,3,717,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "WDI-Simple"
-            VALUE "FileVersion", "1.3.716"
+            VALUE "FileVersion", "1.3.717"
             VALUE "InternalName", "WDI-Simple"
             VALUE "LegalCopyright", "� 2010-2017 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.3.716"
+            VALUE "ProductVersion", "1.3.717"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadic.rc b/examples/zadic.rc
@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,716,0
- PRODUCTVERSION 1,3,716,0
+ FILEVERSION 1,3,717,0
+ PRODUCTVERSION 1,3,717,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadic"
-            VALUE "FileVersion", "1.3.716"
+            VALUE "FileVersion", "1.3.717"
             VALUE "InternalName", "Zadic"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "zadic.exe"
             VALUE "ProductName", "Zadic"
-            VALUE "ProductVersion", "1.3.716"
+            VALUE "ProductVersion", "1.3.717"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/examples/zadig.h b/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.3.716"
+#define APP_VERSION                 "Zadig 2.3.717"
 
 // These are used to flag end users about the driver they are going to replace
 enum driver_type {
diff --git a/examples/zadig.rc b/examples/zadig.rc
@@ -246,8 +246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,716,0
- PRODUCTVERSION 2,3,716,0
+ FILEVERSION 2,3,717,0
+ PRODUCTVERSION 2,3,717,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Zadig"
-            VALUE "FileVersion", "2.3.716"
+            VALUE "FileVersion", "2.3.717"
             VALUE "InternalName", "Zadig"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "zadig.exe"
             VALUE "ProductName", "Zadig"
-            VALUE "ProductVersion", "2.3.716"
+            VALUE "ProductVersion", "2.3.717"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/libwdi.rc b/libwdi/libwdi.rc
@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,716,0
- PRODUCTVERSION 1,3,716,0
+ FILEVERSION 1,3,717,0
+ PRODUCTVERSION 1,3,717,0
  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.3.716"
+            VALUE "FileVersion", "1.3.717"
             VALUE "InternalName", "libwdi"
             VALUE "LegalCopyright", "� 2010-2017 Pete Batard (LGPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
             VALUE "OriginalFilename", "libwdi"
             VALUE "ProductName", "libwdi"
-            VALUE "ProductVersion", "1.3.716"
+            VALUE "ProductVersion", "1.3.717"
             VALUE "Comments", "http://libwdi.akeo.ie"
         END
     END
diff --git a/libwdi/pki.c b/libwdi/pki.c
@@ -38,12 +38,16 @@
 #include "installer.h"
 #include "libwdi.h"
 #include "logging.h"
+#include "stdfn.h"
 
 #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)
 #endif
+#ifndef szOID_RSA_SHA1RSA
+#define szOID_RSA_SHA1RSA           "1.2.840.113549.1.1.5"
+#endif
 #ifndef szOID_RSA_SHA256RSA
 #define szOID_RSA_SHA256RSA         "1.2.840.113549.1.1.11"
 #endif
@@ -796,7 +800,10 @@ PCCERT_CONTEXT CreateSelfSignedCert(LPCSTR szCertSubject)
 
 	// Prepare algorithm structure for self-signed certificate
 	memset(&SignatureAlgorithm, 0, sizeof(SignatureAlgorithm));
-	SignatureAlgorithm.pszObjId = szOID_RSA_SHA256RSA;
+
+	// Windows 7 does not properly support SHA256 and may show a "Trusted Publisher" dialog unless SHA1 is used
+	GetWindowsVersion();
+	SignatureAlgorithm.pszObjId = (nWindowsVersion > WINDOWS_7) ? szOID_RSA_SHA256RSA : szOID_RSA_SHA1RSA;
 
 	// Create self-signed certificate
 	pCertContext = pfCertCreateSelfSignCertificate((ULONG_PTR)NULL,
