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/01/17 15:21:15 UTC
svn commit: r1559109 -
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
Author: coheigea
Date: Fri Jan 17 14:21:15 2014
New Revision: 1559109
URL: http://svn.apache.org/r1559109
Log:
Use a default Crypto instance in X509Security if required
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java?rev=1559109&r1=1559108&r2=1559109&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/X509Security.java Fri Jan 17 14:21:15 2014
@@ -23,6 +23,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.bsp.BSPEnforcer;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.common.crypto.Crypto;
+import org.apache.wss4j.common.crypto.Merlin;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -81,8 +82,9 @@ public class X509Security extends Binary
if (cachedCert != null) {
return cachedCert;
}
- if (crypto == null) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noSigCryptoFile");
+ Crypto certCrypto = crypto;
+ if (certCrypto == null) {
+ certCrypto = new Merlin();
}
byte[] data = getToken();
if (data == null) {
@@ -90,7 +92,7 @@ public class X509Security extends Binary
WSSecurityException.ErrorCode.FAILURE, "invalidCertData", 0);
}
InputStream in = new ByteArrayInputStream(data);
- cachedCert = crypto.loadCertificate(in);
+ cachedCert = certCrypto.loadCertificate(in);
return cachedCert;
}