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 2014/01/15 12:21:45 UTC

svn commit: r1558345 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java

Author: coheigea
Date: Wed Jan 15 11:21:44 2014
New Revision: 1558345

URL: http://svn.apache.org/r1558345
Log:
Send the KeySize for SecureConversation

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java?rev=1558345&r1=1558344&r2=1558345&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java Wed Jan 15 11:21:44 2014
@@ -756,7 +756,7 @@ public abstract class AbstractSTSClient 
                 cert = getCert(crypto);
             }
             writeElementsForRSTPublicKey(writer, cert);
-        } else if (isSpnego) {
+        } else if (isSpnego || isSecureConv) {
             addKeySize(keySize, writer);
         }
         
@@ -830,7 +830,7 @@ public abstract class AbstractSTSClient 
             boolean wroteKeySize) throws Exception {
         byte[] requestorEntropy = null;
 
-        if (!wroteKeySize && (!isSecureConv || keySize != 256)) {
+        if (!wroteKeySize) {
             addKeySize(keySize, writer);
         }