Author: coheigea
Date: Thu Feb 28 00:27:12 2013
New Revision: 1451055
URL: http://svn.apache.org/r1451055
Log:
Fallback to using the signing Crypto if no issuing Crypto is defined in the
SamlCallback
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java?rev=1451055&r1=1451054&r2=1451055&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenSignedAction.java
Thu Feb 28 00:27:12 2013
@@ -70,9 +70,14 @@ public class SAMLTokenSignedAction imple
}
SAMLCallback samlCallback = new SAMLCallback();
SAMLUtil.doSAMLCallback(samlCallbackHandler, samlCallback);
-
+
SamlAssertionWrapper samlAssertion = new
SamlAssertionWrapper(samlCallback);
if (samlCallback.isSignAssertion()) {
+ Crypto signingCrypto = samlCallback.getIssuerCrypto();
+ if (signingCrypto == null) {
+ signingCrypto = handler.loadSignatureCrypto(reqData);
+ }
+
samlAssertion.signAssertion(
samlCallback.getIssuerKeyName(),
samlCallback.getIssuerKeyPassword(),
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java?rev=1451055&r1=1451054&r2=1451055&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SAMLTokenUnsignedAction.java
Thu Feb 28 00:27:12 2013
@@ -31,7 +31,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.message.WSSecSAMLToken;
import org.w3c.dom.Document;
-public class SAMLTokenUnsignedAction extends SAMLTokenSignedAction {
+public class SAMLTokenUnsignedAction implements Action {
public void execute(WSHandler handler, int actionToDo, Document doc,
RequestData reqData)
throws WSSecurityException {
