You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2012/07/31 15:41:06 UTC
svn commit: r1367541 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/keys/content/x509/
main/java/org/apache/xml/security/keys/keyresolver/implementations/
main/java/org/apache/xml/security/keys/storage/implementations/ m...
Author: coheigea
Date: Tue Jul 31 13:41:05 2012
New Revision: 1367541
URL: http://svn.apache.org/viewvc?rev=1367541&view=rev
Log:
[SANTUARIO-335] - Remove use of X509Certificate getSubjectDN + getIssuerDN
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java Tue Jul 31 13:41:05 2012
@@ -91,7 +91,7 @@ public class XMLX509IssuerSerial extends
public XMLX509IssuerSerial(Document doc, X509Certificate x509certificate) {
this(
doc,
- RFC2253Parser.normalize(x509certificate.getIssuerDN().getName()),
+ x509certificate.getIssuerX500Principal().getName(),
x509certificate.getSerialNumber()
);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java Tue Jul 31 13:41:05 2012
@@ -63,7 +63,7 @@ public class XMLX509SubjectName extends
* @param x509certificate
*/
public XMLX509SubjectName(Document doc, X509Certificate x509certificate) {
- this(doc, RFC2253Parser.normalize(x509certificate.getSubjectDN().getName()));
+ this(doc, x509certificate.getSubjectX500Principal().getName());
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Tue Jul 31 13:41:05 2012
@@ -123,7 +123,7 @@ public class X509SKIResolver extends Key
for (int i = 0; i < x509childObject.length; i++) {
if (certSKI.equals(x509childObject[i])) {
if (log.isDebugEnabled()) {
- log.debug("Return PublicKey from " + cert.getSubjectDN().getName());
+ log.debug("Return PublicKey from " + cert.getSubjectX500Principal().getName());
}
return cert;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Tue Jul 31 13:41:05 2012
@@ -113,7 +113,7 @@ public class CertsInFilesystemDirectoryR
cert.checkValidity();
this.certs.add(cert);
- dn = cert.getSubjectDN().getName();
+ dn = cert.getSubjectX500Principal().getName();
added = true;
} catch (FileNotFoundException ex) {
if (log.isDebugEnabled()) {
@@ -216,10 +216,10 @@ public class CertsInFilesystemDirectoryR
+ Base64.encode(ski) + "\"");
System.out.println("cert.getSerialNumber()= \""
+ cert.getSerialNumber().toString() + "\"");
- System.out.println("cert.getSubjectDN().getName()= \""
- + cert.getSubjectDN().getName() + "\"");
- System.out.println("cert.getIssuerDN().getName()= \""
- + cert.getIssuerDN().getName() + "\"");
+ System.out.println("cert.getSubjectX500Principal().getName()= \""
+ + cert.getSubjectX500Principal().getName() + "\"");
+ System.out.println("cert.getIssuerX500Principal().getName()= \""
+ + cert.getIssuerX500Principal().getName() + "\"");
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java Tue Jul 31 13:41:05 2012
@@ -18,15 +18,27 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.utils.RFC2253Parser;
-import org.apache.xml.security.stax.ext.stax.*;
-import org.apache.xml.security.stax.impl.EncryptionPartDef;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
-import java.security.cert.X509Certificate;
-import java.util.*;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
+import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.impl.EncryptionPartDef;
/**
* An abstract OutputProcessor class for reusabilty
@@ -213,7 +225,7 @@ public abstract class AbstractOutputProc
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509IssuerSerial, false, null);
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509IssuerName, false, null);
- createCharactersAndOutputAsEvent(outputProcessorChain, RFC2253Parser.normalize(x509Certificates[0].getIssuerX500Principal().getName(), true));
+ createCharactersAndOutputAsEvent(outputProcessorChain, x509Certificates[0].getIssuerX500Principal().getName());
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509IssuerName);
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SerialNumber, false, null);
createCharactersAndOutputAsEvent(outputProcessorChain, x509Certificates[0].getSerialNumber().toString());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Tue Jul 31 13:41:05 2012
@@ -24,7 +24,6 @@ import org.apache.xml.security.stax.conf
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.algorithms.ECDSAUtils;
-import org.apache.xml.security.utils.RFC2253Parser;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -304,7 +303,7 @@ public class XMLSecurityUtils {
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SubjectName, false, null);
- String subjectName = RFC2253Parser.normalize(x509Certificates[0].getSubjectDN().getName());
+ String subjectName = x509Certificates[0].getSubjectX500Principal().getName();
abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, subjectName);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SubjectName);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/KeyStoreResolverTest.java Tue Jul 31 13:41:05 2012
@@ -74,7 +74,7 @@ public class KeyStoreResolverTest extend
while (iter.hasNext()) {
X509Certificate cert = (X509Certificate) iter.next();
- cert.getSubjectDN().getName();
+ cert.getSubjectX500Principal().getName();
count++;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/storage/StorageResolverTest.java Tue Jul 31 13:41:05 2012
@@ -81,7 +81,7 @@ public class StorageResolverTest extends
while (iter.hasNext()) {
X509Certificate cert = (X509Certificate) iter.next();
- cert.getSubjectDN().getName();
+ cert.getSubjectX500Principal().getName();
count++;
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java?rev=1367541&r1=1367540&r2=1367541&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java Tue Jul 31 13:41:05 2012
@@ -27,7 +27,6 @@ import java.security.cert.X509Certificat
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
-import org.apache.xml.security.utils.RFC2253Parser;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -61,8 +60,8 @@ public class X509DataTest extends org.ju
// Add these three lines
org.apache.xml.security.keys.KeyInfo ki = sig.getKeyInfo();
- ki.itemX509Data(0).addSubjectName(cert.getSubjectDN().toString());
- ki.itemX509Data(0).addIssuerSerial(cert.getIssuerDN().toString(), cert.getSerialNumber());
+ ki.itemX509Data(0).addSubjectName(cert.getSubjectX500Principal().getName());
+ ki.itemX509Data(0).addIssuerSerial(cert.getIssuerX500Principal().getName(), cert.getSerialNumber());
sig.sign(getPrivateKey());
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -70,9 +69,9 @@ public class X509DataTest extends org.ju
XMLSignature newSig = getSignature(os.toByteArray());
assertNotNull(newSig.getKeyInfo().itemX509Data(0));
- assertEquals(RFC2253Parser.normalize(cert.getSubjectDN().toString()),
+ assertEquals(cert.getSubjectX500Principal().getName(),
newSig.getKeyInfo().itemX509Data(0).itemSubjectName(0).getSubjectName());
- assertEquals(RFC2253Parser.normalize(cert.getIssuerDN().toString()),
+ assertEquals(cert.getIssuerX500Principal().getName(),
newSig.getKeyInfo().itemX509Data(0).itemIssuerSerial(0).getIssuerName());
}