You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2024/05/22 10:55:10 UTC
(ws-wss4j) 19/23: Replacing some denigrated API calls to X509Certificate
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3_0_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit ecfc3ef3d33a152cbe0fef0f8bb9c0a3d24561c7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed May 22 10:58:16 2024 +0100
Replacing some denigrated API calls to X509Certificate
---
.../src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java | 2 +-
.../src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
index 024c9db52..0ceba100f 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
@@ -108,7 +108,7 @@ public class CertificateStore extends CryptoBase {
* @throws WSSecurityException
*/
public String getX509Identifier(X509Certificate cert) throws WSSecurityException {
- return cert.getSubjectDN().toString();
+ return cert.getSubjectX500Principal().toString();
}
/**
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
index 076fe193c..7279e75f1 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
@@ -340,7 +340,7 @@ public abstract class CryptoBase implements Crypto {
LOG.debug("The certificate is null so no constraints matching was possible");
return false;
}
- String issuerDn = cert.getIssuerDN().getName();
+ String issuerDn = cert.getIssuerX500Principal().getName();
return matchesName(issuerDn, issuerDNPatterns);
}
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
index 3ed8061e2..b1e14bf89 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
@@ -445,7 +445,7 @@ public class WSSecSignatureSAML extends WSSecSignature {
}
private void addIssuerSerial(X509Certificate cert, SecurityTokenReference secRef, boolean isQuoteDelimited) {
- final String issuer = cert.getIssuerDN().getName();
+ final String issuer = cert.getIssuerX500Principal().getName();
final java.math.BigInteger serialNumber = cert.getSerialNumber();
final DOMX509IssuerSerial domIssuerSerial =
new DOMX509IssuerSerial(getDocument(), issuer, serialNumber, isQuoteDelimited);