ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1040461 [14/28] - in /webservices/wss4j/site: ./ apidocs/ apidocs/org/apache/ws/axis/security/ apidocs/org/apache/ws/axis/security/class-use/ apidocs/org/apache/ws/axis/security/handler/ apidocs/org/apache/ws/axis/security/handler/class-us...
Date Tue, 30 Nov 2010 11:10:41 GMT
Modified: webservices/wss4j/site/xref-test/wssec/TestWSSecurityUTDK.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref-test/wssec/TestWSSecurityUTDK.html?rev=1040461&r1=1040460&r2=1040461&view=diff
==============================================================================
--- webservices/wss4j/site/xref-test/wssec/TestWSSecurityUTDK.html (original)
+++ webservices/wss4j/site/xref-test/wssec/TestWSSecurityUTDK.html Tue Nov 30 11:10:26 2010
@@ -51,438 +51,566 @@
 <a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.WSSecHeader;
 <a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.WSSecUsernameToken;
 <a name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.token.UsernameToken;
-<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.util.WSSecurityUtil;
-<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.signature.XMLSignature;
-<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Document;
-<a name="47" href="#47">47</a>  
-<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
-<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
-<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.UnsupportedCallbackException;
-<a name="51" href="#51">51</a>  
-<a name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
-<a name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a name="54" href="#54">54</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a name="55" href="#55">55</a>  
-<a name="56" href="#56">56</a>  <strong class="jxr_keyword">import</strong> java.util.Vector;
-<a name="57" href="#57">57</a>  
-<a name="58" href="#58">58</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="59" href="#59">59</a>  <em class="jxr_javadoccomment"> * WS-Security Test Case for UsernameToken Key Derivation, as defined in the </em>
-<a name="60" href="#60">60</a>  <em class="jxr_javadoccomment"> * UsernameTokenProfile 1.1 specification. The derived keys are used to encrypt</em>
-<a name="61" href="#61">61</a>  <em class="jxr_javadoccomment"> * and sign, as per wsc:DerivedKeyToken.</em>
-<a name="62" href="#62">62</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="63" href="#63">63</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../wssec/TestWSSecurityUTDK.html">TestWSSecurityUTDK</a> <strong class="jxr_keyword">extends</strong> TestCase implements CallbackHandler {
-<a name="64" href="#64">64</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestWSSecurityUTDK.<strong class="jxr_keyword">class</strong>);
-<a name="65" href="#65">65</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPMSG = 
-<a name="66" href="#66">66</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
-<a name="67" href="#67">67</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope "</span>
-<a name="68" href="#68">68</a>          +   <span class="jxr_string">"xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
-<a name="69" href="#69">69</a>          +   <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
-<a name="70" href="#70">70</a>          +   <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span> 
-<a name="71" href="#71">71</a>          +   <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
-<a name="72" href="#72">72</a>          +       <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
-<a name="73" href="#73">73</a>          +           <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> 
-<a name="74" href="#74">74</a>          +       <span class="jxr_string">"&lt;/add&gt;"</span> 
-<a name="75" href="#75">75</a>          +   <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;"</span> 
-<a name="76" href="#76">76</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
-<a name="77" href="#77">77</a>  
-<a name="78" href="#78">78</a>      <strong class="jxr_keyword">private</strong> WSSecurityEngine secEngine = <strong class="jxr_keyword">new</strong> WSSecurityEngine();
-<a name="79" href="#79">79</a>      <strong class="jxr_keyword">private</strong> Crypto crypto = CryptoFactory.getInstance();
-<a name="80" href="#80">80</a>      <strong class="jxr_keyword">private</strong> MessageContext msgContext;
-<a name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> SOAPEnvelope unsignedEnvelope;
-<a name="82" href="#82">82</a>  
-<a name="83" href="#83">83</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="84" href="#84">84</a>  <em class="jxr_javadoccomment">     * TestWSSecurity constructor</em>
-<a name="85" href="#85">85</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="86" href="#86">86</a>  <em class="jxr_javadoccomment">     * </em>
-<a name="87" href="#87">87</a>  <em class="jxr_javadoccomment">     * @param name name of the test</em>
-<a name="88" href="#88">88</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="89" href="#89">89</a>      <strong class="jxr_keyword">public</strong> <a href="../wssec/TestWSSecurityUTDK.html">TestWSSecurityUTDK</a>(String name) {
-<a name="90" href="#90">90</a>          <strong class="jxr_keyword">super</strong>(name);
-<a name="91" href="#91">91</a>      }
-<a name="92" href="#92">92</a>  
-<a name="93" href="#93">93</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="94" href="#94">94</a>  <em class="jxr_javadoccomment">     * JUnit suite</em>
-<a name="95" href="#95">95</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="96" href="#96">96</a>  <em class="jxr_javadoccomment">     * </em>
-<a name="97" href="#97">97</a>  <em class="jxr_javadoccomment">     * @return a junit test suite</em>
-<a name="98" href="#98">98</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="99" href="#99">99</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Test suite() {
-<a name="100" href="#100">100</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TestSuite(TestWSSecurityUTDK.<strong class="jxr_keyword">class</strong>);
-<a name="101" href="#101">101</a>     }
-<a name="102" href="#102">102</a> 
-<a name="103" href="#103">103</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="104" href="#104">104</a> <em class="jxr_javadoccomment">     * Setup method</em>
-<a name="105" href="#105">105</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="106" href="#106">106</a> <em class="jxr_javadoccomment">     * </em>
-<a name="107" href="#107">107</a> <em class="jxr_javadoccomment">     * @throws Exception Thrown when there is a problem in setup</em>
-<a name="108" href="#108">108</a> <em class="jxr_javadoccomment">     */</em>
-<a name="109" href="#109">109</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="110" href="#110">110</a>         AxisClient tmpEngine = <strong class="jxr_keyword">new</strong> AxisClient(<strong class="jxr_keyword">new</strong> NullProvider());
-<a name="111" href="#111">111</a>         msgContext = <strong class="jxr_keyword">new</strong> MessageContext(tmpEngine);
-<a name="112" href="#112">112</a>         unsignedEnvelope = getSOAPEnvelope();
-<a name="113" href="#113">113</a>     }
-<a name="114" href="#114">114</a> 
-<a name="115" href="#115">115</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">     * Constructs a soap envelope</em>
-<a name="117" href="#117">117</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="118" href="#118">118</a> <em class="jxr_javadoccomment">     * </em>
-<a name="119" href="#119">119</a> <em class="jxr_javadoccomment">     * @return soap envelope</em>
-<a name="120" href="#120">120</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception if there is any problem constructing the soap envelope</em>
-<a name="121" href="#121">121</a> <em class="jxr_javadoccomment">     */</em>
-<a name="122" href="#122">122</a>     <strong class="jxr_keyword">protected</strong> SOAPEnvelope getSOAPEnvelope() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="123" href="#123">123</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPMSG.getBytes());
-<a name="124" href="#124">124</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
-<a name="125" href="#125">125</a>         msg.setMessageContext(msgContext);
-<a name="126" href="#126">126</a>         <strong class="jxr_keyword">return</strong> msg.getSOAPEnvelope();
-<a name="127" href="#127">127</a>     }
-<a name="128" href="#128">128</a> 
-<a name="129" href="#129">129</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="130" href="#130">130</a> <em class="jxr_javadoccomment">     * Unit test for the UsernameToken derived key functionality </em>
-<a name="131" href="#131">131</a> <em class="jxr_javadoccomment">     */</em>
-<a name="132" href="#132">132</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenUnit() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="133" href="#133">133</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="134" href="#134">134</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="135" href="#135">135</a>         secHeader.insertSecurityHeader(doc);
-<a name="136" href="#136">136</a>         
-<a name="137" href="#137">137</a>         UsernameToken usernameToken = <strong class="jxr_keyword">new</strong> UsernameToken(<strong class="jxr_keyword">true</strong>, doc, <strong class="jxr_keyword">null</strong>);
-<a name="138" href="#138">138</a>         usernameToken.setName(<span class="jxr_string">"bob"</span>);
+<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.util.Base64;
+<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.util.WSSecurityUtil;
+<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.signature.XMLSignature;
+<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Document;
+<a name="48" href="#48">48</a>  
+<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
+<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
+<a name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.UnsupportedCallbackException;
+<a name="52" href="#52">52</a>  
+<a name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
+<a name="54" href="#54">54</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
+<a name="56" href="#56">56</a>  
+<a name="57" href="#57">57</a>  <strong class="jxr_keyword">import</strong> java.security.MessageDigest;
+<a name="58" href="#58">58</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a name="59" href="#59">59</a>  <strong class="jxr_keyword">import</strong> java.util.Vector;
+<a name="60" href="#60">60</a>  
+<a name="61" href="#61">61</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="62" href="#62">62</a>  <em class="jxr_javadoccomment"> * WS-Security Test Case for UsernameToken Key Derivation, as defined in the </em>
+<a name="63" href="#63">63</a>  <em class="jxr_javadoccomment"> * UsernameTokenProfile 1.1 specification. The derived keys are used to encrypt</em>
+<a name="64" href="#64">64</a>  <em class="jxr_javadoccomment"> * and sign, as per wsc:DerivedKeyToken.</em>
+<a name="65" href="#65">65</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="66" href="#66">66</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../wssec/TestWSSecurityUTDK.html">TestWSSecurityUTDK</a> <strong class="jxr_keyword">extends</strong> TestCase implements CallbackHandler {
+<a name="67" href="#67">67</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestWSSecurityUTDK.<strong class="jxr_keyword">class</strong>);
+<a name="68" href="#68">68</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPMSG = 
+<a name="69" href="#69">69</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
+<a name="70" href="#70">70</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope "</span>
+<a name="71" href="#71">71</a>          +   <span class="jxr_string">"xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
+<a name="72" href="#72">72</a>          +   <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
+<a name="73" href="#73">73</a>          +   <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span> 
+<a name="74" href="#74">74</a>          +   <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
+<a name="75" href="#75">75</a>          +       <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
+<a name="76" href="#76">76</a>          +           <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> 
+<a name="77" href="#77">77</a>          +       <span class="jxr_string">"&lt;/add&gt;"</span> 
+<a name="78" href="#78">78</a>          +   <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;"</span> 
+<a name="79" href="#79">79</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
+<a name="80" href="#80">80</a>  
+<a name="81" href="#81">81</a>      <strong class="jxr_keyword">private</strong> WSSecurityEngine secEngine = <strong class="jxr_keyword">new</strong> WSSecurityEngine();
+<a name="82" href="#82">82</a>      <strong class="jxr_keyword">private</strong> Crypto crypto = CryptoFactory.getInstance();
+<a name="83" href="#83">83</a>      <strong class="jxr_keyword">private</strong> MessageContext msgContext;
+<a name="84" href="#84">84</a>      <strong class="jxr_keyword">private</strong> SOAPEnvelope unsignedEnvelope;
+<a name="85" href="#85">85</a>  
+<a name="86" href="#86">86</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="87" href="#87">87</a>  <em class="jxr_javadoccomment">     * TestWSSecurity constructor</em>
+<a name="88" href="#88">88</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="89" href="#89">89</a>  <em class="jxr_javadoccomment">     * </em>
+<a name="90" href="#90">90</a>  <em class="jxr_javadoccomment">     * @param name name of the test</em>
+<a name="91" href="#91">91</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="92" href="#92">92</a>      <strong class="jxr_keyword">public</strong> <a href="../wssec/TestWSSecurityUTDK.html">TestWSSecurityUTDK</a>(String name) {
+<a name="93" href="#93">93</a>          <strong class="jxr_keyword">super</strong>(name);
+<a name="94" href="#94">94</a>      }
+<a name="95" href="#95">95</a>  
+<a name="96" href="#96">96</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="97" href="#97">97</a>  <em class="jxr_javadoccomment">     * JUnit suite</em>
+<a name="98" href="#98">98</a>  <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="99" href="#99">99</a>  <em class="jxr_javadoccomment">     * </em>
+<a name="100" href="#100">100</a> <em class="jxr_javadoccomment">     * @return a junit test suite</em>
+<a name="101" href="#101">101</a> <em class="jxr_javadoccomment">     */</em>
+<a name="102" href="#102">102</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Test suite() {
+<a name="103" href="#103">103</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TestSuite(TestWSSecurityUTDK.<strong class="jxr_keyword">class</strong>);
+<a name="104" href="#104">104</a>     }
+<a name="105" href="#105">105</a> 
+<a name="106" href="#106">106</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="107" href="#107">107</a> <em class="jxr_javadoccomment">     * Setup method</em>
+<a name="108" href="#108">108</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="109" href="#109">109</a> <em class="jxr_javadoccomment">     * </em>
+<a name="110" href="#110">110</a> <em class="jxr_javadoccomment">     * @throws Exception Thrown when there is a problem in setup</em>
+<a name="111" href="#111">111</a> <em class="jxr_javadoccomment">     */</em>
+<a name="112" href="#112">112</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="113" href="#113">113</a>         AxisClient tmpEngine = <strong class="jxr_keyword">new</strong> AxisClient(<strong class="jxr_keyword">new</strong> NullProvider());
+<a name="114" href="#114">114</a>         msgContext = <strong class="jxr_keyword">new</strong> MessageContext(tmpEngine);
+<a name="115" href="#115">115</a>         unsignedEnvelope = getSOAPEnvelope();
+<a name="116" href="#116">116</a>     }
+<a name="117" href="#117">117</a> 
+<a name="118" href="#118">118</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="119" href="#119">119</a> <em class="jxr_javadoccomment">     * Constructs a soap envelope</em>
+<a name="120" href="#120">120</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="121" href="#121">121</a> <em class="jxr_javadoccomment">     * </em>
+<a name="122" href="#122">122</a> <em class="jxr_javadoccomment">     * @return soap envelope</em>
+<a name="123" href="#123">123</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception if there is any problem constructing the soap envelope</em>
+<a name="124" href="#124">124</a> <em class="jxr_javadoccomment">     */</em>
+<a name="125" href="#125">125</a>     <strong class="jxr_keyword">protected</strong> SOAPEnvelope getSOAPEnvelope() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="126" href="#126">126</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPMSG.getBytes());
+<a name="127" href="#127">127</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
+<a name="128" href="#128">128</a>         msg.setMessageContext(msgContext);
+<a name="129" href="#129">129</a>         <strong class="jxr_keyword">return</strong> msg.getSOAPEnvelope();
+<a name="130" href="#130">130</a>     }
+<a name="131" href="#131">131</a> 
+<a name="132" href="#132">132</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="133" href="#133">133</a> <em class="jxr_javadoccomment">     * Unit test for the UsernameToken derived key functionality </em>
+<a name="134" href="#134">134</a> <em class="jxr_javadoccomment">     */</em>
+<a name="135" href="#135">135</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenUnit() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="136" href="#136">136</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="137" href="#137">137</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="138" href="#138">138</a>         secHeader.insertSecurityHeader(doc);
 <a name="139" href="#139">139</a>         
