[jboss-cvs] Picketlink SVN: r337 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2010-07-29 15:12:48 -0400 (Thu, 29 Jul 2010)
New Revision: 337

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
Log:
PLFED-100: add additional transform

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java	2010-07-29 18:24:23 UTC (rev 336)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java	2010-07-29 19:12:48 UTC (rev 337)
@@ -29,6 +29,7 @@
 import java.security.PrivateKey;
 import java.security.PrivilegedAction;
 import java.security.PublicKey;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -119,7 +120,7 @@
             return null;
          }
       }); 
-   };
+   }; 
    
    /**
     * Set the canonicalization method type
@@ -248,17 +249,20 @@
       PublicKey publicKey = keyPair.getPublic();
       
      DOMSignContext dsc = new DOMSignContext(signingKey, doc.getDocumentElement());  
-     dsc.setDefaultNamespacePrefix("dsig");
-
-//     dsc.putNamespacePrefix(XMLSignature.XMLNS, "ds");
-     
+     dsc.setDefaultNamespacePrefix("dsig"); 
+         
      DigestMethod digestMethodObj = fac.newDigestMethod(digestMethod, null);
-     Transform transform = fac.newTransform(Transform.ENVELOPED,
+     Transform transform1 = fac.newTransform(Transform.ENVELOPED,
            (TransformParameterSpec) null);
-     
-     List<Transform> transformList = Collections.singletonList(transform);
+     Transform transform2 =  fac.newTransform("http://www.w3.org/2001/10/xml-exc-c14n#",
+           (TransformParameterSpec) null);
+
+     List<Transform>  transformList = new ArrayList<Transform>() ;
+     transformList.add(transform1); 
+     transformList.add(transform2);  
+
      Reference ref = fac.newReference
-       ( referenceURI, digestMethodObj,transformList,null, null); 
+     ( referenceURI,  digestMethodObj,transformList,null, null); 
      
      CanonicalizationMethod canonicalizationMethod
          = fac.newCanonicalizationMethod