You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2008/10/17 12:59:34 UTC
svn commit: r705557 - in /webservices/wss4j/trunk: ./ lib/
src/org/apache/ws/security/message/ src/org/apache/ws/security/saml/
Author: coheigea
Date: Fri Oct 17 03:59:33 2008
New Revision: 705557
URL: http://svn.apache.org/viewvc?rev=705557&view=rev
Log:
[WSS-145] - Upgraded to xmlsec 1.4.2
- Some changes were needed to KeyInfo elements used outside of the Signature stuff
- I also added in "provided" for the axis dependencies in the pom.
Added:
webservices/wss4j/trunk/lib/xmlsec-1.4.2.jar (with props)
Removed:
webservices/wss4j/trunk/lib/xmlsec-1.4.0.jar
Modified:
webservices/wss4j/trunk/README.txt
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/src/org/apache/ws/security/saml/SAMLIssuerImpl.java
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
Modified: webservices/wss4j/trunk/README.txt
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/README.txt?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/README.txt (original)
+++ webservices/wss4j/trunk/README.txt Fri Oct 17 03:59:33 2008
@@ -203,7 +203,7 @@
See: http://xml.apache.org/xalan-j/
-xmlsec-1.4.0.jar
+xmlsec-1.4.2.jar
This library implements the XML-Signature Syntax and Processing and
the XML Encryption Syntax and Processing specifications of the W3C. Thus
they form one of the base foundations of WSS4J.
Added: webservices/wss4j/trunk/lib/xmlsec-1.4.2.jar
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/lib/xmlsec-1.4.2.jar?rev=705557&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/trunk/lib/xmlsec-1.4.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Oct 17 03:59:33 2008
@@ -263,7 +263,7 @@
</profiles>
<properties>
- <xmlsec.version>1.4.0</xmlsec.version>
+ <xmlsec.version>1.4.2</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<xml.apis.version>1.3.03</xml.apis.version>
<bcprov.jdk14.version>140</bcprov.jdk14.version>
@@ -319,16 +319,19 @@
<groupId>org.apache.axis</groupId>
<artifactId>axis-ant</artifactId>
<version>${axis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${axis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-saaj</artifactId>
<version>${axis.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecDKEncrypt.java Fri Oct 17 03:59:33 2008
@@ -139,6 +139,9 @@
secToken.setReference(ref);
keyInfo.addUnknownElement(secToken.getElement());
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
xmlCipher.init(XMLCipher.ENCRYPT_MODE, key);
EncryptedData encData = xmlCipher.getEncryptedData();
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java Fri Oct 17 03:59:33 2008
@@ -452,8 +452,10 @@
secToken.setKeyIdentifierEncKeySHA1(getSHA1(encryptedEphemeralKey));
}
-
keyInfo.addUnknownElement(secToken.getElement());
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
}
return doEncryption(doc, secretKey, keyInfo, references);
@@ -516,6 +518,9 @@
ref.setURI("#" + encKeyId);
secToken.setReference(ref);
keyInfo.addUnknownElement(secToken.getElement());
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
}
/*
* Forth step: encrypt data, and set necessary attributes in
@@ -628,6 +633,9 @@
keyInfo.addUnknownElement(securityTokenReference.getElement());
}
}
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(envelope);
if (parts == null) {
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncryptedKey.java Fri Oct 17 03:59:33 2008
@@ -291,8 +291,11 @@
"unsupportedKeyId");
}
keyInfo.addUnknownElement(secToken.getElement());
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
WSSecurityUtil.appendChildElement(document, encryptedKeyElement,
- keyInfo.getElement());
+ keyInfoElement);
Element xencCipherValue = createCipherValue(document,
encryptedKeyElement);
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/saml/SAMLIssuerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/SAMLIssuerImpl.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/saml/SAMLIssuerImpl.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/saml/SAMLIssuerImpl.java Fri Oct 17 03:59:33 2008
@@ -18,6 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
@@ -32,6 +33,7 @@
import org.opensaml.SAMLStatement;
import org.opensaml.SAMLSubject;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import java.security.cert.X509Certificate;
import java.util.Arrays;
@@ -179,6 +181,10 @@
}
return null;
}
+ Element keyInfoElement = ki.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
+
subject.setKeyInfo(ki);
// prepare to sign the SAML token
try {
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSecSignatureSAML.java Fri Oct 17 03:59:33 2008
@@ -414,6 +414,10 @@
}
keyInfo.addUnknownElement(secRef.getElement());
+
+ Element keyInfoElement = keyInfo.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
try {
samlToken = (Element) assertion.toDOM(doc);
Modified: webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java?rev=705557&r1=705556&r2=705557&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/saml/WSSignSAMLEnvelope.java Fri Oct 17 03:59:33 2008
@@ -384,6 +384,10 @@
t3 = System.currentTimeMillis();
}
info.addUnknownElement(secRef.getElement());
+
+ Element keyInfoElement = info.getElement();
+ keyInfoElement.setAttributeNS(WSConstants.XMLNS_NS, "xmlns:"
+ + WSConstants.SIG_PREFIX, WSConstants.SIG_NS);
Element samlToken = null;
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org