Updated Branches:
  refs/heads/camel-2.10.x 12b3d1147 -> f6e66830c

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/f6e66830
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f6e66830
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f6e66830

Branch: refs/heads/camel-2.10.x
Commit: f6e66830c72d1456efc6fdfc1d0cc180c9f516c8
Parents: 12b3d11
Author: Hadrian Zbarcea <hadr...@apache.org>
Authored: Wed Aug 7 15:38:02 2013 -0400
Committer: Hadrian Zbarcea <hadr...@apache.org>
Committed: Wed Aug 7 15:38:02 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/f6e66830/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 5e8e4ef..5b2c9f3 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/f6e66830/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8b93763..e9d0548 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
     <xbean-spring-version>3.12</xbean-spring-version>
     <xml-resolver-version>1.2</xml-resolver-version>
     <xstream-version>1.4.4</xstream-version>
-    <xmlsec-version>1.5.4</xmlsec-version>
+    <xmlsec-version>1.5.5</xmlsec-version>
     <xerces-version>2.9.1</xerces-version>
     <xalan-version>2.7.1</xalan-version>
     <xmlunit-version>1.3</xmlunit-version>

Reply via email to