You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/13 19:20:01 UTC

svn commit: r1231218 - /cxf/branches/2.4.x-fixes/

Author: dkulp
Date: Fri Jan 13 18:20:01 2012
New Revision: 1231218

URL: http://svn.apache.org/viewvc?rev=1231218&view=rev
Log:
Recorded merge of revisions 1228272,1230988 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1228272 | coheigea | 2012-01-06 12:00:21 -0500 (Fri, 06 Jan 2012) | 3 lines
  
  [CXF-2864] - Support UsernameToken derived keys
   - Part I : Added support for derived keys from a UsernameToken when it's used as the ProtectionToken of the SymmetricBinding.
   - One important point is that it can only be used correctly for EITHER signature or encryption, but not both, as the salt in the U/T is different for both.
........
  r1230988 | coheigea | 2012-01-13 06:01:26 -0500 (Fri, 13 Jan 2012) | 2 lines
  
  Removing unnecessary signature validation check using Id/XPath
   - Since WSS4J moved to use JSR-105 APIs for signature validation all signed Elements are available for direct comparison
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.