Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 66185 invoked from network); 22 Mar 2011 13:19:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Mar 2011 13:19:05 -0000 Received: (qmail 23916 invoked by uid 500); 22 Mar 2011 13:19:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 23862 invoked by uid 500); 22 Mar 2011 13:19:05 -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 23855 invoked by uid 99); 22 Mar 2011 13:19:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Mar 2011 13:19:05 +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, 22 Mar 2011 13:19:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8DE8223889E0; Tue, 22 Mar 2011 13:18:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1084164 - in /cxf/branches/2.3.x-fixes/rt/ws/security: ./ src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Date: Tue, 22 Mar 2011 13:18:30 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110322131830.8DE8223889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue Mar 22 13:18:30 2011 New Revision: 1084164 URL: http://svn.apache.org/viewvc?rev=1084164&view=rev Log: [CXF-3224] - Add a boolean parameter to the STSClient to disable sending a default KeyType. Modified: cxf/branches/2.3.x-fixes/rt/ws/security/ (props changed) cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk/rt/ws/security:1083736,1083742,1083826,1084160 Modified: cxf/branches/2.3.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.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java?rev=1084164&r1=1084163&r2=1084164&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSClient.java Tue Mar 22 13:18:30 2011 @@ -147,6 +147,7 @@ public class STSClient implements Config Object actAs; String tokenType; + boolean sendKeyType = true; Map ctx = new HashMap(); @@ -306,6 +307,10 @@ public class STSClient implements Config public void setTokenType(String tokenType) { this.tokenType = tokenType; } + + public void setSendKeyType(boolean sendKeyType) { + this.sendKeyType = sendKeyType; + } /** * Indicate whether to use the signer's public X509 certificate for the subject confirmation key info @@ -477,9 +482,9 @@ public class STSClient implements Config if (keySize <= 0) { keySize = 256; } - if (keyType.endsWith("SymmetricKey")) { + if (keyType != null && keyType.endsWith("SymmetricKey")) { requestorEntropy = writeElementsForRSTSymmetricKey(writer, wroteKeySize); - } else if (keyType.endsWith("PublicKey")) { + } else if (keyType != null && keyType.endsWith("PublicKey")) { crypto = createCrypto(false); cert = getCert(crypto); writeElementsForRSTPublicKey(writer, cert); @@ -771,7 +776,7 @@ public class STSClient implements Config writer.writeEndElement(); keyType = namespace + "/SymmetricKey"; } - } else if (keyType == null) { + } else if (keyType == null && sendKeyType) { writer.writeStartElement("wst", "KeyType", namespace); writer.writeCharacters(namespace + "/SymmetricKey"); writer.writeEndElement();