This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 34809cd4a8 Replace calls to methods that are deprecated in Java 16+
34809cd4a8 is described below
commit 34809cd4a8be88d6c46e678c0fc4517da93a493c
Author: Mark Thomas
AuthorDate: Thu Jan 12 19:49:15 2023 +
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 5c3ff28d54..71e7e020d9 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 2f13295886..374c440008 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -296,7 +296,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);
}
@@ -305,7 +305,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
