Author: kaushalye
Date: Thu Nov  8 00:49:07 2007
New Revision: 593072

URL: http://svn.apache.org/viewvc?rev=593072&view=rev
Log:
1. Performance improvement in Security Headder processing. No need to go for 
expensive AXIOM tree processing to find Security Headers.
2. Updating the wire content for scenario5

Modified:
    webservices/rampart/trunk/c/include/oxs_axiom.h
    webservices/rampart/trunk/c/samples/secpolicy/scenario5/tcpmon-trace5.txt
    webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c

Modified: webservices/rampart/trunk/c/include/oxs_axiom.h
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/oxs_axiom.h?rev=593072&r1=593071&r2=593072&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/oxs_axiom.h (original)
+++ webservices/rampart/trunk/c/include/oxs_axiom.h Thu Nov  8 00:49:07 2007
@@ -122,6 +122,9 @@
             axiom_node_t *node,
             axutil_qname_t *qname);
 
+    /**
+     * Note: You may pass the prefix=NULL as the prefix may be different 
depending on the impl
+     */
     AXIS2_EXTERN axiom_node_t* AXIS2_CALL
     oxs_axiom_get_first_child_node_by_name(const axutil_env_t *env,
                                            axiom_node_t* parent,

Modified: 
webservices/rampart/trunk/c/samples/secpolicy/scenario5/tcpmon-trace5.txt
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/secpolicy/scenario5/tcpmon-trace5.txt?rev=593072&r1=593071&r2=593072&view=diff
==============================================================================
--- webservices/rampart/trunk/c/samples/secpolicy/scenario5/tcpmon-trace5.txt 
(original)
+++ webservices/rampart/trunk/c/samples/secpolicy/scenario5/tcpmon-trace5.txt 
Thu Nov  8 00:49:07 2007
@@ -6,28 +6,28 @@
 ==== Request ====
 POST /axis2/services/sec_echo/echoString HTTP/1.1
 User-Agent: Axis2/C
-Content-Length: 8633
+Content-Length: 8652
 Content-Type: application/soap+xml;charset=UTF-8
 Host: 127.0.0.1:9090
 
 <soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope";>
    <soapenv:Header xmlns:wsa="http://www.w3.org/2005/08/addressing";>
-      <wsa:To wsu:Id="SigID-6f5b7390-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>http://localhost:9090/axis2/services/sec_echo/echoString</wsa:To>
-      <wsa:Action wsu:Id="SigID-6f5b74b2-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>http://example.com/ws/2004/09/policy/Test/EchoRequest</wsa:Action>
-      <wsa:MessageID wsu:Id="SigID-6f5b7552-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>6f5b0158-5909-1dc1-3b9e-000000000000</wsa:MessageID>
+      <wsa:To wsu:Id="SigID-e82f792e-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>http://localhost:9090/axis2/services/sec_echo/echoString</wsa:To>
+      <wsa:Action wsu:Id="SigID-e82f7a82-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>http://example.com/ws/2004/09/policy/Test/EchoRequest</wsa:Action>
+      <wsa:MessageID wsu:Id="SigID-e82f7b0e-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>e82f3acc-8dcf-1dc1-3725-0013ce8f2fc7</wsa:MessageID>
       <wsse:Security soapenv:mustUnderstand="1" 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
-         <wsse:BinarySecurityToken 
EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary";
 wsu:Id="CertID-6f5b71ce-5909-1dc1" 
ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";
 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>MIIDDDCCAfSgAwIBAgIQM6YEf7FVYx/tZyEXgVComTANBgkqhkiG9w0BAQUFADAwMQ4wDAYDVQQKDAVPQVNJUzEeMBwGA1UEAwwVT0FTSVMgSW50ZXJvcCBUZXN0IENBMB4XDTA1MDMxOTAwMDAwMFoXDTE4MDMxOTIzNTk1OVowQjEOMAwGA1UECgwFT0FTSVMxIDAeBgNVBAsMF09BU0lTIEludGVyb3AgVGVzdCBDZXJ0MQ4wDAYDVQQDDAVBbGljZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoqi99By1VYo0aHrkKCNT4DkIgPL/SgahbeKdGhrbu3K2XG7arfD9tqIBIKMfrX4Gp90NJa85AV1yiNsEyvq+mUnMpNcKnLXLOjkTmMCqDYbbkehJlXPnaWLzve+mW0pJdPxtf3rbD4PS/cBQIvtpjmrDAU8VsZKT8DN5Kyz+EZsCAwEAAaOBkzCBkDAJBgNVHRMEAjAAMDMGA1UdHwQsMCowKKImhiRodHRwOi8vaW50ZXJvcC5iYnRlc3QubmV0L2NybC9jYS5jcmwwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQWBBQK4l0TUHZ1
 
QV3V2QtlLNDm+PoxiDAfBgNVHSMEGDAWgBTAnSj8wes1oR3WqqqgHBpNwkkPDzANBgkqhkiG9w0BAQUFAAOCAQEABTqpOpvW+6yrLXyUlP2xJbEkohXHI5OWwKWleOb9hlkhWntUalfcFOJAgUyH30TTpHldzx1+vK2LPzhoUFKYHE1IyQvokBN2JjFO64BQukCKnZhldLRPxGhfkTdxQgdf5rCK/wh3xVsZCNTfuMNmlAM6lOAg8QduDah3WFZpEA0s2nwQaCNQTNMjJC8tav1CBr6+E5FAmwPXP7pJxn9Fw9OXRyqbRA4v2y7YpbGkG2GI9UvOHw6SGvf4FRSthMMO35YbpikGsLix3vAsXWWi4rwfVOYzQK0OFPNi9RMCUdSH06m9uLWckiCxjos0FQODZE9l4ATGy9s9hNVwryOJTw==</wsse:BinarySecurityToken>
-         <wsu:Timestamp wsu:Id="SigID-6f5b7674-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
-            <wsu:Created>2007-09-02T04:03:17.209Z</wsu:Created>
-            <wsu:Expires>2007-09-02T04:09:17.209Z</wsu:Expires>
+         <wsse:BinarySecurityToken 
EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary";
 wsu:Id="CertID-e82f76d6-8dcf-1dc1" 
ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";
 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>MIIDDDCCAfSgAwIBAgIQM6YEf7FVYx/tZyEXgVComTANBgkqhkiG9w0BAQUFADAwMQ4wDAYDVQQKDAVPQVNJUzEeMBwGA1UEAwwVT0FTSVMgSW50ZXJvcCBUZXN0IENBMB4XDTA1MDMxOTAwMDAwMFoXDTE4MDMxOTIzNTk1OVowQjEOMAwGA1UECgwFT0FTSVMxIDAeBgNVBAsMF09BU0lTIEludGVyb3AgVGVzdCBDZXJ0MQ4wDAYDVQQDDAVBbGljZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAoqi99By1VYo0aHrkKCNT4DkIgPL/SgahbeKdGhrbu3K2XG7arfD9tqIBIKMfrX4Gp90NJa85AV1yiNsEyvq+mUnMpNcKnLXLOjkTmMCqDYbbkehJlXPnaWLzve+mW0pJdPxtf3rbD4PS/cBQIvtpjmrDAU8VsZKT8DN5Kyz+EZsCAwEAAaOBkzCBkDAJBgNVHRMEAjAAMDMGA1UdHwQsMCowKKImhiRodHRwOi8vaW50ZXJvcC5iYnRlc3QubmV0L2NybC9jYS5jcmwwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQWBBQK4l0TUHZ1
 
QV3V2QtlLNDm+PoxiDAfBgNVHSMEGDAWgBTAnSj8wes1oR3WqqqgHBpNwkkPDzANBgkqhkiG9w0BAQUFAAOCAQEABTqpOpvW+6yrLXyUlP2xJbEkohXHI5OWwKWleOb9hlkhWntUalfcFOJAgUyH30TTpHldzx1+vK2LPzhoUFKYHE1IyQvokBN2JjFO64BQukCKnZhldLRPxGhfkTdxQgdf5rCK/wh3xVsZCNTfuMNmlAM6lOAg8QduDah3WFZpEA0s2nwQaCNQTNMjJC8tav1CBr6+E5FAmwPXP7pJxn9Fw9OXRyqbRA4v2y7YpbGkG2GI9UvOHw6SGvf4FRSthMMO35YbpikGsLix3vAsXWWi4rwfVOYzQK0OFPNi9RMCUdSH06m9uLWckiCxjos0FQODZE9l4ATGy9s9hNVwryOJTw==</wsse:BinarySecurityToken>
+         <wsu:Timestamp wsu:Id="SigID-e82f7c12-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
+            <wsu:Created>2007-11-08T07:55:00.743Z</wsu:Created>
+            <wsu:Expires>2007-11-08T08:01:00.743Z</wsu:Expires>
          </wsu:Timestamp>
-         <wsse:UsernameToken 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
+         <wsse:UsernameToken wsu:Id="SigID-e82f7c80-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
             <wsse:Username>Alice</wsse:Username>
-            <wsse:Password 
Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest";>dup3FGxm7o1T9171YS1VxOBY3A0=</wsse:Password>
-            <wsse:Nonce>HOADcfoSR7H1Txcymp8D6Q==</wsse:Nonce>
-            <wsu:Created>2007-09-02T04:03:17.209Z</wsu:Created>
+            <wsse:Password 
Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest";>my1lzTJs+LBRFaFnsHzl9ZQb3Us=</wsse:Password>
+            <wsse:Nonce>HTgnQbZg240UiOaqYMJvnX07z2YrmFXJ</wsse:Nonce>
+            <wsu:Created>2007-11-08T07:55:00.744Z</wsu:Created>
          </wsse:UsernameToken>
-         <xenc:EncryptedKey Id="EncKeyID-6f5b5fc2-5909-1dc1" xmlns="" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+         <xenc:EncryptedKey xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
             <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
             <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#";>
                <wsse:SecurityTokenReference 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
@@ -35,39 +35,32 @@
                </wsse:SecurityTokenReference>
             </ds:KeyInfo>
             <xenc:CipherData>
-               
<xenc:CipherValue>YigrxzMZLgNIVj8gwW1e8ZvBRGnT7Y2zAir4fR7PYl67YMkWcuhlCdCHyjmtAdT9YgZb8/sqSSsE/nuipKGRKnADc8szB/6GgPB0W684aa/5uDqw+hj5nw6+/nEoaY6zeKrffyBvpWsrW1+c9znhyDDW68TCoJ6i4LW4anCDESI=</xenc:CipherValue>
+               
<xenc:CipherValue>VOd9ZfofSqVGkFEoFlD5wiQ8dMVMBjWK9yBl0mfDJD1yC/6i3fJRhHVEH4PcsWcGGXPhN1gYXF/03EWZECNFHWdvK8nltjHS/Gg4eqrXvpzSNNB2JgJPS8I6paCZfLTGH3w+7PYz2JPQjFkAdsr6x2ale7X7Zj8pIQtKnyXp9Ls=</xenc:CipherValue>
             </xenc:CipherData>
             <xenc:ReferenceList xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
-               <xenc:DataReference URI="#EncDataID-6f5c58b4-5909-1dc1"/>
+               <xenc:DataReference URI="#EncDataID-e830db8e-8dcf-1dc1"/>
+               <xenc:DataReference URI="#EncDataID-e8310c62-8dcf-1dc1"/>
             </xenc:ReferenceList>
          </xenc:EncryptedKey>
-         <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-6f5c58b4-5909-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+         <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-e8310c62-8dcf-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
             <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
             <xenc:CipherData>
-               
<xenc:CipherValue>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</xenc:CipherValue>
+               
<xenc:CipherValue>+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</xenc:CipherValue>
             </xenc:CipherData>
          </xenc:EncryptedData>
-         <xenc:ReferenceList xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
-            <xenc:DataReference URI="#EncDataID-6f5b2eda-5909-1dc1"/>
-         </xenc:ReferenceList>
       </wsse:Security>
    </soapenv:Header>
-   <soapenv:Body wsu:Id="SigID-6f5b75e8-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
-      <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-6f5b2eda-5909-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+   <soapenv:Body wsu:Id="SigID-e82f7b90-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
+      <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-e830db8e-8dcf-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
          <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
          <xenc:CipherData>
-            
<xenc:CipherValue>T+XoI2zHLGN+Uhl5vHMxA2xysv/LYUKa4r/hAP9VIPsMJrWuKBZCimf0MAIwAGStdb7OJibZfuO/Ft5sxUnBQf8DguShhGYm1Qf4GnPji4mmlJmg0TxaU5G90Fv7TH1exNneb5zLtdlCh4yUk6dgMA==</xenc:CipherValue>
+            
<xenc:CipherValue>P0Rp2R2ZKH7MFmucX8fkWjQbEYZO904U50KoVOvqftiXn8PN+Zh1BUjdMRFozcRpArWqb1LY1fcGq1R5XXzCSGdKvbyWCBsMUlXDOwvv0WSF2fAFZpia8qXHlLyLiaXugxn4BSkmO2k8m/5ft5fl8A==</xenc:CipherValue>
          </xenc:CipherData>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#";>
-            <wsse:SecurityTokenReference 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
-               <wsse:Reference URI="#EncKeyID-6f5b5fc2-5909-1dc1"/>
-            </wsse:SecurityTokenReference>
-         </ds:KeyInfo>
       </xenc:EncryptedData>
    </soapenv:Body></soapenv:Envelope>==== Response ====
 HTTP/1.1 200 OK
 Content-Type: application/soap+xml;charset=UTF-8
-Content-Length: 5615
+Content-Length: 5208
 
 <soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope";>
    <soapenv:Header xmlns:wsa="http://www.w3.org/2005/08/addressing";>
@@ -75,14 +68,14 @@
       <wsa:From>
          
<wsa:Address>http://localhost:9090/axis2/services/sec_echo/echoString</wsa:Address>
       </wsa:From>
-      <wsa:MessageID>6f705f44-5909-1dc1-2072-000000000000</wsa:MessageID>
-      <wsa:RelatesTo 
wsa:RelationshipType="http://www.w3.org/2005/08/addressing/reply";>6f5b0158-5909-1dc1-3b9e-000000000000</wsa:RelatesTo>
+      <wsa:MessageID>e8407b70-8dcf-1dc1-3986-0013ce8f2fc7</wsa:MessageID>
+      <wsa:RelatesTo 
wsa:RelationshipType="http://www.w3.org/2005/08/addressing/reply";>e82f3acc-8dcf-1dc1-3725-0013ce8f2fc7</wsa:RelatesTo>
       <wsse:Security soapenv:mustUnderstand="1" 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
-         <wsu:Timestamp wsu:Id="SigID-6f709f18-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
-            <wsu:Created>2007-09-02T04:03:17.349Z</wsu:Created>
-            <wsu:Expires>2007-09-02T04:09:17.349Z</wsu:Expires>
+         <wsu:Timestamp wsu:Id="SigID-e8409d4e-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
+            <wsu:Created>2007-11-08T07:55:00.857Z</wsu:Created>
+            <wsu:Expires>2007-11-08T08:01:00.857Z</wsu:Expires>
          </wsu:Timestamp>
-         <xenc:EncryptedKey Id="EncKeyID-6f709aae-5909-1dc1" xmlns="" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+         <xenc:EncryptedKey xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
             <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
             <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#";>
                <wsse:SecurityTokenReference 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
@@ -90,34 +83,27 @@
                </wsse:SecurityTokenReference>
             </ds:KeyInfo>
             <xenc:CipherData>
-               
<xenc:CipherValue>HLdedsB6WbUffyJa7+LTguemh6GxDEYIB33y48wdIo8xYoZaBKCkFol4b/MGjBXBoeSU1fNuXUB0TT3qY5u3/Vbd3xFi1QvURa6WPZocKX7YExL6Xk+jgeWU0BMRUjhxpvNR7cFMI9o1hur1fPYunSPBTB1lMfqsqoMpXno4gu4=</xenc:CipherValue>
+               
<xenc:CipherValue>ZaSwcOY8mo2wLdWaBQOwdIV50UE5kkOI44Kccm3awm7nKoHxjbqAFt18OVnPbj8ZAQpjrjTmzz0j1VhZGR+heLsT7Hof5SzdH4o05bfrZEO94z0ZvqtXXW9zdFmOKLOxqfpd9i5m4NfLgQWlbYFF3KD0KyithJgjCJQSbeetP7s=</xenc:CipherValue>
             </xenc:CipherData>
             <xenc:ReferenceList xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
-               <xenc:DataReference URI="#EncDataID-6f7180fe-5909-1dc1"/>
+               <xenc:DataReference URI="#EncDataID-e8427998-8dcf-1dc1"/>
+               <xenc:DataReference URI="#EncDataID-e8427f60-8dcf-1dc1"/>
             </xenc:ReferenceList>
          </xenc:EncryptedKey>
-         <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-6f7180fe-5909-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+         <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-e8427f60-8dcf-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
             <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
             <xenc:CipherData>
-               
<xenc:CipherValue>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</xenc:CipherValue>
+               
<xenc:CipherValue>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</xenc:CipherValue>
             </xenc:CipherData>
          </xenc:EncryptedData>
-         <xenc:ReferenceList xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
-            <xenc:DataReference URI="#EncDataID-6f70763c-5909-1dc1"/>
-         </xenc:ReferenceList>
       </wsse:Security>
    </soapenv:Header>
-   <soapenv:Body wsu:Id="SigID-6f709e28-5909-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
-      <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-6f70763c-5909-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
+   <soapenv:Body wsu:Id="SigID-e8409c0e-8dcf-1dc1" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";>
+      <xenc:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element"; 
Id="EncDataID-e8427998-8dcf-1dc1" 
xmlns:xenc="http://www.w3.org/2001/04/xmlenc#";>
          <xenc:EncryptionMethod 
Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
          <xenc:CipherData>
-            
<xenc:CipherValue>IaPJIHuyU+/JwrwVi1f3QBIpZjX4mMLSXmh9KY/8CxmIclnF0k6ZA417lhstUPagqcairn1G4Sr6jGiMHyBTA9na/TX3gc1GienWLjIXHVPjkll6yjGnwBKhFyanZWFOy5SlAqQRsKjlZJAcx8r+PN/IsgbXmev87OdrvzvstiSYZJeYnsOFC38NOnAXPrtT</xenc:CipherValue>
+            
<xenc:CipherValue>dkq1EUHgg3nFHMlQOPDEMyHASaa4+w7uiX6vhzmFSLPaKT+u3zRLy4oI/ey1eODopxauRIa/OMJcQTkZI7qazi8upZ/XTVmaHixsGLrDu8nLerCuWRUeJdlxpP5f42hB5oQYwrUxTFH+UY3uXGIGZUkbNX35DNscSbZP2zIrEnUF2Zz0PY6fdZ0U8FI8nKHb</xenc:CipherValue>
          </xenc:CipherData>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#";>
-            <wsse:SecurityTokenReference 
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";>
-               <wsse:Reference URI="#EncKeyID-6f709aae-5909-1dc1"/>
-            </wsse:SecurityTokenReference>
-         </ds:KeyInfo>
       </xenc:EncryptedData>
    </soapenv:Body></soapenv:Envelope>
 

Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?rev=593072&r1=593071&r2=593072&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c 
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Thu Nov 
 8 00:49:07 2007
@@ -200,9 +200,8 @@
 {
     axis2_status_t valid_ts = AXIS2_FAILURE;
     axiom_node_t *ts_node = NULL;
-
-    ts_node = oxs_axiom_get_node_by_local_name(env,
-              sec_node, RAMPART_SECURITY_TIMESTAMP);
+    ts_node = oxs_axiom_get_first_child_node_by_name(env, sec_node, 
RAMPART_SECURITY_TIMESTAMP, OXS_WSU_XMLNS, NULL);
+    /*ts_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
RAMPART_SECURITY_TIMESTAMP);*/
     if(!ts_node)
     {
         if(rampart_context_is_include_timestamp(rampart_context, env))
@@ -265,9 +264,8 @@
 {
     axis2_status_t valid_user = AXIS2_FAILURE;
     axiom_node_t *ut_node = NULL;
-
-    ut_node = oxs_axiom_get_node_by_local_name(
-                  env, sec_node, RAMPART_SECURITY_USERNAMETOKEN);
+    ut_node = oxs_axiom_get_first_child_node_by_name(env, sec_node, 
RAMPART_SECURITY_USERNAMETOKEN, OXS_WSSE_XMLNS, NULL);
+    /*ut_node = oxs_axiom_get_node_by_local_name( env, sec_node, 
RAMPART_SECURITY_USERNAMETOKEN);*/
     if(!ut_node)
     {
         if(rampart_context_is_include_username_token(rampart_context, env))
@@ -1278,7 +1276,8 @@
             {
                 axiom_node_t *ref_list_node = NULL;
                 /*Get EncryptedKey node*/
-                cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);
+                cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY, OXS_ENC_NS, NULL);
+                /*cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);*/
                 if(!cur_node)
                 {
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shp] No 
Encrypted Key element.");
@@ -1364,7 +1363,9 @@
             {
                 if(!signature_protection)
                 {
-                    cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);
+
+                    cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY, OXS_ENC_NS, NULL);
+                    /*cur_node = oxs_axiom_get_node_by_local_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY);*/
                     if(!cur_node)
                     {
                         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
"[rampart][shp] No Encrypted Key element.");
@@ -1395,7 +1396,7 @@
                         return status;
                     }
                 }else{
-                    cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_REFERENCE_LIST, OXS_ENC_NS, OXS_XENC);
+                    cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_REFERENCE_LIST, OXS_ENC_NS, NULL);
                     /*oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_REFERENCE_LIST);*/
                     if(!cur_node)
                     {
@@ -1424,8 +1425,9 @@
             }
             else
             {
-                cur_node = oxs_axiom_get_node_by_local_name(
-                               env, sec_node, OXS_NODE_ENCRYPTED_KEY);
+                cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY, OXS_ENC_NS, NULL);
+                /*cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);*/
+
                 if(cur_node)
                 {
                     AXIS2_LOG_INFO(env->log, "[rampart][shp] policy does not 
specify encryption.");
@@ -1439,7 +1441,8 @@
             /*We should decrypt the message first*/
             if(rampart_context_check_whether_to_encrypt(rampart_context,env))
             {
-                cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);
+                cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY, OXS_ENC_NS, NULL);
+                /*cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);*/
                 if(!cur_node)
                 {
                     AXIS2_LOG_INFO(env->log, "[rampart][shp] No Encrypted Key 
element");
@@ -1450,7 +1453,7 @@
                     AXIS2_LOG_INFO(env->log, "[rampart][shp] Error in the 
security header");
                     return AXIS2_FAILURE;
                 }
-                /*If the signature to be encrypted*/
+                /*If the signature is encrypted*/
                 if(signature_protection)
                 {
                     if(oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_SIGNATURE))
@@ -1468,7 +1471,7 @@
                 
                 /*Now process the Reference List. if any*/
                 AXIS2_LOG_INFO(env->log, "[rampart][shp] Process 
ReferenceList");
-                cur_node = oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_REFERENCE_LIST, OXS_ENC_NS, OXS_XENC);
+                cur_node = oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_REFERENCE_LIST, OXS_ENC_NS, NULL);
                 /*cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_REFERENCE_LIST);*/
                 if(cur_node)
                 {
@@ -1481,7 +1484,8 @@
                 }
 
             }else{/*No decryption needed*/
-                cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);
+                cur_node =  oxs_axiom_get_first_child_node_by_name(env, 
sec_node, OXS_NODE_ENCRYPTED_KEY, OXS_ENC_NS, NULL);
+                /*cur_node = oxs_axiom_get_node_by_local_name(env, sec_node, 
OXS_NODE_ENCRYPTED_KEY);*/
                 if(cur_node)
                 {
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart][shp] 
policy does not specify Encryption");


Reply via email to