Modified: 
webservices/website/wss4j/xref/org/apache/wss4j/common/crypto/MerlinDevice.html
URL: 
http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/wss4j/common/crypto/MerlinDevice.html?rev=1799161&r1=1799160&r2=1799161&view=diff
==============================================================================
--- 
webservices/website/wss4j/xref/org/apache/wss4j/common/crypto/MerlinDevice.html 
(original)
+++ 
webservices/website/wss4j/xref/org/apache/wss4j/common/crypto/MerlinDevice.html 
Mon Jun 19 09:02:30 2017
@@ -27,184 +27,185 @@
 <a class="jxr_linenumber" name="L19" href="#L19">19</a>  
 <a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong 
class="jxr_keyword">package</strong> org.apache.wss4j.common.crypto;
 <a class="jxr_linenumber" name="L21" href="#L21">21</a>  
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong 
class="jxr_keyword">import</strong> java.io.FileInputStream;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong 
class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong 
class="jxr_keyword">import</strong> java.io.InputStream;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong 
class="jxr_keyword">import</strong> java.security.KeyStore;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.CertStore;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.CertificateFactory;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong 
class="jxr_keyword">import</strong> 
java.security.cert.CollectionCertStoreParameters;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.X509CRL;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong 
class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong 
class="jxr_keyword">import</strong> java.util.Properties;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong 
class="jxr_keyword">import</strong> 
org.apache.wss4j.common.ext.WSSecurityException;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <em 
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em 
class="jxr_javadoccomment"> * A Crypto implementation based on two Java 
KeyStore objects, one being the keystore, and one</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em 
class="jxr_javadoccomment"> * being the truststore. This Crypto implementation 
extends the default Merlin implementation by</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em 
class="jxr_javadoccomment"> * allowing loading of keystores using a null 
InputStream - for example on a smart-card device.</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em 
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> 
<a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>
 <strong class="jxr_keyword">extends</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/Merlin.html">Merlin</a> {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>      <strong 