-<a name="140" href="#140">140</a>         byte[] salt = usernameToken.addSalt(doc, <strong class="jxr_keyword">null</strong>, false);
-<a name="141" href="#141">141</a>         assertTrue(salt.length == 16);
-<a name="142" href="#142">142</a>         assertTrue(salt[15] == 0x02);
-<a name="143" href="#143">143</a>         byte[] utSalt = usernameToken.getSalt();
-<a name="144" href="#144">144</a>         assertTrue(salt.length == utSalt.length);
-<a name="145" href="#145">145</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; salt.length; i++) {
-<a name="146" href="#146">146</a>             assertTrue(salt[i] == utSalt[i]);
-<a name="147" href="#147">147</a>         }
-<a name="148" href="#148">148</a>         
-<a name="149" href="#149">149</a>         usernameToken.addIteration(doc, 500);
-<a name="150" href="#150">150</a>         assertTrue(usernameToken.getIteration() == 500);
+<a name="140" href="#140">140</a>         UsernameToken usernameToken = <strong class="jxr_keyword">new</strong> UsernameToken(<strong class="jxr_keyword">true</strong>, doc, <strong class="jxr_keyword">null</strong>);
+<a name="141" href="#141">141</a>         usernameToken.setName(<span class="jxr_string">"bob"</span>);
+<a name="142" href="#142">142</a>         
+<a name="143" href="#143">143</a>         byte[] salt = usernameToken.addSalt(doc, <strong class="jxr_keyword">null</strong>, false);
+<a name="144" href="#144">144</a>         assertTrue(salt.length == 16);
+<a name="145" href="#145">145</a>         assertTrue(salt[15] == 0x02);
+<a name="146" href="#146">146</a>         byte[] utSalt = usernameToken.getSalt();
+<a name="147" href="#147">147</a>         assertTrue(salt.length == utSalt.length);
+<a name="148" href="#148">148</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; salt.length; i++) {
+<a name="149" href="#149">149</a>             assertTrue(salt[i] == utSalt[i]);
+<a name="150" href="#150">150</a>         }
 <a name="151" href="#151">151</a>         
