cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Also query Crypto property instance
Date Tue, 26 May 2015 13:06:13 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 615050612 -> c175b954a


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

Branch: refs/heads/3.0.x-fixes
Commit: 764641fba26f7a4857f54f3c775c33e91d435da0
Parents: 6150506
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 14:02:49 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/764641fb/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 881885b..7f4790e 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
@@ -46,6 +46,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