This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 759139b95d Replace calls to methods that are deprecated in Java 16+ 759139b95d is described below commit 759139b95d6b188a5cf2b2c4ea93a9eda04d9ac9 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jan 12 19:49:15 2023 +0000 Replace calls to methods that are deprecated in Java 16+ --- java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +- java/org/apache/tomcat/util/net/openssl/OpenSSLX509Certificate.java | 2 ++ test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java index 0c73006f90..76b485654f 100644 --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java @@ -465,7 +465,7 @@ public abstract class SSLUtilBase implements SSLUtil { ((X509Certificate) cert).checkValidity(now); } catch (CertificateExpiredException | CertificateNotYetValidException e) { String msg = sm.getString("sslUtilBase.trustedCertNotValid", alias, - ((X509Certificate) cert).getSubjectDN(), e.getMessage()); + ((X509Certificate) cert).getSubjectX500Principal(), e.getMessage()); if (log.isDebugEnabled()) { log.debug(msg, e); } else { diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLX509Certificate.java b/java/org/apache/tomcat/util/net/openssl/OpenSSLX509Certificate.java index de33204b60..a3eddce8c0 100644 --- a/java/org/apache/tomcat/util/net/openssl/OpenSSLX509Certificate.java +++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLX509Certificate.java @@ -62,11 +62,13 @@ final class OpenSSLX509Certificate extends X509Certificate { } @Override + @Deprecated public Principal getIssuerDN() { return unwrap().getIssuerDN(); } @Override + @Deprecated public Principal getSubjectDN() { return unwrap().getSubjectDN(); } diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java b/test/org/apache/tomcat/util/net/TesterSupport.java index 9922e82d11..c3bd64330e 100644 --- a/test/org/apache/tomcat/util/net/TesterSupport.java +++ b/test/org/apache/tomcat/util/net/TesterSupport.java @@ -274,7 +274,7 @@ public final class TesterSupport { try { KeyStore ks = getKeyStore(CA_JKS); X509Certificate cert = (X509Certificate)ks.getCertificate(CA_ALIAS); - clientAuthExpectedIssuer = cert.getSubjectDN().getName(); + clientAuthExpectedIssuer = cert.getSubjectX500Principal().toString(); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -283,7 +283,7 @@ public final class TesterSupport { try { KeyStore ks = getKeyStore(CLIENT_JKS); X509Certificate cert = (X509Certificate)ks.getCertificate(CLIENT_ALIAS); - cn = cert.getSubjectDN().getName(); + cn = cert.getSubjectX500Principal().toString(); } catch (Exception ex) { throw new RuntimeException(ex); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org