-<a name="152" href="#152">152</a>         WSSecurityUtil.prependChildElement(
-<a name="153" href="#153">153</a>             secHeader.getSecurityHeader(), usernameToken.getElement()
-<a name="154" href="#154">154</a>         );
-<a name="155" href="#155">155</a>         
-<a name="156" href="#156">156</a>         String outputString = 
-<a name="157" href="#157">157</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
-<a name="158" href="#158">158</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
-<a name="159" href="#159">159</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
-<a name="160" href="#160">160</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
-<a name="161" href="#161">161</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
-<a name="162" href="#162">162</a>         
-<a name="163" href="#163">163</a>         byte[] derivedKey = UsernameToken.generateDerivedKey(<span class="jxr_string">"security"</span>, salt, 500);
-<a name="164" href="#164">164</a>         assertTrue(derivedKey.length == 20);
+<a name="152" href="#152">152</a>         usernameToken.addIteration(doc, 500);
+<a name="153" href="#153">153</a>         assertTrue(usernameToken.getIteration() == 500);
+<a name="154" href="#154">154</a>         
+<a name="155" href="#155">155</a>         WSSecurityUtil.prependChildElement(
+<a name="156" href="#156">156</a>             secHeader.getSecurityHeader(), usernameToken.getElement()
+<a name="157" href="#157">157</a>         );
+<a name="158" href="#158">158</a>         
+<a name="159" href="#159">159</a>         String outputString = 
+<a name="160" href="#160">160</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+<a name="161" href="#161">161</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="162" href="#162">162</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="163" href="#163">163</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="164" href="#164">164</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
 <a name="165" href="#165">165</a>         
-<a name="166" href="#166">166</a>     }
-<a name="167" href="#167">167</a>     
-<a name="168" href="#168">168</a> 
-<a name="169" href="#169">169</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="170" href="#170">170</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body</em>
-<a name="171" href="#171">171</a> <em class="jxr_javadoccomment">     */</em>
-<a name="172" href="#172">172</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyEncryption() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="173" href="#173">173</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="174" href="#174">174</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="175" href="#175">175</a>         secHeader.insertSecurityHeader(doc);
-<a name="176" href="#176">176</a>         
-<a name="177" href="#177">177</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="178" href="#178">178</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
-<a name="179" href="#179">179</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="180" href="#180">180</a>         builder.prepare(doc);
-<a name="181" href="#181">181</a>         
-<a name="182" href="#182">182</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="183" href="#183">183</a>         assertTrue(derivedKey.length == 20);
-<a name="184" href="#184">184</a>         
-<a name="185" href="#185">185</a>         String tokenIdentifier = builder.getId();
-<a name="186" href="#186">186</a>         
-<a name="187" href="#187">187</a>         <em class="jxr_comment">//</em>
-<a name="188" href="#188">188</a>         <em class="jxr_comment">// Derived key encryption</em>
-<a name="189" href="#189">189</a>         <em class="jxr_comment">//</em>
-<a name="190" href="#190">190</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
-<a name="191" href="#191">191</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-<a name="192" href="#192">192</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="193" href="#193">193</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
-<a name="194" href="#194">194</a>         
-<a name="195" href="#195">195</a>         builder.prependToHeader(secHeader);
+<a name="166" href="#166">166</a>         byte[] derivedKey = UsernameToken.generateDerivedKey(<span class="jxr_string">"security"</span>, salt, 500);
+<a name="167" href="#167">167</a>         assertTrue(derivedKey.length == 20);
+<a name="168" href="#168">168</a>         
+<a name="169" href="#169">169</a>         <em class="jxr_comment">// "c2VjdXJpdHk=" is the Base64 encoding of "security"</em>
+<a name="170" href="#170">170</a>         derivedKey = UsernameToken.generateDerivedKey(Base64.decode(<span class="jxr_string">"c2VjdXJpdHk="</span>), salt, 500);
+<a name="171" href="#171">171</a>         assertTrue(derivedKey.length == 20);
+<a name="172" href="#172">172</a>     }
+<a name="173" href="#173">173</a> 
+<a name="174" href="#174">174</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="175" href="#175">175</a> <em class="jxr_javadoccomment">     * Test for encoded passwords.</em>
+<a name="176" href="#176">176</a> <em class="jxr_javadoccomment">     */</em>
+<a name="177" href="#177">177</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyWithEncodedPasswordBaseline() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="178" href="#178">178</a>         String password = <span class="jxr_string">"password"</span>;
+<a name="179" href="#179">179</a>         <em class="jxr_comment">// The SHA-1 of the password is known as a password equivalent in the UsernameToken specification.</em>
+<a name="180" href="#180">180</a>         byte[] passwordHash = MessageDigest.getInstance(<span class="jxr_string">"SHA-1"</span>).digest(password.getBytes(<span class="jxr_string">"UTF-8"</span>));
+<a name="181" href="#181">181</a> 
+<a name="182" href="#182">182</a>         byte[] salt = Base64.decode(<span class="jxr_string">"LKpycbfgRzwDnBz6kkhAAQ=="</span>);
+<a name="183" href="#183">183</a>         <strong class="jxr_keyword">int</strong> iteration = 1049;
+<a name="184" href="#184">184</a>         byte[] expectedDerivedKey = Base64.decode(<span class="jxr_string">"C7Ll/OY4TECb6hZuMMiX/5hzszo="</span>);
+<a name="185" href="#185">185</a>         byte[] derivedKey = UsernameToken.generateDerivedKey(passwordHash, salt, iteration);
+<a name="186" href="#186">186</a>         assertTrue(<span class="jxr_string">"the derived key is not as expected"</span>, Arrays.equals(expectedDerivedKey, derivedKey));
+<a name="187" href="#187">187</a>     }
+<a name="188" href="#188">188</a> 
+<a name="189" href="#189">189</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="190" href="#190">190</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body</em>
+<a name="191" href="#191">191</a> <em class="jxr_javadoccomment">     */</em>
+<a name="192" href="#192">192</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyEncryption() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="193" href="#193">193</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="194" href="#194">194</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="195" href="#195">195</a>         secHeader.insertSecurityHeader(doc);
 <a name="196" href="#196">196</a>         
