You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2012/07/06 13:24:58 UTC
svn commit: r1358132 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext:
OutboundXMLSec.java XMLSec.java
Author: coheigea
Date: Fri Jul 6 11:24:58 2012
New Revision: 1358132
URL: http://svn.apache.org/viewvc?rev=1358132&view=rev
Log:
Added some different config
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java?rev=1358132&r1=1358131&r2=1358132&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java Fri Jul 6 11:24:58 2012
@@ -133,8 +133,7 @@ public class OutboundXMLSec {
private void configureSignatureKeys(final SecurityContextImpl securityContextImpl) throws XMLSecurityException {
Key key = securityProperties.getSignatureKey();
X509Certificate[] x509Certificates = securityProperties.getSignatureCerts();
- if ((key instanceof PublicKey || key instanceof PrivateKey)
- && (x509Certificates == null || x509Certificates.length == 0)) {
+ if (key instanceof PrivateKey && (x509Certificates == null || x509Certificates.length == 0)) {
throw new XMLSecurityException(XMLSecurityException.ErrorCode.FAILED_SIGNATURE, "noUserCertsFound");
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java?rev=1358132&r1=1358131&r2=1358132&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java Fri Jul 6 11:24:58 2012
@@ -21,6 +21,10 @@ package org.apache.xml.security.stax.ext
import java.net.URISyntaxException;
import java.security.Provider;
import java.security.Security;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.RSAPrivateKey;
+
+import javax.crypto.SecretKey;
import org.apache.xml.security.stax.config.Init;
@@ -117,7 +121,13 @@ public class XMLSec {
}
*/
if (securityProperties.getSignatureAlgorithm() == null) {
- securityProperties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#rsa-sha1");
+ if (securityProperties.getSignatureKey() instanceof RSAPrivateKey) {
+ securityProperties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#rsa-sha1");
+ } else if (securityProperties.getSignatureKey() instanceof DSAPrivateKey) {
+ securityProperties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#dsa-sha1");
+ } else if (securityProperties.getSignatureKey() instanceof SecretKey) {
+ securityProperties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#hmac-sha1");
+ }
}
if (securityProperties.getSignatureDigestAlgorithm() == null) {
securityProperties.setSignatureDigestAlgorithm("http://www.w3.org/2000/09/xmldsig#sha1");
@@ -125,11 +135,9 @@ public class XMLSec {
if (securityProperties.getSignatureCanonicalizationAlgorithm() == null) {
securityProperties.setSignatureCanonicalizationAlgorithm("http://www.w3.org/2001/10/xml-exc-c14n#");
}
- /*
if (securityProperties.getSignatureKeyIdentifierType() == null) {
- securityProperties.setSignatureKeyIdentifierType(WSSConstants.KeyIdentifierType.ISSUER_SERIAL);
+ securityProperties.setSignatureKeyIdentifierType(XMLSecurityConstants.XMLKeyIdentifierType.X509_ISSUER_SERIAL);
}
- */
}
}
//todo clone securityProperties