cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: More XML Security work
Date Mon, 28 Apr 2014 21:08:55 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 1b0e2fe2d -> 7c3e2c4f6


More XML Security work


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7c3e2c4f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c3e2c4f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c3e2c4f

Branch: refs/heads/master
Commit: 7c3e2c4f6194513fdfb6581de4c902de40fe67bd
Parents: 1b0e2fe
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Apr 28 22:08:03 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Apr 28 22:08:03 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/xml/EncryptionProperties.java    | 2 +-
 .../org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7c3e2c4f/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
index 06d3e11..02828d3 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
@@ -22,7 +22,7 @@ import org.apache.xml.security.encryption.XMLCipher;
 
 public class EncryptionProperties {
     private String encryptionKeyTransportAlgo = XMLCipher.RSA_OAEP;
-    private String encryptionSymmetricKeyAlgo;
+    private String encryptionSymmetricKeyAlgo = XMLCipher.AES_256;
     private String encryptionDigestAlgo;
     private String encryptionKeyIdType;
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/7c3e2c4f/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index 8537252..84e3d3b 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -52,6 +52,7 @@ import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
+import org.apache.xml.security.Init;
 import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.stax.ext.OutboundXMLSec;
@@ -85,6 +86,10 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message>
{
     private List<QName> elementsToSign = new ArrayList<QName>();
     private List<QName> elementsToEncrypt = new ArrayList<QName>();
     private boolean keyInfoMustBeAvailable = true;
+    
+    static {
+        Init.init();
+    }
 
     public XmlSecOutInterceptor() {
         super(Phase.PRE_STREAM);


Mime
View raw message