Author: markt Date: Fri Mar 31 19:05:33 2017 New Revision: 1789733 URL: http://svn.apache.org/viewvc?rev=1789733&view=rev Log: Update for API changes (client cert is now required) for Symantec code signing service
Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1789733&r1=1789732&r2=1789733&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Fri Mar 31 19:05:33 2017 @@ -71,6 +71,8 @@ do.codesigning=false codesigning.user=request-via-pmc codesigning.pwd=request-via-pmc codesigning.partnercode=request-via-pmc +codesigning.keyStore=request-via-pmc +codesigning.keyStorePassword=request-via-pmc codesigning.service=Microsoft Windows Signing # ----- Settings to use when downloading files ----- Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1789733&r1=1789732&r2=1789733&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Fri Mar 31 19:05:33 2017 @@ -2059,6 +2059,8 @@ skip.installer property in build.propert classpath="${tomcat.classes}" /> <signcode userName="${codesigning.user}" password="${codesigning.pwd}" partnerCode="${codesigning.partnercode}" + keyStore="${codesigning.keyStore}" + keyStorePassword="${codesigning.keyStorePassword}" applicationName="Apache Tomcat ${version.major.minor} Uninstaller" applicationversion="${version}" signingService="${codesigning.service}"> Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1789733&r1=1789732&r2=1789733&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original) +++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Fri Mar 31 19:05:33 2017 @@ -78,6 +78,8 @@ public class SignCode extends Task { private String userName; private String password; private String partnerCode; + private String keyStore; + private String keyStorePassword; private String applicationName; private String applicationVersion; private String signingService; @@ -102,6 +104,16 @@ public class SignCode extends Task { } + public void setKeyStore(String keyStore) { + this.keyStore = keyStore; + } + + + public void setKeyStorePassword(String keyStorePassword) { + this.keyStorePassword = keyStorePassword; + } + + public void setApplicationName(String applicationName) { this.applicationName = applicationName; } @@ -136,6 +148,10 @@ public class SignCode extends Task { } } + // Set up the TLS client + System.setProperty("javax.net.ssl.keyStore", keyStore); + System.setProperty("javax.net.ssl.keyStorePassword", keyStorePassword); + try { String signingSetID = makeSigningRequest(filesToSign); downloadSignedFiles(filesToSign, signingSetID); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org