You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/07/30 12:22:24 UTC
svn commit: r1614603 - in
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom:
message/WSSecDKSign.java message/WSSecSignature.java
processor/SignatureProcessor.java saml/WSSecSignatureSAML.java
Author: coheigea
Date: Wed Jul 30 10:22:23 2014
New Revision: 1614603
URL: http://svn.apache.org/r1614603
Log:
Just retrieve KeyInfoFactory from the SignatureFactory
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java?rev=1614603&r1=1614602&r2=1614603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java Wed Jul 30 10:22:23 2014
@@ -69,7 +69,6 @@ public class WSSecDKSign extends WSSecDe
private String strUri;
private WSDocInfo wsDocInfo;
- private KeyInfoFactory keyInfoFactory;
private XMLSignatureFactory signatureFactory;
private XMLSignature sig;
private KeyInfo keyInfo;
@@ -94,11 +93,6 @@ public class WSSecDKSign extends WSSecDe
} catch (NoSuchProviderException ex) {
signatureFactory = XMLSignatureFactory.getInstance("DOM");
}
- try {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM", "ApacheXMLDSig");
- } catch (NoSuchProviderException ex) {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM");
- }
}
public Document build(Document doc, WSSecHeader secHeader) throws WSSecurityException {
@@ -173,6 +167,7 @@ public class WSSecDKSign extends WSSecDe
XMLStructure structure = new DOMStructure(secRef.getElement());
wsDocInfo.addTokenElement(secRef.getElement(), false);
+ KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
keyInfo =
keyInfoFactory.newKeyInfo(
java.util.Collections.singletonList(structure), keyInfoUri
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java?rev=1614603&r1=1614602&r2=1614603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java Wed Jul 30 10:22:23 2014
@@ -90,7 +90,6 @@ public class WSSecSignature extends WSSe
protected String strUri;
protected BinarySecurity bstToken;
- protected KeyInfoFactory keyInfoFactory;
protected XMLSignatureFactory signatureFactory;
protected KeyInfo keyInfo;
protected CanonicalizationMethod c14nMethod;
@@ -126,11 +125,6 @@ public class WSSecSignature extends WSSe
} catch (NoSuchProviderException ex) {
signatureFactory = XMLSignatureFactory.getInstance("DOM");
}
- try {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM", "ApacheXMLDSig");
- } catch (NoSuchProviderException ex) {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM");
- }
}
/**
@@ -321,6 +315,7 @@ public class WSSecSignature extends WSSe
java.security.PublicKey publicKey = certs[0].getPublicKey();
try {
+ KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
KeyValue keyValue = keyInfoFactory.newKeyValue(publicKey);
keyInfo =
keyInfoFactory.newKeyInfo(
@@ -341,6 +336,7 @@ public class WSSecSignature extends WSSe
if (keyIdentifierType != WSConstants.KEY_VALUE) {
XMLStructure structure = new DOMStructure(secRef.getElement());
wsDocInfo.addTokenElement(secRef.getElement(), false);
+ KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
keyInfo =
keyInfoFactory.newKeyInfo(
java.util.Collections.singletonList(structure), keyInfoUri
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java?rev=1614603&r1=1614602&r2=1614603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java Wed Jul 30 10:22:23 2014
@@ -95,7 +95,6 @@ public class SignatureProcessor implemen
org.slf4j.LoggerFactory.getLogger(SignatureProcessor.class);
private XMLSignatureFactory signatureFactory;
- private KeyInfoFactory keyInfoFactory;
public SignatureProcessor() {
// Try to install the Santuario Provider - fall back to the JDK provider if this does
@@ -105,11 +104,6 @@ public class SignatureProcessor implemen
} catch (NoSuchProviderException ex) {
signatureFactory = XMLSignatureFactory.getInstance("DOM");
}
- try {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM", "ApacheXMLDSig");
- } catch (NoSuchProviderException ex) {
- keyInfoFactory = KeyInfoFactory.getInstance("DOM");
- }
}
public List<WSSecurityEngineResult> handleToken(
@@ -330,6 +324,7 @@ public class SignatureProcessor implemen
Element keyInfoElement
) throws MarshalException {
XMLStructure keyInfoStructure = new DOMStructure(keyInfoElement);
+ KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
KeyInfo keyInfo = keyInfoFactory.unmarshalKeyInfo(keyInfoStructure);
List<?> list = keyInfo.getContent();
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1614603&r1=1614602&r2=1614603&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Wed Jul 30 10:22:23 2014
@@ -30,6 +30,7 @@ import javax.xml.crypto.dsig.SignatureMe
import javax.xml.crypto.dsig.SignedInfo;
import javax.xml.crypto.dsig.XMLSignContext;
import javax.xml.crypto.dsig.dom.DOMSignContext;
+import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
@@ -451,6 +452,7 @@ public class WSSecSignatureSAML extends
XMLStructure structure = new DOMStructure(secRef.getElement());
wsDocInfo.addTokenElement(secRef.getElement(), false);
+ KeyInfoFactory keyInfoFactory = signatureFactory.getKeyInfoFactory();
keyInfo =
keyInfoFactory.newKeyInfo(
java.util.Collections.singletonList(structure), keyInfoUri