From 7109ce42832204181464af8762177439aebe8d1d Mon Sep 17 00:00:00 2001
From: dxgldotorg <william@dxgl.org>
Date: Sat, 16 Apr 2022 14:29:31 -0400
Subject: [PATCH] Update release version. Update code signing command line and
 retire SHA1 signing.

---
 Installer/dxgl.nsi    |  3 +--
 ReadMe.md             |  2 +-
 buildtool/buildtool.c | 24 +++++-------------------
 common/releasever.h   |  2 +-
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Installer/dxgl.nsi b/Installer/dxgl.nsi
index 8eec6e8f..6e8e446e 100644
--- a/Installer/dxgl.nsi
+++ b/Installer/dxgl.nsi
@@ -603,8 +603,7 @@ Section Uninstall
 SectionEnd
 
 !if ${SIGNTOOL} == 1
-!finalize 'signtool sign /t http://timestamp.comodoca.com %1'
 !if ${COMPILER} == "VC2022_1"
-!finalize 'signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /as %1'
+!finalize 'signtool sign /tr http://timestamp.sectigo.com /td sha384 /fd sha384 /as %1'
 !endif
 !endif
diff --git a/ReadMe.md b/ReadMe.md
index 86033acd..9019d560 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,5 +1,5 @@
 <!--Please enable Word Wrap in Notepad to view this document.-->
-# DXGL 0.5.19
+# DXGL 0.5.20
 https://dxgl.org
 
 ## Introduction
diff --git a/buildtool/buildtool.c b/buildtool/buildtool.c
index cdb2d9d2..76a2697a 100644
--- a/buildtool/buildtool.c
+++ b/buildtool/buildtool.c
@@ -1,5 +1,5 @@
 // DXGL
-// Copyright (C) 2012-2021 William Feely
+// Copyright (C) 2012-2022 William Feely
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -335,7 +335,7 @@ int ProcessHeaders(char *path)
 	version.build = 0;
 	version.major = 0;
 	version.minor = 5;
-	version.point = 19;
+	version.point = 20;
 	if (!GetGitVersion(path, &version)) ParseVersion(&version, TRUE);
 	else ParseVersion(&version, TRUE);
 	if (SIGNMODE < 1) nosign = TRUE;
@@ -775,15 +775,14 @@ int SignEXE(char *exefile, char *path)
 {
 	PROCESS_INFORMATION process;
 	STARTUPINFOA startinfo;
-	const char signtoolsha1path[] = "signtool sign /t http://timestamp.comodoca.com ";
-	const char signtoolsha256path[] = "signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /as ";
+	const char signtoolsha384path[] = "signtool sign /tr http://timestamp.sectigo.com /td sha384 /fd sha384 /as ";
 	char signpath[MAX_PATH + 80];
 	DXGLVER version;
 	BOOL nosign = FALSE;
 	version.build = 0;
 	version.major = 0;
 	version.minor = 5;
-	version.point = 19;
+	version.point = 20;
 	if (!GetGitVersion(path, &version)) ParseVersion(&version, TRUE);
 	else ParseVersion(&version, TRUE);
 	if (SIGNMODE < 1) nosign = TRUE;
@@ -796,21 +795,8 @@ int SignEXE(char *exefile, char *path)
 		puts("Skipping file signature.");
 		return 0;
 	}
-	strcpy(signpath, signtoolsha1path);
-	strcat(signpath, "\"");
-	strncat(signpath, exefile, MAX_PATH);
-	strcat(signpath, "\"");
-	ZeroMemory(&startinfo, sizeof(STARTUPINFOA));
-	startinfo.cb = sizeof(STARTUPINFOA);
-	if (CreateProcessA(NULL, signpath, NULL, NULL, FALSE, 0, NULL, NULL, &startinfo, &process))
-	{
-		WaitForSingleObject(process.hProcess, INFINITE);
-		CloseHandle(process.hProcess);
-		CloseHandle(process.hThread);
-		Sleep(15000);
-	}
 #if (_MSC_VER >= 1920)
-	strcpy(&signpath, &signtoolsha256path);
+	strcpy(&signpath, &signtoolsha384path);
 	strcat(&signpath, "\"");
 	strncat(&signpath, exefile, MAX_PATH);
 	strcat(&signpath, "\"");
diff --git a/common/releasever.h b/common/releasever.h
index 8fcf8101..916fb375 100644
--- a/common/releasever.h
+++ b/common/releasever.h
@@ -5,7 +5,7 @@
 /* Removed due to transition to Git - Git tags will set the version number
 #define DXGLMAJORVER 0
 #define DXGLMINORVER 5
-#define DXGLPOINTVER 19
+#define DXGLPOINTVER 20
 #define DXGLBETA 0