You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/05/01 17:59:34 UTC
svn commit: r1332715 -
/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Author: coheigea
Date: Tue May 1 15:59:34 2012
New Revision: 1332715
URL: http://svn.apache.org/viewvc?rev=1332715&view=rev
Log:
Merged revisions 1332713 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1332713 | coheigea | 2012-05-01 16:55:37 +0100 (Tue, 01 May 2012) | 10 lines
Merged revisions 1332712 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1332712 | coheigea | 2012-05-01 16:53:34 +0100 (Tue, 01 May 2012) | 2 lines
Changing STSClient UseKey dsig prefix to match Santuario default
........
........
Modified:
cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1332715&r1=1332714&r2=1332715&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Tue May 1 15:59:34 2012
@@ -706,8 +706,8 @@ public class STSClient implements Config
protected void writeElementsForRSTPublicKey(W3CDOMStreamWriter writer,
X509Certificate cert) throws Exception {
writer.writeStartElement("wst", "UseKey", namespace);
- writer.writeStartElement("dsig", "KeyInfo", "http://www.w3.org/2000/09/xmldsig#");
- writer.writeNamespace("dsig", "http://www.w3.org/2000/09/xmldsig#");
+ writer.writeStartElement("ds", "KeyInfo", "http://www.w3.org/2000/09/xmldsig#");
+ writer.writeNamespace("ds", "http://www.w3.org/2000/09/xmldsig#");
boolean useCert = useCertificateForConfirmationKeyInfo;
String useCertStr = (String)getProperty(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO);
@@ -719,7 +719,7 @@ public class STSClient implements Config
certElem.addCertificate(cert);
writer.getCurrentNode().appendChild(certElem.getElement());
} else {
- writer.writeStartElement("dsig", "KeyValue", "http://www.w3.org/2000/09/xmldsig#");
+ writer.writeStartElement("ds", "KeyValue", "http://www.w3.org/2000/09/xmldsig#");
PublicKey key = cert.getPublicKey();
String pubKeyAlgo = key.getAlgorithm();
if ("DSA".equalsIgnoreCase(pubKeyAlgo)) {