Updated Branches:
  refs/heads/camel-2.11.x 554e8e189 -> 1a23f0b95

Upgrade santuario and update default for secureValidation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a23f0b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a23f0b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a23f0b9

Branch: refs/heads/camel-2.11.x
Commit: 1a23f0b9560e7173f402559898edbbcfc29d458a
Parents: 554e8e1
Author: Hadrian Zbarcea <hadr...@apache.org>
Authored: Wed Aug 7 12:56:46 2013 -0400
Committer: Hadrian Zbarcea <hadr...@apache.org>
Committed: Wed Aug 7 13:08:57 2013 -0400

----------------------------------------------------------------------
 .../apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java | 1 +
 parent/pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1a23f0b9/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
----------------------------------------------------------------------
diff --git 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
index 2c7ee9b..56235b0 100755
--- 
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
+++ 
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormat.java
@@ -537,6 +537,7 @@ public class XMLSecurityDataFormat implements DataFormat, 
CamelContextAware {
     
     private Object decode(Exchange exchange, Document encodedDocument, Key 
keyEncryptionKey) throws Exception {
         XMLCipher xmlCipher = XMLCipher.getInstance();
+        xmlCipher.setSecureValidation(true);
         xmlCipher.init(XMLCipher.DECRYPT_MODE, null);
         xmlCipher.setKEK(keyEncryptionKey);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1a23f0b9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 705c387..41a4e65 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -398,7 +398,7 @@
     <xmlrpc-version>3.1.3</xmlrpc-version>
     <xmlrpc-client-bundle-version>3.1.3_1</xmlrpc-client-bundle-version>
     <xmlschema-version>2.0</xmlschema-version>
-    <xmlsec-version>1.5.4</xmlsec-version>
+    <xmlsec-version>1.5.5</xmlsec-version>
     <xmlunit-version>1.3</xmlunit-version>
     <xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version>
     <xpp3-version>1.1.4c</xpp3-version>

Reply via email to