This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new b9e9801 63523: Restore SSLUtilBase methods as protected to preserve compatibility b9e9801 is described below commit b9e9801d723a0f311ab64aa1f134e6bfa737b2f5 Author: remm <r...@apache.org> AuthorDate: Fri Jun 21 00:02:12 2019 +0200 63523: Restore SSLUtilBase methods as protected to preserve compatibility --- java/org/apache/tomcat/util/net/SSLUtilBase.java | 4 ++-- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java index 43c1ca9..d84b532 100644 --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java @@ -485,7 +485,7 @@ public abstract class SSLUtilBase implements SSLUtil { * @return The parameters including the CRLs and TrustStore. * @throws Exception An error occurred */ - private CertPathParameters getParameters(String crlf, KeyStore trustStore, + protected CertPathParameters getParameters(String crlf, KeyStore trustStore, boolean revocationEnabled) throws Exception { PKIXBuilderParameters xparams = @@ -512,7 +512,7 @@ public abstract class SSLUtilBase implements SSLUtil { * @throws CRLException CRL error * @throws CertificateException Error processing certificate */ - private Collection<? extends CRL> getCRLs(String crlf) + protected Collection<? extends CRL> getCRLs(String crlf) throws IOException, CRLException, CertificateException { Collection<? extends CRL> crls = null; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index aee16d3..2087c9a 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -52,6 +52,10 @@ Connector is configured with <code>useAsyncIO</code> as <code>true</code>. (markt) </fix> + <fix> + <bug>63523</bug>: Restore SSLUtilBase methods as protected to preserve + compatibility. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org