class="jxr_keyword">private</strong> <strong 
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> 
org.slf4j.Logger LOG =
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>          
org.slf4j.LoggerFactory.getLogger(MerlinDevice.<strong 
class="jxr_keyword">class</strong>);
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>      <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>()
 {
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>          <strong 
class="jxr_keyword">super</strong>();
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>      }
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>      <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>(Properties
 properties, ClassLoader loader, <a 
href="../../../../../org/apache/wss4j/common/crypto/PasswordEncryptor.html">PasswordEncryptor</a>
 passwordEncryptor)
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>          <strong 
class="jxr_keyword">throws</strong> WSSecurityException, IOException {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>          <strong 
class="jxr_keyword">super</strong>(properties, loader, passwordEncryptor);
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>      }
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>      @Override
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>      <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> 
loadProperties(Properties properties, ClassLoader loader, <a 
href="../../../../../org/apache/wss4j/common/crypto/PasswordEncryptor.html">PasswordEncryptor</a>
 passwordEncryptor)
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>          <strong 
class="jxr_keyword">throws</strong> WSSecurityException, IOException {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>          <strong 
class="jxr_keyword">if</strong> (properties == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>              <strong 
class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>          }
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>          <strong 
class="jxr_keyword">this</strong>.properties = properties;
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          <strong 
class="jxr_keyword">this</strong>.passwordEncryptor = passwordEncryptor;
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>  
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          String prefix 
= PREFIX;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>          <strong 
class="jxr_keyword">for</strong> (Object key : properties.keySet()) {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>              <strong 
class="jxr_keyword">if</strong> (key instanceof String) {
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>                  
String propKey = (String)key;
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>                  
<strong class="jxr_keyword">if</strong> (propKey.startsWith(PREFIX)) {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>                      
<strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>                  } 
<strong class="jxr_keyword">else</strong> <strong 
class="jxr_keyword">if</strong> (propKey.startsWith(OLD_PREFIX)) {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>                      
prefix = OLD_PREFIX;
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>                      
<strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>                  }
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>              }
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>          }
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>  
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>          <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>          <em 
class="jxr_comment">// Load the provider(s)</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>          <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>          String 
provider = properties.getProperty(prefix + CRYPTO_KEYSTORE_PROVIDER);
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>          <strong 
class="jxr_keyword">if</strong> (provider != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>              provider 
= provider.trim();
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>          }
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>          String 
certProvider = properties.getProperty(prefix + CRYPTO_CERT_PROVIDER);
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>          <strong 
class="jxr_keyword">if</strong> (certProvider != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>              
setCryptoProvider(certProvider);
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>          }
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>          <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>          <em 
class="jxr_comment">// Load the KeyStore</em>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>          <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          String alias 
= properties.getProperty(prefix + KEYSTORE_ALIAS);
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>          <strong 
class="jxr_keyword">if</strong> (alias != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>              alias = 
alias.trim();
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>              
setDefaultX509Identifier(alias);
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>          }
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>          String 
keyStoreLocation = properties.getProperty(prefix + KEYSTORE_FILE);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>          <strong 
class="jxr_keyword">if</strong> (keyStoreLocation == <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>              
keyStoreLocation = properties.getProperty(prefix + OLD_KEYSTORE_FILE);
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>          }
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>          String 
keyStorePassword = properties.getProperty(prefix + KEYSTORE_PASSWORD, <span 
class="jxr_string">"security"</span>);
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <strong 
class="jxr_keyword">if</strong> (keyStorePassword != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>             
keyStorePassword = keyStorePassword.trim();
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>             
keyStorePassword = decryptPassword(keyStorePassword, passwordEncryptor);
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         }
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>         String 
keyStoreType = properties.getProperty(prefix + KEYSTORE_TYPE, 
KeyStore.getDefaultType());
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <strong 
class="jxr_keyword">if</strong> (keyStoreType != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>             
keyStoreType = keyStoreType.trim();
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>         }
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>         <strong 
class="jxr_keyword">if</strong> (keyStoreLocation != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>             
keyStoreLocation = keyStoreLocation.trim();
-<a class="jxr_linenumber" name="L110" href="#L110">110</a> 
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
keyStoreLocation)) {
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>                 
keystore = load(is, keyStorePassword, provider, keyStoreType);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>                 
LOG.debug(
-<a class="jxr_linenumber" name="L114" href="#L114">114</a>                     
<span class="jxr_string">"The KeyStore {} of type {} has been loaded"</span>, 
keyStoreLocation, keyStoreType
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>                 );
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>             }
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>         } <strong 
class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>             
keystore = load(<strong class="jxr_keyword">null</strong>, keyStorePassword, 
provider, keyStoreType);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>         }
-<a class="jxr_linenumber" name="L120" href="#L120">120</a> 
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>         <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <em 
class="jxr_comment">// Load the TrustStore</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         String 
trustStorePassword = properties.getProperty(prefix + TRUSTSTORE_PASSWORD, <span 
class="jxr_string">"changeit"</span>);
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>         <strong 
class="jxr_keyword">if</strong> (trustStorePassword != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>             
trustStorePassword = trustStorePassword.trim();
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>             
trustStorePassword = decryptPassword(trustStorePassword, passwordEncryptor);
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>         }
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>         String 
trustStoreType = properties.getProperty(prefix + TRUSTSTORE_TYPE, 
KeyStore.getDefaultType());
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>         <strong 
class="jxr_keyword">if</strong> (trustStoreType != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>             
trustStoreType = trustStoreType.trim();
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>         }
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>         String 
loadCacerts = properties.getProperty(prefix + LOAD_CA_CERTS, <span 
class="jxr_string">"false"</span>);
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <strong 
class="jxr_keyword">if</strong> (loadCacerts != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>             
loadCacerts = loadCacerts.trim();
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>         }
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>         String 
trustStoreLocation = properties.getProperty(prefix + TRUSTSTORE_FILE);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>         <strong 
class="jxr_keyword">if</strong> (trustStoreLocation != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>             
trustStoreLocation = trustStoreLocation.trim();
-<a class="jxr_linenumber" name="L140" href="#L140">140</a> 
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
trustStoreLocation)) {
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>                 
truststore = load(is, trustStorePassword, provider, trustStoreType);
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>                 
LOG.debug(
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>                     
<span class="jxr_string">"The TrustStore {} of type {} has been loaded"</span>, 
trustStoreLocation, trustStoreType
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>                 );
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>                 
loadCACerts = false;
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>             }
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>         } <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> 
(Boolean.valueOf(loadCacerts)) {
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>             String 
cacertsPath = System.getProperty(<span class="jxr_string">"java.home"</span>) + 
<span class="jxr_string">"/lib/security/cacerts"</span>;
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>             <strong 
class="jxr_keyword">if</strong> (cacertsPath != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>                 
cacertsPath = cacertsPath.trim();
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>             }
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = <strong 
class="jxr_keyword">new</strong> FileInputStream(cacertsPath)) {
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>                 
String cacertsPasswd = properties.getProperty(prefix + TRUSTSTORE_PASSWORD, 
<span class="jxr_string">"changeit"</span>);
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>                 
<strong class="jxr_keyword">if</strong> (cacertsPasswd != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>                     
cacertsPasswd = cacertsPasswd.trim();
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>                     
cacertsPasswd = decryptPassword(cacertsPasswd, passwordEncryptor);
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>                 }
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>                 
truststore = load(is, cacertsPasswd, <strong class="jxr_keyword">null</strong>, 
KeyStore.getDefaultType());
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>                 
LOG.debug(<span class="jxr_string">"CA certs have been loaded"</span>);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>                 
loadCACerts = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>             }
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>         } <strong 
class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>             
truststore = load(<strong class="jxr_keyword">null</strong>, 
trustStorePassword, provider, trustStoreType);
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>         }
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>         <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>         <em 
class="jxr_comment">// Load the CRL file</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <em 
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>         String 
crlLocation = properties.getProperty(prefix + X509_CRL_FILE);
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>         <strong 
class="jxr_keyword">if</strong> (crlLocation != <strong 
class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>             
crlLocation = crlLocation.trim();
-<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
crlLocation)) {
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>                 
CertificateFactory cf = getCertificateFactory();
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>                 
X509CRL crl = (X509CRL)cf.generateCRL(is);
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>                 
<strong class="jxr_keyword">if</strong> (provider == <strong 
class="jxr_keyword">null</strong> || provider.length() == 0) {
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>                     
crlCertStore =
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>                     
    CertStore.getInstance(
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>                     
        <span class="jxr_string">"Collection"</span>,
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>                     
        <strong class="jxr_keyword">new</strong> 
CollectionCertStoreParameters(Collections.singletonList(crl))
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>                     
    );
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>                 } 
<strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>                     
crlCertStore =
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>                     
    CertStore.getInstance(
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>                     
        <span class="jxr_string">"Collection"</span>,
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>                     
        <strong class="jxr_keyword">new</strong> 
CollectionCertStoreParameters(Collections.singletonList(crl)),
-<a class="jxr_linenumber" name="L188" href="#L188">188</a>                     
        provider
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>                     
    );
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>                 }
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>                 
LOG.debug(<span class="jxr_string">"The CRL {} has been loaded"</span>, 
crlLocation);
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>             } 
<strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>                 
LOG.debug(e.getMessage(), e);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/wss4j/common/ext/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.ErrorCode.FAILURE,
 e, <span class="jxr_string">"failedCredentialLoad"</span>);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>             }
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>         }
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>     }
-<a class="jxr_linenumber" name="L198" href="#L198">198</a> 
-<a class="jxr_linenumber" name="L199" href="#L199">199</a> }
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong 
class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong 
class="jxr_keyword">import</strong> java.io.InputStream;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong 
class="jxr_keyword">import</strong> java.nio.file.Files;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong 
class="jxr_keyword">import</strong> java.nio.file.Paths;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong 
class="jxr_keyword">import</strong> java.security.KeyStore;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.CertStore;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.CertificateFactory;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong 
class="jxr_keyword">import</strong> 
java.security.cert.CollectionCertStoreParameters;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong 
class="jxr_keyword">import</strong> java.security.cert.X509CRL;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong 
class="jxr_keyword">import</strong> java.util.Collections;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong 
class="jxr_keyword">import</strong> java.util.Properties;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong 
class="jxr_keyword">import</strong> 
org.apache.wss4j.common.ext.WSSecurityException;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em 
class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em 
class="jxr_javadoccomment"> * A Crypto implementation based on two Java 
KeyStore objects, one being the keystore, and one</em>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em 
class="jxr_javadoccomment"> * being the truststore. This Crypto implementation 
extends the default Merlin implementation by</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em 
class="jxr_javadoccomment"> * allowing loading of keystores using a null 
InputStream - for example on a smart-card device.</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em 
class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> 
<a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>
 <strong class="jxr_keyword">extends</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/Merlin.html">Merlin</a> {
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>      <strong 
class="jxr_keyword">private</strong> <strong 
class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> 
org.slf4j.Logger LOG =
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>          
org.slf4j.LoggerFactory.getLogger(MerlinDevice.<strong 
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>      <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>()
 {
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>          <strong 
class="jxr_keyword">super</strong>();
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>      }
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>      <strong 
class="jxr_keyword">public</strong> <a 
href="../../../../../org/apache/wss4j/common/crypto/MerlinDevice.html">MerlinDevice</a>(Properties
 properties, ClassLoader loader, <a 
href="../../../../../org/apache/wss4j/common/crypto/PasswordEncryptor.html">PasswordEncryptor</a>
 passwordEncryptor)
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>          <strong 
class="jxr_keyword">throws</strong> WSSecurityException, IOException {
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>          <strong 
class="jxr_keyword">super</strong>(properties, loader, passwordEncryptor);
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>      }
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>  
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>      @Override
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>      <strong 
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> 
loadProperties(Properties properties, ClassLoader loader, <a 
href="../../../../../org/apache/wss4j/common/crypto/PasswordEncryptor.html">PasswordEncryptor</a>
 passwordEncryptor)
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>          <strong 
class="jxr_keyword">throws</strong> WSSecurityException, IOException {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>          <strong 
class="jxr_keyword">if</strong> (properties == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>              <strong 
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>          }
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>          <strong 
class="jxr_keyword">this</strong>.properties = properties;
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>          <strong 
class="jxr_keyword">this</strong>.passwordEncryptor = passwordEncryptor;
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>  
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          String prefix 
= PREFIX;
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>          <strong 
class="jxr_keyword">for</strong> (Object key : properties.keySet()) {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>              <strong 
class="jxr_keyword">if</strong> (key instanceof String) {
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>                  
String propKey = (String)key;
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>                  
<strong class="jxr_keyword">if</strong> (propKey.startsWith(PREFIX)) {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>                      
<strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>                  } 
<strong class="jxr_keyword">else</strong> <strong 
class="jxr_keyword">if</strong> (propKey.startsWith(OLD_PREFIX)) {
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>                      
prefix = OLD_PREFIX;
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>                      
<strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>                  }
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>              }
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>          }
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>          <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>          <em 
class="jxr_comment">// Load the provider(s)</em>
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>          <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>          String 
provider = properties.getProperty(prefix + CRYPTO_KEYSTORE_PROVIDER);
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>          <strong 
class="jxr_keyword">if</strong> (provider != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>              provider 
= provider.trim();
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>          }
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>          String 
certProvider = properties.getProperty(prefix + CRYPTO_CERT_PROVIDER);
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>          <strong 
class="jxr_keyword">if</strong> (certProvider != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>              
setCryptoProvider(certProvider);
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          }
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>          <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          <em 
class="jxr_comment">// Load the KeyStore</em>
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>          <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>          String alias 
= properties.getProperty(prefix + KEYSTORE_ALIAS);
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>          <strong 
class="jxr_keyword">if</strong> (alias != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>              alias = 
alias.trim();
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>              
setDefaultX509Identifier(alias);
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>          }
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>          String 
keyStoreLocation = properties.getProperty(prefix + KEYSTORE_FILE);
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>          <strong 
class="jxr_keyword">if</strong> (keyStoreLocation == <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>              
keyStoreLocation = properties.getProperty(prefix + OLD_KEYSTORE_FILE);
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>          }
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>         String 
keyStorePassword = properties.getProperty(prefix + KEYSTORE_PASSWORD, <span 
class="jxr_string">"security"</span>);
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>         <strong 
class="jxr_keyword">if</strong> (keyStorePassword != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>             
keyStorePassword = keyStorePassword.trim();
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>             
keyStorePassword = decryptPassword(keyStorePassword, passwordEncryptor);
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>         }
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         String 
keyStoreType = properties.getProperty(prefix + KEYSTORE_TYPE, 
KeyStore.getDefaultType());
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <strong 
class="jxr_keyword">if</strong> (keyStoreType != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>             
keyStoreType = keyStoreType.trim();
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         }
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>         <strong 
class="jxr_keyword">if</strong> (keyStoreLocation != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>             
keyStoreLocation = keyStoreLocation.trim();
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> 
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
keyStoreLocation)) {
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>                 
keystore = load(is, keyStorePassword, provider, keyStoreType);
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>                 
LOG.debug(
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>                     
<span class="jxr_string">"The KeyStore {} of type {} has been loaded"</span>, 
keyStoreLocation, keyStoreType
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>                 );
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>             }
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>         } <strong 
class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>             
keystore = load(<strong class="jxr_keyword">null</strong>, keyStorePassword, 
provider, keyStoreType);
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>         }
+<a class="jxr_linenumber" name="L121" href="#L121">121</a> 
+<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <em 
class="jxr_comment">// Load the TrustStore</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>         <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>         String 
trustStorePassword = properties.getProperty(prefix + TRUSTSTORE_PASSWORD, <span 
class="jxr_string">"changeit"</span>);
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <strong 
class="jxr_keyword">if</strong> (trustStorePassword != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>             
trustStorePassword = trustStorePassword.trim();
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>             
trustStorePassword = decryptPassword(trustStorePassword, passwordEncryptor);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         }
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>         String 
trustStoreType = properties.getProperty(prefix + TRUSTSTORE_TYPE, 
KeyStore.getDefaultType());
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>         <strong 
class="jxr_keyword">if</strong> (trustStoreType != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>             
trustStoreType = trustStoreType.trim();
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>         }
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         String 
loadCacerts = properties.getProperty(prefix + LOAD_CA_CERTS, <span 
class="jxr_string">"false"</span>);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong 
class="jxr_keyword">if</strong> (loadCacerts != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>             
loadCacerts = loadCacerts.trim();
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>         }
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         String 
trustStoreLocation = properties.getProperty(prefix + TRUSTSTORE_FILE);
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>         <strong 
class="jxr_keyword">if</strong> (trustStoreLocation != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>             
trustStoreLocation = trustStoreLocation.trim();
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> 
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
trustStoreLocation)) {
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>                 
truststore = load(is, trustStorePassword, provider, trustStoreType);
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>                 
LOG.debug(
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>                     
<span class="jxr_string">"The TrustStore {} of type {} has been loaded"</span>, 
trustStoreLocation, trustStoreType
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>                 );
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>                 
loadCACerts = false;
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>             }
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>         } <strong 
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> 
(Boolean.valueOf(loadCacerts)) {
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>             String 
cacertsPath = System.getProperty(<span class="jxr_string">"java.home"</span>) + 
<span class="jxr_string">"/lib/security/cacerts"</span>;
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>             <strong 
class="jxr_keyword">if</strong> (cacertsPath != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>                 
cacertsPath = cacertsPath.trim();
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>             }
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = 
Files.newInputStream(Paths.get(cacertsPath))) {
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>                 
String cacertsPasswd = properties.getProperty(prefix + TRUSTSTORE_PASSWORD, 
<span class="jxr_string">"changeit"</span>);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>                 
<strong class="jxr_keyword">if</strong> (cacertsPasswd != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>                     
cacertsPasswd = cacertsPasswd.trim();
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>                     
cacertsPasswd = decryptPassword(cacertsPasswd, passwordEncryptor);
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>                 }
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>                 
truststore = load(is, cacertsPasswd, <strong class="jxr_keyword">null</strong>, 
KeyStore.getDefaultType());
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>                 
LOG.debug(<span class="jxr_string">"CA certs have been loaded"</span>);
+<a class="jxr_linenumber" name="L162" href="#L162">162</a>                 
loadCACerts = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>             }
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>         } <strong 
class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>             
truststore = load(<strong class="jxr_keyword">null</strong>, 
trustStorePassword, provider, trustStoreType);
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>         }
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>         <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <em 
class="jxr_comment">// Load the CRL file</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>         <em 
class="jxr_comment">//</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>         String 
crlLocation = properties.getProperty(prefix + X509_CRL_FILE);
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>         <strong 
class="jxr_keyword">if</strong> (crlLocation != <strong 
class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>             
crlLocation = crlLocation.trim();
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> 
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>             <strong 
class="jxr_keyword">try</strong> (InputStream is = loadInputStream(loader, 
crlLocation)) {
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>                 
CertificateFactory cf = getCertificateFactory();
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>                 
X509CRL crl = (X509CRL)cf.generateCRL(is);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>                 
<strong class="jxr_keyword">if</strong> (provider == <strong 
class="jxr_keyword">null</strong> || provider.length() == 0) {
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>                     
crlCertStore =
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>                     
    CertStore.getInstance(
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>                     
        <span class="jxr_string">"Collection"</span>,
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>                     
        <strong class="jxr_keyword">new</strong> 
CollectionCertStoreParameters(Collections.singletonList(crl))
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>                     
    );
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>                 } 
<strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>                     
crlCertStore =
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>                     
    CertStore.getInstance(
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>                     
        <span class="jxr_string">"Collection"</span>,
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>                     
        <strong class="jxr_keyword">new</strong> 
CollectionCertStoreParameters(Collections.singletonList(crl)),
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>                     
        provider
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>                     
    );
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>                 }
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>                 
LOG.debug(<span class="jxr_string">"The CRL {} has been loaded"</span>, 
crlLocation);
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>             } 
<strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L194" href="#L194">194</a>                 
LOG.debug(e.getMessage(), e);
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>                 
<strong class="jxr_keyword">throw</strong> <strong 
class="jxr_keyword">new</strong> <a 
href="../../../../../org/apache/wss4j/common/ext/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.ErrorCode.FAILURE,
 e, <span class="jxr_string">"failedCredentialLoad"</span>);
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>             }
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         }
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>     }
+<a class="jxr_linenumber" name="L199" href="#L199">199</a> 
+<a class="jxr_linenumber" name="L200" href="#L200">200</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2004&#x2013;2017 <a 
href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights 
reserved.</div>

