From efcdbe30e5b8eea4848888733e0fd584d5ccc487 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 20 Aug 2018 08:12:28 +0100
Subject: [PATCH] [pki] clear buffer on invalid signature

* Avoid keeping potentially nasty stuff in memory for too long...
---
 src/pki.c    | 12 ++++++++----
 src/rufus.rc | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pki.c b/src/pki.c
index 8feada92..5ef2b5c0 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -690,21 +690,21 @@ BOOL ValidateOpensslSignature(BYTE* pbBuffer, DWORD dwBufferLen, BYTE* pbSignatu
 	// Import our RSA public key so that the MS API can use it
 	r = CryptImportKey(hProv, (BYTE*)&pbMyPubKey.BlobHeader, dwMyPubKeyLen, 0, 0, &hPubKey);
 	if (!r) {
-		uprintf("Could not import public key: %s", WinPKIErrorString());
+		uprintf("PKI: Could not import public key: %s", WinPKIErrorString());
 		goto out;
 	}
 
 	// Create the hash object.
 	r = CryptCreateHash(hProv, CALG_SHA_256, 0, 0, &hHash);
 	if (!r) {
-		uprintf("Could not create empty hash: %s", WinPKIErrorString());
+		uprintf("PKI: Could not create empty hash: %s", WinPKIErrorString());
 		goto out;
 	}
 
 	// Compute the cryptographic hash of the buffer.
 	r = CryptHashData(hHash, pbBuffer, dwBufferLen, 0);
 	if (!r) {
-		uprintf("Could not hash data: %s", WinPKIErrorString());
+		uprintf("PKI: Could not hash data: %s", WinPKIErrorString());
 		goto out;
 	}
 
@@ -718,8 +718,12 @@ BOOL ValidateOpensslSignature(BYTE* pbBuffer, DWORD dwBufferLen, BYTE* pbSignatu
 	// Now that we have all of the public key, hash and signature data in a
 	// format that Microsoft can handle, we can call CryptVerifySignature().
 	r = CryptVerifySignature(hHash, pbSignature, dwSigLen, hPubKey, NULL, 0);
-	if (!r)
+	if (!r) {
+		// If the signature is invalid, clear the buffer so that
+		// we don't keep potentially nasty stuff in memory.
+		memset(pbBuffer, 0, dwBufferLen);
 		uprintf("Signature validation failed: %s", WinPKIErrorString());
+	}
 
 out:
 	if (hHash)
diff --git a/src/rufus.rc b/src/rufus.rc
index 229d5c4e..fea07b7d 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.1376"
+CAPTION "Rufus 3.2.1377"
 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,1376,0
- PRODUCTVERSION 3,2,1376,0
+ FILEVERSION 3,2,1377,0
+ PRODUCTVERSION 3,2,1377,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.1376"
+            VALUE "FileVersion", "3.2.1377"
             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.1376"
+            VALUE "ProductVersion", "3.2.1377"
         END
     END
     BLOCK "VarFileInfo"