cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1559068 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
Date Fri, 17 Jan 2014 10:53:09 GMT
Author: coheigea
Date: Fri Jan 17 10:53:08 2014
New Revision: 1559068

URL: http://svn.apache.org/r1559068
Log:
Merged revisions 1559066 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1559066 | coheigea | 2014-01-17 10:51:36 +0000 (Fri, 17 Jan 2014) | 2 lines

  [CXF-5497] - "STSClient is not sending a KeySize for SecureConversation in every circumstance"

........

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

Modified: cxf/branches/2.6.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.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java?rev=1559068&r1=1559067&r2=1559068&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
Fri Jan 17 10:53:08 2014
@@ -719,7 +719,7 @@ public abstract class AbstractSTSClient 
             crypto = createCrypto(false);
             cert = getCert(crypto);
             writeElementsForRSTPublicKey(writer, cert);
-        } else if (isSpnego) {
+        } else if (isSpnego || isSecureConv) {
             addKeySize(keySize, writer);
         }
         
@@ -793,7 +793,7 @@ public abstract class AbstractSTSClient 
             boolean wroteKeySize) throws Exception {
         byte[] requestorEntropy = null;
 
-        if (!wroteKeySize && (!isSecureConv || keySize != 256)) {
+        if (!wroteKeySize) {
             addKeySize(keySize, writer);
         }
 



Mime
View raw message