Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD0F995A2 for ; Tue, 1 May 2012 15:55:59 +0000 (UTC) Received: (qmail 42445 invoked by uid 500); 1 May 2012 15:55:59 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 42374 invoked by uid 500); 1 May 2012 15:55:59 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 42367 invoked by uid 99); 1 May 2012 15:55:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 15:55:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 15:55:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 662D723889B3; Tue, 1 May 2012 15:55:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1332713 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Date: Tue, 01 May 2012 15:55:38 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120501155538.662D723889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue May 1 15:55:37 2012 New Revision: 1332713 URL: http://svn.apache.org/viewvc?rev=1332713&view=rev Log: 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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Modified: cxf/branches/2.5.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.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1332713&r1=1332712&r2=1332713&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Tue May 1 15:55:37 2012 @@ -790,8 +790,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); @@ -803,7 +803,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)) {