svn commit: r1496451 - in /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor: SAMLTokenProcessor.java SignatureProcessor.java

[coheigea]

Author: coheigea
Date: Tue Jun 25 12:44:55 2013
New Revision: 1496451

URL: http://svn.apache.org/r1496451
Log:
Adding secure validation property introduced in JDK 1.7.0_25

Modified:
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java?rev=1496451&r1=1496450&r2=1496451&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 Tue Jun 25 12:44:55 2013
@@ -161,6 +161,7 @@ public class SAMLTokenProcessor implemen
                 // structure for testing the transform/digest algorithms etc.
                 XMLValidateContext context = new DOMValidateContext(key, 
sig.getDOM());
                 
context.setProperty("org.apache.jcp.xml.dsig.secureValidation", Boolean.TRUE);
+                context.setProperty("org.jcp.xml.dsig.secureValidation", 
Boolean.TRUE);
 
                 XMLSignature xmlSignature;
                 try {

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java?rev=1496451&r1=1496450&r2=1496451&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
 Tue Jun 25 12:44:55 2013
@@ -396,6 +396,7 @@ public class SignatureProcessor implemen
         XMLValidateContext context = new DOMValidateContext(key, elem);
         context.setProperty("javax.xml.crypto.dsig.cacheReference", 
Boolean.TRUE);
         context.setProperty("org.apache.jcp.xml.dsig.secureValidation", 
Boolean.TRUE);
+        context.setProperty("org.jcp.xml.dsig.secureValidation", Boolean.TRUE);
         context.setProperty(STRTransform.TRANSFORM_WS_DOC_INFO, wsDocInfo);
         
         try {
@@ -776,4 +777,4 @@ public class SignatureProcessor implemen
         }
     }
 
-}
\ No newline at end of file
+}