svn commit: r1070932 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message: WSSecEncryptedKey.java token/DOMX509IssuerSerial.java

[coheigea]

Author: coheigea
Date: Tue Feb 15 15:11:36 2011
New Revision: 1070932

URL: http://svn.apache.org/viewvc?rev=1070932&view=rev
Log:
Changed how issuer DNs are populated in Issuer Serial after finding an interop 
bug with a Metro endpoint.

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/DOMX509IssuerSerial.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=1070932&r1=1070931&r2=1070932&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
 Tue Feb 15 15:11:36 2011
@@ -278,7 +278,7 @@ public class WSSecEncryptedKey extends W
             break;
 
         case WSConstants.ISSUER_SERIAL:
-            String issuer = remoteCert.getIssuerX500Principal().getName();
+            String issuer = remoteCert.getIssuerDN().getName();
             java.math.BigInteger serialNumber = remoteCert.getSerialNumber();
             DOMX509IssuerSerial domIssuerSerial = 
                 new DOMX509IssuerSerial(

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/DOMX509IssuerSerial.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/DOMX509IssuerSerial.java?rev=1070932&r1=1070931&r2=1070932&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/DOMX509IssuerSerial.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/DOMX509IssuerSerial.java
 Tue Feb 15 15:11:36 2011
@@ -22,6 +22,7 @@ package org.apache.ws.security.message.t
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.util.DOM2Writer;
 import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.xml.security.utils.RFC2253Parser;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -29,8 +30,6 @@ import org.w3c.dom.Text;
 
 import java.math.BigInteger;
 
-import javax.security.auth.x500.X500Principal;
-
 /**
  * An X.509 Issuer Serial token.
  */
@@ -69,8 +68,7 @@ public final class DOMX509IssuerSerial {
         if (serialNumber == null) {
             throw new NullPointerException("The serialNumber cannot be null");
         }
-        new X500Principal(issuer);
-        this.issuer = issuer;
+        this.issuer = RFC2253Parser.normalize(issuer);
         this.serialNumber = serialNumber;
         
         element = 
@@ -82,7 +80,7 @@ public final class DOMX509IssuerSerial {
             doc.createElementNS(
                 WSConstants.SIG_NS, WSConstants.SIG_PREFIX + ":" + 
WSConstants.X509_ISSUER_NAME_LN
             );
-        issuerNameElement.appendChild(doc.createTextNode(issuer));
+        issuerNameElement.appendChild(doc.createTextNode(this.issuer));
         element.appendChild(issuerNameElement);
         
         Element serialNumberElement =