Author: dkulp
Date: Sat Feb 28 01:37:55 2009
New Revision: 748769
URL: http://svn.apache.org/viewvc?rev=748769&view=rev
Log:
Bug with not finding the trust10 token
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=748769&r1=748768&r2=748769&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Sat Feb 28 01:37:55 2009
@@ -152,7 +152,7 @@
}
}
private Trust10 getTrust10(AssertionInfoMap aim) {
- Collection<AssertionInfo> ais = aim.get(SP12Constants.TRUST_10);
+ Collection<AssertionInfo> ais = aim.get(SP11Constants.TRUST_10);
if (ais == null || ais.isEmpty()) {
return null;
}
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java?rev=748769&r1=748768&r2=748769&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Sat Feb 28 01:37:55 2009
@@ -165,7 +165,8 @@
for (Token token : sgndSuppTokens.getTokens()) {
if (token instanceof IssuedToken
|| token instanceof SecureConversationToken) {
-
signatureValues.add(doIssuedTokenSignature(token, null,
+
signatureValues.add(doIssuedTokenSignature(token,
+
sgndSuppTokens.getSignedParts(),
sgndSuppTokens));
} else if (token instanceof X509Token) {
signatureValues.add(doX509TokenSignature(token,
