From 275493c3f51e457f3791fae2132413e4f5513167 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 24 Jul 2018 14:07:08 +0100
Subject: [PATCH] [net] add additional error messages

* Also update 7-zip URL
---
 src/net.c    | 10 +++++++++-
 src/rufus.h  |  2 +-
 src/rufus.rc | 10 +++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/net.c b/src/net.c
index e1da8f27..5c510315 100644
--- a/src/net.c
+++ b/src/net.c
@@ -53,7 +53,7 @@ static BOOL force_update_check = FALSE;
 
 /*
  * FormatMessage does not handle internet errors
- * https://msdn.microsoft.com/en-us/library/windows/desktop/aa385465.aspx
+ * https://docs.microsoft.com/en-us/windows/desktop/wininet/wininet-errors
  */
 const char* WinInetErrorString(void)
 {
@@ -135,10 +135,18 @@ const char* WinInetErrorString(void)
 		return "The request to the proxy was invalid.";
 	case ERROR_INTERNET_HANDLE_EXISTS:
 		return "The request failed because the handle already exists.";
+	case ERROR_INTERNET_SEC_INVALID_CERT:
+		return "The SSL certificate is invalid.";
 	case ERROR_INTERNET_SEC_CERT_DATE_INVALID:
 		return "SSL certificate date that was received from the server is bad. The certificate is expired.";
 	case ERROR_INTERNET_SEC_CERT_CN_INVALID:
 		return "SSL certificate common name (host name field) is incorrect.";
+	case ERROR_INTERNET_SEC_CERT_ERRORS:
+		return "The SSL certificate contains errors.";
+	case ERROR_INTERNET_SEC_CERT_NO_REV:
+		return "The SSL certificate was not revoked.";
+	case ERROR_INTERNET_SEC_CERT_REV_FAILED:
+		return "The revocation check of the SSL certificate failed.";
 	case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR:
 		return "The application is moving from a non-SSL to an SSL connection because of a redirect.";
 	case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR:
diff --git a/src/rufus.h b/src/rufus.h
index fc311a72..624144c7 100644
--- a/src/rufus.h
+++ b/src/rufus.h
@@ -85,7 +85,7 @@
 #define RUFUS_URL                   "https://rufus.ie"
 #define DOWNLOAD_URL                RUFUS_URL "/downloads"
 #define FILES_URL                   RUFUS_URL "/files"
-#define SEVENZIP_URL                "http://www.7-zip.org"
+#define SEVENZIP_URL                "https://www.7-zip.org"
 #define FILES_DIR                   "rufus_files"
 #define IGNORE_RETVAL(expr)         do { (void)(expr); } while(0)
 #ifndef ARRAYSIZE
diff --git a/src/rufus.rc b/src/rufus.rc
index 66596b22..d54c26f3 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.2.1357"
+CAPTION "Rufus 3.2.1358"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1357,0
- PRODUCTVERSION 3,2,1357,0
+ FILEVERSION 3,2,1358,0
+ PRODUCTVERSION 3,2,1358,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.2.1357"
+            VALUE "FileVersion", "3.2.1358"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.2.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.2.1357"
+            VALUE "ProductVersion", "3.2.1358"
         END
     END
     BLOCK "VarFileInfo"