Modified: 
webservices/website/wss4j/xref/org/apache/wss4j/dom/message/Encryptor.html
URL: 
http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/wss4j/dom/message/Encryptor.html?rev=1799161&r1=1799160&r2=1799161&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/wss4j/dom/message/Encryptor.html 
(original)
+++ webservices/website/wss4j/xref/org/apache/wss4j/dom/message/Encryptor.html 
Mon Jun 19 09:02:30 2017
@@ -274,7 +274,7 @@
 <a class="jxr_linenumber" name="L266" href="#L266">266</a>         
encryptionMethod.setAttributeNS(<strong class="jxr_keyword">null</strong>, 
<span class="jxr_string">"Algorithm"</span>, encryptionAlgorithm);
 <a class="jxr_linenumber" name="L267" href="#L267">267</a> 
 <a class="jxr_linenumber" name="L268" href="#L268">268</a>         
encryptedData.appendChild(encryptionMethod);
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>         
encryptedData.appendChild(keyInfo.getElement().cloneNode(<strong 
class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>         
encryptedData.appendChild(WSSecurityUtil.cloneElement(doc, 
keyInfo.getElement()));
 <a class="jxr_linenumber" name="L270" href="#L270">270</a> 
 <a class="jxr_linenumber" name="L271" href="#L271">271</a>         Element 
cipherData =
 <a class="jxr_linenumber" name="L272" href="#L272">272</a>             
doc.createElementNS(WSConstants.ENC_NS, WSConstants.ENC_PREFIX + <span 
class="jxr_string">":CipherData"</span>);
@@ -383,7 +383,7 @@
 <a class="jxr_linenumber" name="L375" href="#L375">375</a>             
encryptionMethod.setAttributeNS(<strong class="jxr_keyword">null</strong>, 
<span class="jxr_string">"Algorithm"</span>, encryptionAlgorithm);
 <a class="jxr_linenumber" name="L376" href="#L376">376</a> 
 <a class="jxr_linenumber" name="L377" href="#L377">377</a>             
encryptedData.appendChild(encryptionMethod);
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>             
encryptedData.appendChild(keyInfo.getElement().cloneNode(<strong 
class="jxr_keyword">true</strong>));
+<a class="jxr_linenumber" name="L378" href="#L378">378</a>             
encryptedData.appendChild(WSSecurityUtil.cloneElement(doc, 
keyInfo.getElement()));
 <a class="jxr_linenumber" name="L379" href="#L379">379</a> 
 <a class="jxr_linenumber" name="L380" href="#L380">380</a>             Element 
cipherData =
 <a class="jxr_linenumber" name="L381" href="#L381">381</a>                 
doc.createElementNS(WSConstants.ENC_NS, WSConstants.ENC_PREFIX + <span 
class="jxr_string">":CipherData"</span>);


Reply via email to