-<a name="197" href="#197">197</a>         String outputString = 
-<a name="198" href="#198">198</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
-<a name="199" href="#199">199</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
-<a name="200" href="#200">200</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
-<a name="201" href="#201">201</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
-<a name="202" href="#202">202</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
-<a name="203" href="#203">203</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
-<a name="204" href="#204">204</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="205" href="#205">205</a>             LOG.debug(outputString);
-<a name="206" href="#206">206</a>         }
-<a name="207" href="#207">207</a>         
-<a name="208" href="#208">208</a>         verify(encryptedDoc);
-<a name="209" href="#209">209</a>     }
-<a name="210" href="#210">210</a>     
-<a name="211" href="#211">211</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="212" href="#212">212</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body. In this test the</em>
-<a name="213" href="#213">213</a> <em class="jxr_javadoccomment">     * derived key is modified before encryption, and so decryption should fail.</em>
-<a name="214" href="#214">214</a> <em class="jxr_javadoccomment">     */</em>
-<a name="215" href="#215">215</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyChangedEncryption() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="216" href="#216">216</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="217" href="#217">217</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="218" href="#218">218</a>         secHeader.insertSecurityHeader(doc);
-<a name="219" href="#219">219</a>         
-<a name="220" href="#220">220</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="221" href="#221">221</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
-<a name="222" href="#222">222</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="223" href="#223">223</a>         builder.prepare(doc);
-<a name="224" href="#224">224</a>         
-<a name="225" href="#225">225</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="226" href="#226">226</a>         derivedKey[5] = 12;
-<a name="227" href="#227">227</a>         assertTrue(derivedKey.length == 20);
-<a name="228" href="#228">228</a>         
-<a name="229" href="#229">229</a>         String tokenIdentifier = builder.getId();
-<a name="230" href="#230">230</a>         
-<a name="231" href="#231">231</a>         <em class="jxr_comment">//</em>
-<a name="232" href="#232">232</a>         <em class="jxr_comment">// Derived key encryption</em>
-<a name="233" href="#233">233</a>         <em class="jxr_comment">//</em>
-<a name="234" href="#234">234</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
-<a name="235" href="#235">235</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-<a name="236" href="#236">236</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="237" href="#237">237</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
+<a name="197" href="#197">197</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="198" href="#198">198</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
+<a name="199" href="#199">199</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="200" href="#200">200</a>         builder.prepare(doc);
+<a name="201" href="#201">201</a>         
+<a name="202" href="#202">202</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="203" href="#203">203</a>         assertTrue(derivedKey.length == 20);
+<a name="204" href="#204">204</a>         
+<a name="205" href="#205">205</a>         String tokenIdentifier = builder.getId();
+<a name="206" href="#206">206</a>         
+<a name="207" href="#207">207</a>         <em class="jxr_comment">//</em>
+<a name="208" href="#208">208</a>         <em class="jxr_comment">// Derived key encryption</em>
+<a name="209" href="#209">209</a>         <em class="jxr_comment">//</em>
+<a name="210" href="#210">210</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
+<a name="211" href="#211">211</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
+<a name="212" href="#212">212</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="213" href="#213">213</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
+<a name="214" href="#214">214</a>         
+<a name="215" href="#215">215</a>         builder.prependToHeader(secHeader);
+<a name="216" href="#216">216</a>         
+<a name="217" href="#217">217</a>         String outputString = 
+<a name="218" href="#218">218</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+<a name="219" href="#219">219</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="220" href="#220">220</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="221" href="#221">221</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="222" href="#222">222</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="223" href="#223">223</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
+<a name="224" href="#224">224</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="225" href="#225">225</a>             LOG.debug(outputString);
+<a name="226" href="#226">226</a>         }
+<a name="227" href="#227">227</a>         
+<a name="228" href="#228">228</a>         verify(encryptedDoc);
+<a name="229" href="#229">229</a>     }
+<a name="230" href="#230">230</a>     
+<a name="231" href="#231">231</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="232" href="#232">232</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body</em>
+<a name="233" href="#233">233</a> <em class="jxr_javadoccomment">     */</em>
+<a name="234" href="#234">234</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyEncryptionWithEncodedPassword() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="235" href="#235">235</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="236" href="#236">236</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="237" href="#237">237</a>         secHeader.insertSecurityHeader(doc);
 <a name="238" href="#238">238</a>         
