You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2013/08/07 18:57:13 UTC
git commit: Upgrade santuario and update default for secureValidation
Updated Branches:
refs/heads/master 2affc3b7a -> b36127fcf
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/b36127fc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b36127fc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b36127fc
Branch: refs/heads/master
Commit: b36127fcfe5dfc8801bad87e690fd7225b97a609
Parents: 2affc3b
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Aug 7 12:56:46 2013 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Aug 7 12:56:53 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/b36127fc/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/b36127fc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2741218..89390df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -411,7 +411,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.1</xmlsec-version>
+ <xmlsec-version>1.5.5</xmlsec-version>
<xmlunit-version>1.4</xmlunit-version>
<xpp3-bundle-version>1.1.4c_6</xpp3-bundle-version>
<xpp3-version>1.1.4c</xpp3-version>