Skip to content

Commit

Permalink
Update release version.
Browse files Browse the repository at this point in the history
Update code signing command line and retire SHA1 signing.
  • Loading branch information
dxgldotorg committed Apr 16, 2022
1 parent 48a0386 commit 7109ce4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 23 deletions.
3 changes: 1 addition & 2 deletions Installer/dxgl.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ReadMe.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 5 additions & 19 deletions buildtool/buildtool.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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, "\"");
Expand Down
2 changes: 1 addition & 1 deletion common/releasever.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7109ce4

Please sign in to comment.