From 339d94c0d95847c18f2a0f8219b0fa7161d6fc43 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 11 Feb 2021 08:27:23 +0100 Subject: try to use a different timestamp service Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922 --- instsetoo_native/CustomTarget_install.mk | 2 +- postprocess/CustomTarget_signing.mk | 2 +- postprocess/signing/signing.pl | 2 +- solenv/bin/modules/installer/windows/msp.pm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index ab620d5844ed..99082b14be22 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -131,7 +131,7 @@ endif endif # LIBO_TEST_INSTALL touch $@ -TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll" +TIMESTAMPURL ?= "http://timestamp.digicert.com/" $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: \ $(if $(filter HELP,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done) \ $(if $(filter ODK,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \ diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 7ba7c5832f17..c2f03ce937a1 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/signing,\ )) # PFXFILE and PFXPASSWORD should be set in environment -TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll" +TIMESTAMPURL ?= "http://timestamp.digicert.com/" $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(SRCDIR)/postprocess/signing/signing.pl \ diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl index ed8065399f05..769b9efbcc7a 100644 --- a/postprocess/signing/signing.pl +++ b/postprocess/signing/signing.pl @@ -241,7 +241,7 @@ sub usage #09.07.2007 08:39 print "\t -e filename\t\t\tFile which contains a list of files which don't have to be signed.\n"; print "\t -f pfx_filename\t\t\"Personal Information Exchange\" file.\n"; print "\t -p password\t\t\tPassword for \"Personal Information Exchange\" file.\n"; - print "\t -t timestamp\t\t\tTimestamp URL e.g. \"http://timestamp.verisign.com/scripts/timstamp.dll\"\n"; + print "\t -t timestamp\t\t\tTimestamp URL e.g. \"http://timestamp.digicert.com/\"\n"; print "\t -l log_filename\t\tFile for logging.\n"; print "\t -v\t\t\t\tVerbose.\n"; } ##usage diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 1bbeea8d20cb..95f51d846c40 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -1194,7 +1194,7 @@ sub create_msp_patch my $systemcall = "signtool.exe sign "; if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'} "; } if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p $ENV{'PFXPASSWORD'} "; } - if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.globalsign.com/scripts/timestamp.dll "; } + if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t $ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t http://timestamp.digicert.com/ "; } $systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'} . " Patch " . $allvariables->{'WINDOWSPATCHLEVEL'} . "\" "; $systemcall .= $localmspfilename; installer::logger::print_message( "... code signing and timestamping with signtool.exe ...\n" ); -- cgit v1.2.3