From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 29 Nov 2010 22:47:10 +0000 (-0500)
Subject: Windows: permit code signing without timestamps
X-Git-Tag: debian/1.6.0.pre3-1~5^2^2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7ac00619358c7a1b1749440e4c4ca6510ff87687;p=packages%2Fo%2Fopenafs.git

Windows: permit code signing without timestamps

If CODESIGN_TIMESTAMP is not defined, permit code signing
to occur but do not ask signtool to contact a timestamp
server.

Change-Id: Iaac89f8db96c9428481a638fc72f8d14c53e2045
Reviewed-on: http://gerrit.openafs.org/3393
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-on: http://gerrit.openafs.org/4231
---

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 1865db337..4f39482c4 100644
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -335,13 +335,20 @@ _VC_MANIFEST_EMBED_DLL=
 SIGNTOOL=signtool.exe
 !ENDIF
 
-!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
 CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $(CODESIGN_OTHER) $@
 !IF "$(CODESIGN_CROSS_CERT)" != ""
-CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v $@
+!ENDIF
 !ENDIF
 !ELSE
-CODESIGN_USERLAND=
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" $@
+!ENDIF
+!ENDIF
 !ENDIF
 
 !IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index d1ec15e38..c0d096be5 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -342,14 +342,22 @@ _VC_MANIFEST_EMBED_DLL=
 SIGNTOOL=signtool.exe
 !ENDIF
 
-!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
 CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $(CODESIGN_OTHER) $@
 !IF "$(CODESIGN_CROSS_CERT)" != ""
-CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v $@
+!ENDIF
 !ENDIF
 !ELSE
-CODESIGN_USERLAND=
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" $@
+!ENDIF
 !ENDIF
+!ENDIF
+
 
 !IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
 !IF "$(SYMSTORE_COMMENT)" != ""