-<a name="239" href="#239">239</a>         builder.prependToHeader(secHeader);
-<a name="240" href="#240">240</a>         
-<a name="241" href="#241">241</a>         String outputString = 
-<a name="242" href="#242">242</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
-<a name="243" href="#243">243</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
-<a name="244" href="#244">244</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
-<a name="245" href="#245">245</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
-<a name="246" href="#246">246</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
-<a name="247" href="#247">247</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
-<a name="248" href="#248">248</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="249" href="#249">249</a>             LOG.debug(outputString);
-<a name="250" href="#250">250</a>         }
-<a name="251" href="#251">251</a>         
-<a name="252" href="#252">252</a>         <strong class="jxr_keyword">try</strong> {
-<a name="253" href="#253">253</a>             verify(encryptedDoc);
-<a name="254" href="#254">254</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived encryption"</span>);
-<a name="255" href="#255">255</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="256" href="#256">256</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
-<a name="257" href="#257">257</a>             <em class="jxr_comment">// expected</em>
-<a name="258" href="#258">258</a>         }
-<a name="259" href="#259">259</a>     }
-<a name="260" href="#260">260</a>     
-<a name="261" href="#261">261</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="262" href="#262">262</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body. In this test the</em>
-<a name="263" href="#263">263</a> <em class="jxr_javadoccomment">     * user is "alice" rather than "bob", and so decryption should fail.</em>
-<a name="264" href="#264">264</a> <em class="jxr_javadoccomment">     */</em>
-<a name="265" href="#265">265</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyBadUserEncryption() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="266" href="#266">266</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="267" href="#267">267</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="268" href="#268">268</a>         secHeader.insertSecurityHeader(doc);
-<a name="269" href="#269">269</a>         
-<a name="270" href="#270">270</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="271" href="#271">271</a>         builder.setUserInfo(<span class="jxr_string">"alice"</span>, <span class="jxr_string">"security"</span>);
-<a name="272" href="#272">272</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="273" href="#273">273</a>         builder.prepare(doc);
-<a name="274" href="#274">274</a>         
-<a name="275" href="#275">275</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="276" href="#276">276</a>         assertTrue(derivedKey.length == 20);
-<a name="277" href="#277">277</a>         
-<a name="278" href="#278">278</a>         String tokenIdentifier = builder.getId();
-<a name="279" href="#279">279</a>         
-<a name="280" href="#280">280</a>         <em class="jxr_comment">//</em>
-<a name="281" href="#281">281</a>         <em class="jxr_comment">// Derived key encryption</em>
-<a name="282" href="#282">282</a>         <em class="jxr_comment">//</em>
-<a name="283" href="#283">283</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
-<a name="284" href="#284">284</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-<a name="285" href="#285">285</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="286" href="#286">286</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
-<a name="287" href="#287">287</a>         
-<a name="288" href="#288">288</a>         builder.prependToHeader(secHeader);
-<a name="289" href="#289">289</a>         
-<a name="290" href="#290">290</a>         String outputString = 
-<a name="291" href="#291">291</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
-<a name="292" href="#292">292</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
-<a name="293" href="#293">293</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
-<a name="294" href="#294">294</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
-<a name="295" href="#295">295</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
-<a name="296" href="#296">296</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
-<a name="297" href="#297">297</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="298" href="#298">298</a>             LOG.debug(outputString);
-<a name="299" href="#299">299</a>         }
-<a name="300" href="#300">300</a>         
-<a name="301" href="#301">301</a>         <strong class="jxr_keyword">try</strong> {
-<a name="302" href="#302">302</a>             verify(encryptedDoc);
-<a name="303" href="#303">303</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived encryption"</span>);
-<a name="304" href="#304">304</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="305" href="#305">305</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="306" href="#306">306</a>             <em class="jxr_comment">// expected</em>
-<a name="307" href="#307">307</a>         }
-<a name="308" href="#308">308</a>     }
-<a name="309" href="#309">309</a>     
-<a name="310" href="#310">310</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="311" href="#311">311</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body</em>
-<a name="312" href="#312">312</a> <em class="jxr_javadoccomment">     */</em>
-<a name="313" href="#313">313</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeySignature() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="314" href="#314">314</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="315" href="#315">315</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="316" href="#316">316</a>         secHeader.insertSecurityHeader(doc);
-<a name="317" href="#317">317</a>         
-<a name="318" href="#318">318</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="319" href="#319">319</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
-<a name="320" href="#320">320</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="321" href="#321">321</a>         builder.prepare(doc);
-<a name="322" href="#322">322</a>         
-<a name="323" href="#323">323</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="324" href="#324">324</a>         assertTrue(derivedKey.length == 20);
-<a name="325" href="#325">325</a>         
-<a name="326" href="#326">326</a>         String tokenIdentifier = builder.getId();
-<a name="327" href="#327">327</a>         
-<a name="328" href="#328">328</a>         <em class="jxr_comment">//</em>
-<a name="329" href="#329">329</a>         <em class="jxr_comment">// Derived key signature</em>
-<a name="330" href="#330">330</a>         <em class="jxr_comment">//</em>
-<a name="331" href="#331">331</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
-<a name="332" href="#332">332</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="333" href="#333">333</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-<a name="334" href="#334">334</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
-<a name="335" href="#335">335</a>         
-<a name="336" href="#336">336</a>         builder.prependToHeader(secHeader);
-<a name="337" href="#337">337</a>         
-<a name="338" href="#338">338</a>         String outputString = 
-<a name="339" href="#339">339</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="340" href="#340">340</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
-<a name="341" href="#341">341</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
-<a name="342" href="#342">342</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
-<a name="343" href="#343">343</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
-<a name="344" href="#344">344</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="345" href="#345">345</a>             LOG.debug(outputString);
-<a name="346" href="#346">346</a>         }
-<a name="347" href="#347">347</a>         
-<a name="348" href="#348">348</a>         Vector results = verify(signedDoc);
-<a name="349" href="#349">349</a>         WSSecurityEngineResult actionResult =
-<a name="350" href="#350">350</a>             WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
-<a name="351" href="#351">351</a>         java.security.Principal principal = 
-<a name="352" href="#352">352</a>             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-<a name="353" href="#353">353</a>         <em class="jxr_comment">//System.out.println(principal.getName());</em>
-<a name="354" href="#354">354</a>         assertTrue(principal.getName().indexOf(<span class="jxr_string">"derivedKey"</span>) != -1);
-<a name="355" href="#355">355</a>     }
-<a name="356" href="#356">356</a>     
-<a name="357" href="#357">357</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="358" href="#358">358</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body. In this test the</em>
-<a name="359" href="#359">359</a> <em class="jxr_javadoccomment">     * derived key is modified before signature, and so signature verification should</em>
-<a name="360" href="#360">360</a> <em class="jxr_javadoccomment">     * fail.</em>
-<a name="361" href="#361">361</a> <em class="jxr_javadoccomment">     */</em>
-<a name="362" href="#362">362</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyChangedSignature() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="363" href="#363">363</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="364" href="#364">364</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="365" href="#365">365</a>         secHeader.insertSecurityHeader(doc);
-<a name="366" href="#366">366</a>         
-<a name="367" href="#367">367</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="368" href="#368">368</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
-<a name="369" href="#369">369</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="370" href="#370">370</a>         builder.prepare(doc);
-<a name="371" href="#371">371</a>         
-<a name="372" href="#372">372</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="373" href="#373">373</a>         derivedKey[5] = 12;
-<a name="374" href="#374">374</a>         assertTrue(derivedKey.length == 20);
-<a name="375" href="#375">375</a>         
-<a name="376" href="#376">376</a>         String tokenIdentifier = builder.getId();
-<a name="377" href="#377">377</a>         
-<a name="378" href="#378">378</a>         <em class="jxr_comment">//</em>
-<a name="379" href="#379">379</a>         <em class="jxr_comment">// Derived key signature</em>
-<a name="380" href="#380">380</a>         <em class="jxr_comment">//</em>
-<a name="381" href="#381">381</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
-<a name="382" href="#382">382</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="383" href="#383">383</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-<a name="384" href="#384">384</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
-<a name="385" href="#385">385</a>         
-<a name="386" href="#386">386</a>         builder.prependToHeader(secHeader);
-<a name="387" href="#387">387</a>         
-<a name="388" href="#388">388</a>         String outputString = 
-<a name="389" href="#389">389</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="390" href="#390">390</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="391" href="#391">391</a>             LOG.debug(outputString);
-<a name="392" href="#392">392</a>         }
-<a name="393" href="#393">393</a> 
-<a name="394" href="#394">394</a>         <strong class="jxr_keyword">try</strong> {
-<a name="395" href="#395">395</a>             verify(signedDoc);
-<a name="396" href="#396">396</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived signature"</span>);
-<a name="397" href="#397">397</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="398" href="#398">398</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
-<a name="399" href="#399">399</a>             <em class="jxr_comment">// expected</em>
-<a name="400" href="#400">400</a>         }
-<a name="401" href="#401">401</a>     }
-<a name="402" href="#402">402</a>     
-<a name="403" href="#403">403</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="404" href="#404">404</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body. In this test the</em>
-<a name="405" href="#405">405</a> <em class="jxr_javadoccomment">     * user is "alice" rather than "bob", and so signature verification should fail.</em>
-<a name="406" href="#406">406</a> <em class="jxr_javadoccomment">     */</em>
-<a name="407" href="#407">407</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyBadUserSignature() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="408" href="#408">408</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="409" href="#409">409</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="410" href="#410">410</a>         secHeader.insertSecurityHeader(doc);
-<a name="411" href="#411">411</a>         
-<a name="412" href="#412">412</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="413" href="#413">413</a>         builder.setUserInfo(<span class="jxr_string">"alice"</span>, <span class="jxr_string">"security"</span>);
-<a name="414" href="#414">414</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
-<a name="415" href="#415">415</a>         builder.prepare(doc);
+<a name="239" href="#239">239</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="240" href="#240">240</a>         builder.setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="241" href="#241">241</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, Base64.encode(MessageDigest.getInstance(<span class="jxr_string">"SHA-1"</span>).digest(<span class="jxr_string">"security"</span>.getBytes(<span class="jxr_string">"UTF-8"</span>))));
+<a name="242" href="#242">242</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="243" href="#243">243</a>         builder.prepare(doc);
+<a name="244" href="#244">244</a>         
+<a name="245" href="#245">245</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="246" href="#246">246</a>         assertTrue(derivedKey.length == 20);
+<a name="247" href="#247">247</a>         
+<a name="248" href="#248">248</a>         String tokenIdentifier = builder.getId();
+<a name="249" href="#249">249</a>         
+<a name="250" href="#250">250</a>         <em class="jxr_comment">//</em>
+<a name="251" href="#251">251</a>         <em class="jxr_comment">// Derived key encryption</em>
+<a name="252" href="#252">252</a>         <em class="jxr_comment">//</em>
+<a name="253" href="#253">253</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
+<a name="254" href="#254">254</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
+<a name="255" href="#255">255</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="256" href="#256">256</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
+<a name="257" href="#257">257</a>         
+<a name="258" href="#258">258</a>         builder.prependToHeader(secHeader);
+<a name="259" href="#259">259</a>         
+<a name="260" href="#260">260</a>         String outputString = 
+<a name="261" href="#261">261</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+<a name="262" href="#262">262</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="263" href="#263">263</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="264" href="#264">264</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="265" href="#265">265</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="266" href="#266">266</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
+<a name="267" href="#267">267</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="268" href="#268">268</a>             LOG.debug(outputString);
+<a name="269" href="#269">269</a>         }
+<a name="270" href="#270">270</a>         
+<a name="271" href="#271">271</a>         <strong class="jxr_keyword">boolean</strong> passwordsAreEnabledOrig = WSSecurityEngine.getInstance().getWssConfig().getPasswordsAreEncoded();
+<a name="272" href="#272">272</a>         <strong class="jxr_keyword">try</strong> {
+<a name="273" href="#273">273</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="274" href="#274">274</a>             verify(encryptedDoc);
+<a name="275" href="#275">275</a>         } <strong class="jxr_keyword">finally</strong> {
+<a name="276" href="#276">276</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(passwordsAreEnabledOrig);
+<a name="277" href="#277">277</a>         }
+<a name="278" href="#278">278</a>     }
+<a name="279" href="#279">279</a>     
+<a name="280" href="#280">280</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="281" href="#281">281</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body. In this test the</em>
+<a name="282" href="#282">282</a> <em class="jxr_javadoccomment">     * derived key is modified before encryption, and so decryption should fail.</em>
+<a name="283" href="#283">283</a> <em class="jxr_javadoccomment">     */</em>
+<a name="284" href="#284">284</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyChangedEncryption() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="285" href="#285">285</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="286" href="#286">286</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="287" href="#287">287</a>         secHeader.insertSecurityHeader(doc);
+<a name="288" href="#288">288</a>         
+<a name="289" href="#289">289</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="290" href="#290">290</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
+<a name="291" href="#291">291</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="292" href="#292">292</a>         builder.prepare(doc);
+<a name="293" href="#293">293</a>         
+<a name="294" href="#294">294</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="295" href="#295">295</a>         derivedKey[5] = 12;
+<a name="296" href="#296">296</a>         assertTrue(derivedKey.length == 20);
+<a name="297" href="#297">297</a>         
+<a name="298" href="#298">298</a>         String tokenIdentifier = builder.getId();
+<a name="299" href="#299">299</a>         
+<a name="300" href="#300">300</a>         <em class="jxr_comment">//</em>
+<a name="301" href="#301">301</a>         <em class="jxr_comment">// Derived key encryption</em>
+<a name="302" href="#302">302</a>         <em class="jxr_comment">//</em>
+<a name="303" href="#303">303</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
+<a name="304" href="#304">304</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
+<a name="305" href="#305">305</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="306" href="#306">306</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
+<a name="307" href="#307">307</a>         
+<a name="308" href="#308">308</a>         builder.prependToHeader(secHeader);
+<a name="309" href="#309">309</a>         
+<a name="310" href="#310">310</a>         String outputString = 
+<a name="311" href="#311">311</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+<a name="312" href="#312">312</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="313" href="#313">313</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="314" href="#314">314</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="315" href="#315">315</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="316" href="#316">316</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
+<a name="317" href="#317">317</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="318" href="#318">318</a>             LOG.debug(outputString);
+<a name="319" href="#319">319</a>         }
+<a name="320" href="#320">320</a>         
+<a name="321" href="#321">321</a>         <strong class="jxr_keyword">try</strong> {
+<a name="322" href="#322">322</a>             verify(encryptedDoc);
+<a name="323" href="#323">323</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived encryption"</span>);
+<a name="324" href="#324">324</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="325" href="#325">325</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
+<a name="326" href="#326">326</a>             <em class="jxr_comment">// expected</em>
+<a name="327" href="#327">327</a>         }
+<a name="328" href="#328">328</a>     }
+<a name="329" href="#329">329</a>     
+<a name="330" href="#330">330</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="331" href="#331">331</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for encrypting a SOAP body. In this test the</em>
+<a name="332" href="#332">332</a> <em class="jxr_javadoccomment">     * user is "alice" rather than "bob", and so decryption should fail.</em>
+<a name="333" href="#333">333</a> <em class="jxr_javadoccomment">     */</em>
+<a name="334" href="#334">334</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyBadUserEncryption() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="335" href="#335">335</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="336" href="#336">336</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="337" href="#337">337</a>         secHeader.insertSecurityHeader(doc);
+<a name="338" href="#338">338</a>         
+<a name="339" href="#339">339</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="340" href="#340">340</a>         builder.setUserInfo(<span class="jxr_string">"alice"</span>, <span class="jxr_string">"security"</span>);
+<a name="341" href="#341">341</a>         builder.addDerivedKey(false, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="342" href="#342">342</a>         builder.prepare(doc);
+<a name="343" href="#343">343</a>         
+<a name="344" href="#344">344</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="345" href="#345">345</a>         assertTrue(derivedKey.length == 20);
+<a name="346" href="#346">346</a>         
+<a name="347" href="#347">347</a>         String tokenIdentifier = builder.getId();
+<a name="348" href="#348">348</a>         
+<a name="349" href="#349">349</a>         <em class="jxr_comment">//</em>
+<a name="350" href="#350">350</a>         <em class="jxr_comment">// Derived key encryption</em>
+<a name="351" href="#351">351</a>         <em class="jxr_comment">//</em>
+<a name="352" href="#352">352</a>         WSSecDKEncrypt encrBuilder = <strong class="jxr_keyword">new</strong> WSSecDKEncrypt();
+<a name="353" href="#353">353</a>         encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
+<a name="354" href="#354">354</a>         encrBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="355" href="#355">355</a>         Document encryptedDoc = encrBuilder.build(doc, secHeader);
+<a name="356" href="#356">356</a>         
+<a name="357" href="#357">357</a>         builder.prependToHeader(secHeader);
+<a name="358" href="#358">358</a>         
+<a name="359" href="#359">359</a>         String outputString = 
+<a name="360" href="#360">360</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
+<a name="361" href="#361">361</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="362" href="#362">362</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="363" href="#363">363</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="364" href="#364">364</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="365" href="#365">365</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"testMethod"</span>) == -1);
+<a name="366" href="#366">366</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="367" href="#367">367</a>             LOG.debug(outputString);
+<a name="368" href="#368">368</a>         }
+<a name="369" href="#369">369</a>         
+<a name="370" href="#370">370</a>         <strong class="jxr_keyword">try</strong> {
+<a name="371" href="#371">371</a>             verify(encryptedDoc);
+<a name="372" href="#372">372</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived encryption"</span>);
+<a name="373" href="#373">373</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="374" href="#374">374</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+<a name="375" href="#375">375</a>             <em class="jxr_comment">// expected</em>
+<a name="376" href="#376">376</a>         }
+<a name="377" href="#377">377</a>     }
+<a name="378" href="#378">378</a>     
+<a name="379" href="#379">379</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="380" href="#380">380</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body</em>
+<a name="381" href="#381">381</a> <em class="jxr_javadoccomment">     */</em>
+<a name="382" href="#382">382</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeySignature() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="383" href="#383">383</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="384" href="#384">384</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="385" href="#385">385</a>         secHeader.insertSecurityHeader(doc);
+<a name="386" href="#386">386</a>         
+<a name="387" href="#387">387</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="388" href="#388">388</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
+<a name="389" href="#389">389</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="390" href="#390">390</a>         builder.prepare(doc);
+<a name="391" href="#391">391</a>         
+<a name="392" href="#392">392</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="393" href="#393">393</a>         assertTrue(derivedKey.length == 20);
+<a name="394" href="#394">394</a>         
+<a name="395" href="#395">395</a>         String tokenIdentifier = builder.getId();
+<a name="396" href="#396">396</a>         
+<a name="397" href="#397">397</a>         <em class="jxr_comment">//</em>
+<a name="398" href="#398">398</a>         <em class="jxr_comment">// Derived key signature</em>
+<a name="399" href="#399">399</a>         <em class="jxr_comment">//</em>
+<a name="400" href="#400">400</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
+<a name="401" href="#401">401</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="402" href="#402">402</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+<a name="403" href="#403">403</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
+<a name="404" href="#404">404</a>         
+<a name="405" href="#405">405</a>         builder.prependToHeader(secHeader);
+<a name="406" href="#406">406</a>         
+<a name="407" href="#407">407</a>         String outputString = 
+<a name="408" href="#408">408</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="409" href="#409">409</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="410" href="#410">410</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="411" href="#411">411</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="412" href="#412">412</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="413" href="#413">413</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="414" href="#414">414</a>             LOG.debug(outputString);
+<a name="415" href="#415">415</a>         }
 <a name="416" href="#416">416</a>         
