Author: coheigea
Date: Tue Oct 20 12:55:54 2009
New Revision: 827425
URL: http://svn.apache.org/viewvc?rev=827425&view=rev
Log:
[WSS-212] - Replace deprecated references to getSubject/IssuerDN
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java?rev=827425&r1=827424&r2=827425&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
Tue Oct 20 12:55:54 2009
@@ -334,7 +334,7 @@
X509Certificate x509cert = (X509Certificate) cert;
if (x509cert.getSerialNumber().compareTo(serialNumber) == 0) {
Object certName =
- createBCX509Name(x509cert.getIssuerDN().getName());
+
createBCX509Name(x509cert.getIssuerX500Principal().getName());
if (certName.equals(issuerName)) {
return alias;
}
@@ -399,7 +399,7 @@
X509Certificate x509cert = (X509Certificate) cert;
if (x509cert.getSerialNumber().compareTo(serialNumber) == 0) {
Object certName =
- createBCX509Name(x509cert.getIssuerDN().getName());
+
createBCX509Name(x509cert.getIssuerX500Principal().getName());
if (certName.equals(issuerName)) {
return x509cert;
}
@@ -419,7 +419,7 @@
* @throws WSSecurityException
*/
public boolean isCertificateInKeyStore(X509Certificate cert) throws
WSSecurityException {
- String issuerString = cert.getIssuerDN().getName();
+ String issuerString = cert.getIssuerX500Principal().getName();
BigInteger issuerSerial = cert.getSerialNumber();
X509Certificate foundCert = getX509Certificate(issuerString,
issuerSerial);
@@ -430,7 +430,9 @@
//
if (foundCert != null && foundCert.equals(cert)) {
if (log.isDebugEnabled()) {
- log.debug("Direct trust for certificate with " +
cert.getSubjectDN().getName());
+ log.debug(
+ "Direct trust for certificate with " +
cert.getSubjectX500Principal().getName()
+ );
}
return true;
}
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java?rev=827425&r1=827424&r2=827425&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/processor/SignatureProcessor.java
Tue Oct 20 12:55:54 2009
@@ -453,8 +453,8 @@
return false;
}
- String subjectString = cert.getSubjectDN().getName();
- String issuerString = cert.getIssuerDN().getName();
+ String subjectString = cert.getSubjectX500Principal().getName();
+ String issuerString = cert.getIssuerX500Principal().getName();
BigInteger issuerSerial = cert.getSerialNumber();
if (log.isDebugEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
