cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Also query Crypto property instance
Date Tue, 26 May 2015 12:52:53 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e6085587c -> 7eb40f459


Also query Crypto property instance


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

Branch: refs/heads/master
Commit: 7eb40f45965841036c120a8239e050d2c6272361
Parents: e608558
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue May 26 13:52:36 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue May 26 13:52:36 2015 +0100

----------------------------------------------------------------------
 .../cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/7eb40f45/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
index 95536cc..cda62c8 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
@@ -45,6 +45,12 @@ public class XkmsCryptoProviderFactory implements CryptoProviderFactory
{
 
     @Override
     public Crypto create(Message message) {
+        Object crypto = 
+            SecurityUtils.getSecurityPropertyValue(SecurityConstants.SIGNATURE_CRYPTO, message);
+        if (crypto instanceof Crypto) {
+            new XkmsCryptoProvider(xkmsConsumer, (Crypto)crypto);
+        }
+        
         Properties keystoreProps = CryptoProviderUtils
             .loadKeystoreProperties(message,
                                     SecurityConstants.SIGNATURE_PROPERTIES);


Mime
View raw message