cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Some fixes for latest WSS4J SNAPSHOT code
Date Tue, 18 Oct 2016 17:25:39 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 7487330c9 -> 1f68d8488


Some fixes for latest WSS4J SNAPSHOT code


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

Branch: refs/heads/master
Commit: 1f68d848874bc2be86d3e77e408f0b9879c1e93c
Parents: 7487330
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Oct 18 18:25:20 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Oct 18 18:25:35 2016 +0100

----------------------------------------------------------------------
 .../ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java  | 2 +-
 .../org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java | 2 +-
 .../org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1f68d848/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 6247016..d891787 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1510,7 +1510,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
             cryptoType.setAlias(encrUser);
             X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
             if (certs != null && certs.length > 0) {
-                crypto.verifyTrust(certs, enableRevocation, null);
+                crypto.verifyTrust(certs, enableRevocation, null, null);
             }
         }
         if (crypto != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f68d848/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
index 4116f92..9f9a51e 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java
@@ -282,7 +282,7 @@ public class DefaultSubjectProvider implements SubjectProvider {
                     try {
                         Collection<Pattern> constraints = Collections.emptyList();
                         stsProperties.getSignatureCrypto().verifyTrust(
-                            new X509Certificate[]{receivedKey.getX509Cert()}, false, constraints);
+                            new X509Certificate[]{receivedKey.getX509Cert()}, false, constraints,
null);
                     } catch (WSSecurityException e) {
                         LOG.log(Level.FINE, "Error in trust validation of UseKey: ", e);
                         throw new STSException("Error in trust validation of UseKey", STSException.REQUEST_FAILED);

http://git-wip-us.apache.org/repos/asf/cxf/blob/1f68d848/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
index cb6dadd..fdab821 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
@@ -123,7 +123,8 @@ public class XkmsCryptoProvider extends CryptoBase {
     public void verifyTrust(
         X509Certificate[] certs, 
         boolean enableRevocation, 
-        Collection<Pattern> subjectCertConstraints
+        Collection<Pattern> subjectCertConstraints,
+        Collection<Pattern> issuerCertConstraints
     ) throws WSSecurityException {
         if (certs != null) {
             LOG.fine(String.format("Verifying certificate id: %s", certs[0].getSubjectDN()));


Mime
View raw message