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 1865db337839b90163a88e5a65b18a0aed37aa8b..4f39482c4be1eac40b44cce584ffce8736eb7866 100644 (file)
--- 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 d1ec15e38f34861fa7ef4a6ed04aae933bf675e0..c0d096be55efd66d52fc527a66ff7a156be6b282 100644 (file)
--- 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)" != ""