-<a name="417" href="#417">417</a>         byte[] derivedKey = builder.getDerivedKey();
-<a name="418" href="#418">418</a>         assertTrue(derivedKey.length == 20);
-<a name="419" href="#419">419</a>         
-<a name="420" href="#420">420</a>         String tokenIdentifier = builder.getId();
-<a name="421" href="#421">421</a>         
-<a name="422" href="#422">422</a>         <em class="jxr_comment">//</em>
-<a name="423" href="#423">423</a>         <em class="jxr_comment">// Derived key signature</em>
-<a name="424" href="#424">424</a>         <em class="jxr_comment">//</em>
-<a name="425" href="#425">425</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
-<a name="426" href="#426">426</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
-<a name="427" href="#427">427</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-<a name="428" href="#428">428</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
-<a name="429" href="#429">429</a>         
-<a name="430" href="#430">430</a>         builder.prependToHeader(secHeader);
-<a name="431" href="#431">431</a>         
-<a name="432" href="#432">432</a>         String outputString = 
-<a name="433" href="#433">433</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="434" href="#434">434</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="435" href="#435">435</a>             LOG.debug(outputString);
-<a name="436" href="#436">436</a>         }
-<a name="437" href="#437">437</a> 
-<a name="438" href="#438">438</a>         <strong class="jxr_keyword">try</strong> {
-<a name="439" href="#439">439</a>             verify(signedDoc);
-<a name="440" href="#440">440</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived signature"</span>);
-<a name="441" href="#441">441</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="442" href="#442">442</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="443" href="#443">443</a>             <em class="jxr_comment">// expected</em>
-<a name="444" href="#444">444</a>         }
-<a name="445" href="#445">445</a>     }
-<a name="446" href="#446">446</a>     
-<a name="447" href="#447">447</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="448" href="#448">448</a> <em class="jxr_javadoccomment">     * Verifies the soap envelope.</em>
-<a name="449" href="#449">449</a> <em class="jxr_javadoccomment">     * </em>
-<a name="450" href="#450">450</a> <em class="jxr_javadoccomment">     * @param env soap envelope</em>
-<a name="451" href="#451">451</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception Thrown when there is a problem in verification</em>
-<a name="452" href="#452">452</a> <em class="jxr_javadoccomment">     */</em>
-<a name="453" href="#453">453</a>     <strong class="jxr_keyword">private</strong> Vector verify(Document doc) <strong class="jxr_keyword">throws</strong> Exception {
-<a name="454" href="#454">454</a>         <strong class="jxr_keyword">return</strong> secEngine.processSecurityHeader(doc, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">this</strong>, crypto);
-<a name="455" href="#455">455</a>     }
-<a name="456" href="#456">456</a>     
-<a name="457" href="#457">457</a>     
-<a name="458" href="#458">458</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> handle(Callback[] callbacks)
-<a name="459" href="#459">459</a>         <strong class="jxr_keyword">throws</strong> IOException, UnsupportedCallbackException {
-<a name="460" href="#460">460</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; callbacks.length; i++) {
-<a name="461" href="#461">461</a>             <strong class="jxr_keyword">if</strong> (callbacks[i] instanceof WSPasswordCallback) {
-<a name="462" href="#462">462</a>                 WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
-<a name="463" href="#463">463</a>                 <strong class="jxr_keyword">if</strong> (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN
-<a name="464" href="#464">464</a>                     &amp;&amp; <span class="jxr_string">"bob"</span>.equals(pc.getIdentifier())) {
-<a name="465" href="#465">465</a>                     pc.setPassword(<span class="jxr_string">"security"</span>);
-<a name="466" href="#466">466</a>                 } <strong class="jxr_keyword">else</strong> {
-<a name="467" href="#467">467</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> IOException(<span class="jxr_string">"Authentication failed"</span>);
-<a name="468" href="#468">468</a>                 }
-<a name="469" href="#469">469</a>             } <strong class="jxr_keyword">else</strong> {
-<a name="470" href="#470">470</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> UnsupportedCallbackException(callbacks[i], <span class="jxr_string">"Unrecognized Callback"</span>);
-<a name="471" href="#471">471</a>             }
-<a name="472" href="#472">472</a>         }
-<a name="473" href="#473">473</a>     }
-<a name="474" href="#474">474</a> 
-<a name="475" href="#475">475</a> }
+<a name="417" href="#417">417</a>         Vector results = verify(signedDoc);
+<a name="418" href="#418">418</a>         WSSecurityEngineResult actionResult =
+<a name="419" href="#419">419</a>             WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+<a name="420" href="#420">420</a>         java.security.Principal principal = 
+<a name="421" href="#421">421</a>             (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+<a name="422" href="#422">422</a>         <em class="jxr_comment">//System.out.println(principal.getName());</em>
+<a name="423" href="#423">423</a>         assertTrue(principal.getName().indexOf(<span class="jxr_string">"derivedKey"</span>) != -1);
+<a name="424" href="#424">424</a>     }
+<a name="425" href="#425">425</a>     
+<a name="426" href="#426">426</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="427" href="#427">427</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body</em>
+<a name="428" href="#428">428</a> <em class="jxr_javadoccomment">     */</em>
+<a name="429" href="#429">429</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeySignatureWithEncodedPassword() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="430" href="#430">430</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="431" href="#431">431</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="432" href="#432">432</a>         secHeader.insertSecurityHeader(doc);
+<a name="433" href="#433">433</a>         
+<a name="434" href="#434">434</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="435" href="#435">435</a>         builder.setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="436" href="#436">436</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, Base64.encode(MessageDigest.getInstance(<span class="jxr_string">"SHA-1"</span>).digest(<span class="jxr_string">"security"</span>.getBytes(<span class="jxr_string">"UTF-8"</span>))));
+<a name="437" href="#437">437</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="438" href="#438">438</a>         builder.prepare(doc);
+<a name="439" href="#439">439</a>         
+<a name="440" href="#440">440</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="441" href="#441">441</a>         assertTrue(derivedKey.length == 20);
+<a name="442" href="#442">442</a>         
+<a name="443" href="#443">443</a>         String tokenIdentifier = builder.getId();
+<a name="444" href="#444">444</a>         
+<a name="445" href="#445">445</a>         <em class="jxr_comment">//</em>
+<a name="446" href="#446">446</a>         <em class="jxr_comment">// Derived key signature</em>
+<a name="447" href="#447">447</a>         <em class="jxr_comment">//</em>
+<a name="448" href="#448">448</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
+<a name="449" href="#449">449</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="450" href="#450">450</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+<a name="451" href="#451">451</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
+<a name="452" href="#452">452</a>         
+<a name="453" href="#453">453</a>         builder.prependToHeader(secHeader);
+<a name="454" href="#454">454</a>         
+<a name="455" href="#455">455</a>         String outputString = 
+<a name="456" href="#456">456</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="457" href="#457">457</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Username"</span>) != -1);
+<a name="458" href="#458">458</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse:Password"</span>) == -1);
+<a name="459" href="#459">459</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Salt"</span>) != -1);
+<a name="460" href="#460">460</a>         assertTrue(outputString.indexOf(<span class="jxr_string">"wsse11:Iteration"</span>) != -1);
+<a name="461" href="#461">461</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="462" href="#462">462</a>             LOG.debug(outputString);
+<a name="463" href="#463">463</a>         }
+<a name="464" href="#464">464</a>         
+<a name="465" href="#465">465</a>         <strong class="jxr_keyword">boolean</strong> passwordsAreEnabledOrig = WSSecurityEngine.getInstance().getWssConfig().getPasswordsAreEncoded();
+<a name="466" href="#466">466</a>         <strong class="jxr_keyword">try</strong> {
+<a name="467" href="#467">467</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="468" href="#468">468</a>             Vector results = verify(signedDoc);
+<a name="469" href="#469">469</a>             WSSecurityEngineResult actionResult =
+<a name="470" href="#470">470</a>                 WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
+<a name="471" href="#471">471</a>             java.security.Principal principal = 
+<a name="472" href="#472">472</a>                 (java.security.Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+<a name="473" href="#473">473</a>             <em class="jxr_comment">//System.out.println(principal.getName());</em>
+<a name="474" href="#474">474</a>             assertTrue(principal.getName().indexOf(<span class="jxr_string">"derivedKey"</span>) != -1);
+<a name="475" href="#475">475</a>         } <strong class="jxr_keyword">finally</strong> {
+<a name="476" href="#476">476</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(passwordsAreEnabledOrig);
+<a name="477" href="#477">477</a>         }
+<a name="478" href="#478">478</a>     }
+<a name="479" href="#479">479</a>     
+<a name="480" href="#480">480</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="481" href="#481">481</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body. In this test the</em>
+<a name="482" href="#482">482</a> <em class="jxr_javadoccomment">     * derived key is modified before signature, and so signature verification should</em>
+<a name="483" href="#483">483</a> <em class="jxr_javadoccomment">     * fail.</em>
+<a name="484" href="#484">484</a> <em class="jxr_javadoccomment">     */</em>
+<a name="485" href="#485">485</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyChangedSignature() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="486" href="#486">486</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="487" href="#487">487</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="488" href="#488">488</a>         secHeader.insertSecurityHeader(doc);
+<a name="489" href="#489">489</a>         
+<a name="490" href="#490">490</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="491" href="#491">491</a>         builder.setUserInfo(<span class="jxr_string">"bob"</span>, <span class="jxr_string">"security"</span>);
+<a name="492" href="#492">492</a>         builder.addDerivedKey(<strong class="jxr_keyword">true</strong>, <strong class="jxr_keyword">null</strong>, 1000);
+<a name="493" href="#493">493</a>         builder.prepare(doc);
+<a name="494" href="#494">494</a>         
+<a name="495" href="#495">495</a>         byte[] derivedKey = builder.getDerivedKey();
+<a name="496" href="#496">496</a>         derivedKey[5] = 12;
+<a name="497" href="#497">497</a>         assertTrue(derivedKey.length == 20);
+<a name="498" href="#498">498</a>         
+<a name="499" href="#499">499</a>         String tokenIdentifier = builder.getId();
+<a name="500" href="#500">500</a>         
+<a name="501" href="#501">501</a>         <em class="jxr_comment">//</em>
+<a name="502" href="#502">502</a>         <em class="jxr_comment">// Derived key signature</em>
+<a name="503" href="#503">503</a>         <em class="jxr_comment">//</em>
+<a name="504" href="#504">504</a>         WSSecDKSign sigBuilder = <strong class="jxr_keyword">new</strong> WSSecDKSign();
+<a name="505" href="#505">505</a>         sigBuilder.setExternalKey(derivedKey, tokenIdentifier);
+<a name="506" href="#506">506</a>         sigBuilder.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+<a name="507" href="#507">507</a>         Document signedDoc = sigBuilder.build(doc, secHeader);
+<a name="508" href="#508">508</a>         
+<a name="509" href="#509">509</a>         builder.prependToHeader(secHeader);
+<a name="510" href="#510">510</a>         
+<a name="511" href="#511">511</a>         String outputString = 
+<a name="512" href="#512">512</a>             org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="513" href="#513">513</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="514" href="#514">514</a>             LOG.debug(outputString);
+<a name="515" href="#515">515</a>         }
+<a name="516" href="#516">516</a> 
+<a name="517" href="#517">517</a>         <strong class="jxr_keyword">try</strong> {
+<a name="518" href="#518">518</a>             verify(signedDoc);
+<a name="519" href="#519">519</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad derived signature"</span>);
+<a name="520" href="#520">520</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="521" href="#521">521</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
+<a name="522" href="#522">522</a>             <em class="jxr_comment">// expected</em>
+<a name="523" href="#523">523</a>         }
+<a name="524" href="#524">524</a>     }
+<a name="525" href="#525">525</a>     
+<a name="526" href="#526">526</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="527" href="#527">527</a> <em class="jxr_javadoccomment">     * Test using a UsernameToken derived key for signing a SOAP body. In this test the</em>
+<a name="528" href="#528">528</a> <em class="jxr_javadoccomment">     * user is "alice" rather than "bob", and so signature verification should fail.</em>
+<a name="529" href="#529">529</a> <em class="jxr_javadoccomment">     */</em>
+<a name="530" href="#530">530</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testDerivedKeyBadUserSignature() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="531" href="#531">531</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="532" href="#532">532</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="533" href="#533">533</a>         secHeader.insertSecurityHeader(doc);
+<a name="534" href="#534">534</a>         

[... 73 lines stripped ...]


Mime
View raw message