svn commit: r701006 - in /webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder: BindingBuilder.java SymmetricBindingBuilder.java

[nandana]

Author: nandana
Date: Wed Oct  1 21:20:53 2008
New Revision: 701006

URL: http://svn.apache.org/viewvc?rev=701006&view=rev
Log:
Setting the correct trust version according to the WS Security Policy version 

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=701006&r1=701005&r2=701006&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
 Wed Oct  1 21:20:53 2008
@@ -40,6 +40,7 @@
 import org.apache.ws.security.WSPasswordCallback;
 import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.conversation.ConversationConstants;
 import org.apache.ws.security.conversation.ConversationException;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
@@ -500,7 +501,12 @@
         
         if(policyToken.isDerivedKeys()) {
             try {
-                WSSecDKSign dkSign = new WSSecDKSign();
+                WSSecDKSign dkSign = new WSSecDKSign();  
+                
+                //Check whether it is security policy 1.2 and use the secure 
conversation accordingly
+                if (SPConstants.SP_V12 == policyToken.getVersion()) {
+                    dkSign.setWscVersion(ConversationConstants.VERSION_05_12);
+                }
                               
                 //Check for whether the token is attached in the message or not
                 boolean attached = false;

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?rev=701006&r1=701005&r2=701006&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
 Wed Oct  1 21:20:53 2008
@@ -39,6 +39,7 @@
 import org.apache.ws.security.WSEncryptionPart;
 import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.conversation.ConversationConstants;
 import org.apache.ws.security.conversation.ConversationException;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
@@ -575,6 +576,11 @@
                 try {
                     WSSecDKEncrypt dkEncr = new WSSecDKEncrypt();
                     
+                    //Check whether it is security policy 1.2 and use the 
secure conversation accordingly
+                    if (SPConstants.SP_V12 == encrToken.getVersion()) {
+                        
dkEncr.setWscVersion(ConversationConstants.VERSION_05_12);
+                    }                    
+                    
                     if(encrTokElem != null && encrTok.getAttachedReference() 
!= null) {
                         
                         dkEncr.setExternalKey(encrTok.getSecret(), (Element) 
doc