svn commit: r1559066 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java

[coheigea]

Author: coheigea
Date: Fri Jan 17 10:51:36 2014
New Revision: 1559066

URL: http://svn.apache.org/r1559066
Log:
[CXF-5497] - "STSClient is not sending a KeySize for SecureConversation in 
every circumstance"

Modified:
    
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java

Modified: 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java?rev=1559066&r1=1559065&r2=1559066&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
 Fri Jan 17 10:51:36 2014
@@ -750,7 +750,7 @@ public abstract class AbstractSTSClient 
                 cert = getCert(crypto);
             }
             writeElementsForRSTPublicKey(writer, cert);
-        } else if (isSpnego) {
+        } else if (isSpnego || isSecureConv) {
             addKeySize(keySize, writer);
         }
         
@@ -824,7 +824,7 @@ public abstract class AbstractSTSClient 
             boolean wroteKeySize) throws Exception {
         byte[] requestorEntropy = null;
 
-        if (!wroteKeySize && (!isSecureConv || keySize != 256)) {
+        if (!wroteKeySize) {
             addKeySize(keySize, writer);
         }