svn commit: r571435 - in /webservices/rampart/trunk/java/modules: rampart-core/src/main/java/org/apache/rampart/builder/ rampart-integration/src/test/resources/rampart/ rampart-integration/src/test/resources/rampart/policy/

[ruchithf]

Author: ruchithf
Date: Fri Aug 31 04:24:17 2007
New Revision: 571435

URL: http://svn.apache.org/viewvc?rev=571435&view=rev
Log:
Fixed an issue in encrypting signature when EncryptBeforeSigning

Modified:
    
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/9.xml
    
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml

Modified: 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=571435&r1=571434&r2=571435&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 Fri Aug 31 04:24:17 2007
@@ -310,7 +310,7 @@
                     try {
                         // Encrypt, get hold of the ref list and add it
                         secondRefList = encr.encryptForExternalRef(null,
-                                encrParts);
+                                secondEncrParts);
 
                         // Insert the ref list after the encrypted key elem
                         this.setInsertionLocation(RampartUtil

Modified: 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/9.xml
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/9.xml?rev=571435&r1=571434&r2=571435&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/9.xml
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/9.xml
 Fri Aug 31 04:24:17 2007
@@ -33,7 +33,8 @@
                                </sp:Layout>
                                <sp:IncludeTimestamp/>
                                <sp:EncryptSignature />
-                               <sp:OnlySignEntireHeadersAndBody/>
+                               <sp:EncryptBeforeSigning />
+                               <!--sp:OnlySignEntireHeadersAndBody/-->
                        </wsp:Policy>
                </sp:AsymmetricBinding>
                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>

Modified: 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml?rev=571435&r1=571434&r2=571435&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml
 Fri Aug 31 04:24:17 2007
@@ -45,7 +45,8 @@
                                        </sp:Layout>
                                        <sp:IncludeTimestamp/>
                                        <sp:EncryptSignature />
-                                       <sp:OnlySignEntireHeadersAndBody/>
+                                       <sp:EncryptBeforeSigning />
+                                       <!--sp:OnlySignEntireHeadersAndBody/-->
                                </wsp:Policy>
                        </sp:AsymmetricBinding>
                        <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>