You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/06/07 18:25:52 UTC
svn commit: r1133081 [25/50] - in /webservices/wss4j/site: ./ apidocs/
apidocs/org/apache/ws/security/ apidocs/org/apache/ws/security/action/
apidocs/org/apache/ws/security/action/class-use/
apidocs/org/apache/ws/security/class-use/ apidocs/org/apache/...
Modified: webservices/wss4j/site/xref/org/apache/ws/security/WSSecurityEngineResult.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/WSSecurityEngineResult.html?rev=1133081&r1=1133080&r2=1133081&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/WSSecurityEngineResult.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/WSSecurityEngineResult.html Tue Jun 7 16:25:20 2011
@@ -184,7 +184,7 @@
<a name="174" href="#174">174</a> <em class="jxr_javadoccomment"> * The value under this tag is of type java.security.Principal.</em>
<a name="175" href="#175">175</a> <em class="jxr_javadoccomment"> */</em>
<a name="176" href="#176">176</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String TAG_PRINCIPAL = <span class="jxr_string">"principal"</span>;
-<a name="177" href="#177">177</a>
+<a name="177" href="#177">177</a>
<a name="178" href="#178">178</a> <em class="jxr_javadoccomment">/**</em>
<a name="179" href="#179">179</a> <em class="jxr_javadoccomment"> * Tag denoting references to a List of Data ref URIs.</em>
<a name="180" href="#180">180</a> <em class="jxr_javadoccomment"> *</em>
@@ -310,25 +310,29 @@
<a name="300" href="#300">300</a> put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
<a name="301" href="#301">301</a> }
<a name="302" href="#302">302</a>
-<a name="303" href="#303">303</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(<strong class="jxr_keyword">int</strong> act, <a href="../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> usernameToken, Principal principal) {
-<a name="304" href="#304">304</a> put(TAG_ACTION, <strong class="jxr_keyword">new</strong> Integer(act));
-<a name="305" href="#305">305</a> put(TAG_USERNAME_TOKEN, usernameToken);
-<a name="306" href="#306">306</a> put(TAG_PRINCIPAL, principal);
-<a name="307" href="#307">307</a> put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
-<a name="308" href="#308">308</a> }
-<a name="309" href="#309">309</a>
-<a name="310" href="#310">310</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(<strong class="jxr_keyword">int</strong> act, <a href="../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token, X509Certificate[] certs) {
-<a name="311" href="#311">311</a> put(TAG_ACTION, <strong class="jxr_keyword">new</strong> Integer(act));
-<a name="312" href="#312">312</a> put(TAG_BINARY_SECURITY_TOKEN, token);
-<a name="313" href="#313">313</a> put(TAG_X509_CERTIFICATES, certs);
-<a name="314" href="#314">314</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
-<a name="315" href="#315">315</a> put(TAG_X509_CERTIFICATE, certs[0]);
-<a name="316" href="#316">316</a> }
-<a name="317" href="#317">317</a> put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
-<a name="318" href="#318">318</a> }
-<a name="319" href="#319">319</a>
-<a name="320" href="#320">320</a>
-<a name="321" href="#321">321</a> }
+<a name="303" href="#303">303</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(<strong class="jxr_keyword">int</strong> act, <a href="../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> usernameToken) {
+<a name="304" href="#304">304</a> <strong class="jxr_keyword">this</strong>(act, usernameToken, <strong class="jxr_keyword">null</strong>);
+<a name="305" href="#305">305</a> }
+<a name="306" href="#306">306</a>
+<a name="307" href="#307">307</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(<strong class="jxr_keyword">int</strong> act, <a href="../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> usernameToken, Principal principal) {
+<a name="308" href="#308">308</a> put(TAG_ACTION, <strong class="jxr_keyword">new</strong> Integer(act));
+<a name="309" href="#309">309</a> put(TAG_USERNAME_TOKEN, usernameToken);
+<a name="310" href="#310">310</a> put(TAG_PRINCIPAL, principal);
+<a name="311" href="#311">311</a> put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
+<a name="312" href="#312">312</a> }
+<a name="313" href="#313">313</a>
+<a name="314" href="#314">314</a> <strong class="jxr_keyword">public</strong> <a href="../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a>(<strong class="jxr_keyword">int</strong> act, <a href="../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token, X509Certificate[] certs) {
+<a name="315" href="#315">315</a> put(TAG_ACTION, <strong class="jxr_keyword">new</strong> Integer(act));
+<a name="316" href="#316">316</a> put(TAG_BINARY_SECURITY_TOKEN, token);
+<a name="317" href="#317">317</a> put(TAG_X509_CERTIFICATES, certs);
+<a name="318" href="#318">318</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
+<a name="319" href="#319">319</a> put(TAG_X509_CERTIFICATE, certs[0]);
+<a name="320" href="#320">320</a> }
+<a name="321" href="#321">321</a> put(TAG_VALIDATED_TOKEN, Boolean.FALSE);
+<a name="322" href="#322">322</a> }
+<a name="323" href="#323">323</a>
+<a name="324" href="#324">324</a>
+<a name="325" href="#325">325</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/action/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/action/package-frame.html?rev=1133081&r1=1133080&r2=1133081&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/action/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/action/package-frame.html Tue Jun 7 16:25:20 2011
@@ -1,48 +1,48 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html xml:lang="en" lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.0 Reference Package org.apache.ws.security.action</title>
- <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
- </head>
- <body>
-
- <h3>
- <a href="package-summary.html" target="classFrame">org.apache.ws.security.action</a>
- </h3>
-
- <h3>Classes</h3>
-
- <ul>
- <li>
- <a href="Action.html" target="classFrame">Action</a>
- </li>
- <li>
- <a href="EncryptionAction.html" target="classFrame">EncryptionAction</a>
- </li>
- <li>
- <a href="SAMLTokenSignedAction.html" target="classFrame">SAMLTokenSignedAction</a>
- </li>
- <li>
- <a href="SAMLTokenUnsignedAction.html" target="classFrame">SAMLTokenUnsignedAction</a>
- </li>
- <li>
- <a href="SignatureAction.html" target="classFrame">SignatureAction</a>
- </li>
- <li>
- <a href="SignatureConfirmationAction.html" target="classFrame">SignatureConfirmationAction</a>
- </li>
- <li>
- <a href="TimestampAction.html" target="classFrame">TimestampAction</a>
- </li>
- <li>
- <a href="UsernameTokenAction.html" target="classFrame">UsernameTokenAction</a>
- </li>
- <li>
- <a href="UsernameTokenSignedAction.html" target="classFrame">UsernameTokenSignedAction</a>
- </li>
- </ul>
-
- </body>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+ <title>WSS4J 1.6.1 Reference Package org.apache.ws.security.action</title>
+ <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+ </head>
+ <body>
+
+ <h3>
+ <a href="package-summary.html" target="classFrame">org.apache.ws.security.action</a>
+ </h3>
+
+ <h3>Classes</h3>
+
+ <ul>
+ <li>
+ <a href="Action.html" target="classFrame">Action</a>
+ </li>
+ <li>
+ <a href="EncryptionAction.html" target="classFrame">EncryptionAction</a>
+ </li>
+ <li>
+ <a href="SAMLTokenSignedAction.html" target="classFrame">SAMLTokenSignedAction</a>
+ </li>
+ <li>
+ <a href="SAMLTokenUnsignedAction.html" target="classFrame">SAMLTokenUnsignedAction</a>
+ </li>
+ <li>
+ <a href="SignatureAction.html" target="classFrame">SignatureAction</a>
+ </li>
+ <li>
+ <a href="SignatureConfirmationAction.html" target="classFrame">SignatureConfirmationAction</a>
+ </li>
+ <li>
+ <a href="TimestampAction.html" target="classFrame">TimestampAction</a>
+ </li>
+ <li>
+ <a href="UsernameTokenAction.html" target="classFrame">UsernameTokenAction</a>
+ </li>
+ <li>
+ <a href="UsernameTokenSignedAction.html" target="classFrame">UsernameTokenSignedAction</a>
+ </li>
+ </ul>
+
+ </body>
</html>
\ No newline at end of file
Modified: webservices/wss4j/site/xref/org/apache/ws/security/action/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/action/package-summary.html?rev=1133081&r1=1133080&r2=1133081&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/action/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/action/package-summary.html Tue Jun 7 16:25:20 2011
@@ -1,107 +1,107 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html xml:lang="en" lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.0 Reference Package org.apache.ws.security.action</title>
- <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
- </head>
- <body>
- <div class="overview">
- <ul>
- <li>
- <a href="../../../../../overview-summary.html">Overview</a>
- </li>
- <li class="selected">Package</li>
- </ul>
- </div>
- <div class="framenoframe">
- <ul>
- <li>
- <a href="../../../../../index.html" target="_top">FRAMES</a>
- </li>
- <li>
- <a href="package-summary.html" target="_top">NO FRAMES</a>
- </li>
- </ul>
- </div>
-
- <h2>Package org.apache.ws.security.action</h2>
-
- <table class="summary">
- <thead>
- <tr>
- <th>Class Summary</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <a href="Action.html" target="classFrame">Action</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="EncryptionAction.html" target="classFrame">EncryptionAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="SAMLTokenSignedAction.html" target="classFrame">SAMLTokenSignedAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="SAMLTokenUnsignedAction.html" target="classFrame">SAMLTokenUnsignedAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="SignatureAction.html" target="classFrame">SignatureAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="SignatureConfirmationAction.html" target="classFrame">SignatureConfirmationAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="TimestampAction.html" target="classFrame">TimestampAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="UsernameTokenAction.html" target="classFrame">UsernameTokenAction</a>
- </td>
- </tr>
- <tr>
- <td>
- <a href="UsernameTokenSignedAction.html" target="classFrame">UsernameTokenSignedAction</a>
- </td>
- </tr>
- </tbody>
- </table>
-
- <div class="overview">
- <ul>
- <li>
- <a href="../../../../../overview-summary.html">Overview</a>
- </li>
- <li class="selected">Package</li>
- </ul>
- </div>
- <div class="framenoframe">
- <ul>
- <li>
- <a href="../../../../../index.html" target="_top">FRAMES</a>
- </li>
- <li>
- <a href="package-summary.html" target="_top">NO FRAMES</a>
- </li>
- </ul>
- </div>
- <hr />
- Copyright © 2004-2011 The Apache Software Foundation. All Rights Reserved.
- </body>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xml:lang="en" lang="en">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
+ <title>WSS4J 1.6.1 Reference Package org.apache.ws.security.action</title>
+ <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
+ </head>
+ <body>
+ <div class="overview">
+ <ul>
+ <li>
+ <a href="../../../../../overview-summary.html">Overview</a>
+ </li>
+ <li class="selected">Package</li>
+ </ul>
+ </div>
+ <div class="framenoframe">
+ <ul>
+ <li>
+ <a href="../../../../../index.html" target="_top">FRAMES</a>
+ </li>
+ <li>
+ <a href="package-summary.html" target="_top">NO FRAMES</a>
+ </li>
+ </ul>
+ </div>
+
+ <h2>Package org.apache.ws.security.action</h2>
+
+ <table class="summary">
+ <thead>
+ <tr>
+ <th>Class Summary</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <a href="Action.html" target="classFrame">Action</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="EncryptionAction.html" target="classFrame">EncryptionAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="SAMLTokenSignedAction.html" target="classFrame">SAMLTokenSignedAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="SAMLTokenUnsignedAction.html" target="classFrame">SAMLTokenUnsignedAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="SignatureAction.html" target="classFrame">SignatureAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="SignatureConfirmationAction.html" target="classFrame">SignatureConfirmationAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="TimestampAction.html" target="classFrame">TimestampAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="UsernameTokenAction.html" target="classFrame">UsernameTokenAction</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="UsernameTokenSignedAction.html" target="classFrame">UsernameTokenSignedAction</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div class="overview">
+ <ul>
+ <li>
+ <a href="../../../../../overview-summary.html">Overview</a>
+ </li>
+ <li class="selected">Package</li>
+ </ul>
+ </div>
+ <div class="framenoframe">
+ <ul>
+ <li>
+ <a href="../../../../../index.html" target="_top">FRAMES</a>
+ </li>
+ <li>
+ <a href="package-summary.html" target="_top">NO FRAMES</a>
+ </li>
+ </ul>
+ </div>
+ <hr />
+ Copyright © 2004-2011 The Apache Software Foundation. All Rights Reserved.
+ </body>
</html>
\ No newline at end of file
Modified: webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/CertificateStore.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/CertificateStore.html?rev=1133081&r1=1133080&r2=1133081&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/CertificateStore.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/CertificateStore.html Tue Jun 7 16:25:20 2011
@@ -149,228 +149,242 @@
<a name="139" href="#139">139</a> <em class="jxr_javadoccomment"> * @return true if the certificate chain is valid, false otherwise</em>
<a name="140" href="#140">140</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
<a name="141" href="#141">141</a> <em class="jxr_javadoccomment"> */</em>
-<a name="142" href="#142">142</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(X509Certificate[] certs) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="143" href="#143">143</a> <strong class="jxr_keyword">try</strong> {
-<a name="144" href="#144">144</a> <em class="jxr_comment">// Generate cert path</em>
-<a name="145" href="#145">145</a> List<X509Certificate> certList = Arrays.asList(certs);
-<a name="146" href="#146">146</a> CertPath path = getCertificateFactory().generateCertPath(certList);
-<a name="147" href="#147">147</a>
-<a name="148" href="#148">148</a> Set<TrustAnchor> set = <strong class="jxr_keyword">new</strong> HashSet<TrustAnchor>();
-<a name="149" href="#149">149</a> <strong class="jxr_keyword">if</strong> (trustedCerts != <strong class="jxr_keyword">null</strong>) {
-<a name="150" href="#150">150</a> <strong class="jxr_keyword">for</strong> (X509Certificate cert : trustedCerts) {
-<a name="151" href="#151">151</a> TrustAnchor anchor =
-<a name="152" href="#152">152</a> <strong class="jxr_keyword">new</strong> TrustAnchor(cert, cert.getExtensionValue(NAME_CONSTRAINTS_OID));
-<a name="153" href="#153">153</a> set.add(anchor);
-<a name="154" href="#154">154</a> }
-<a name="155" href="#155">155</a> }
-<a name="156" href="#156">156</a>
-<a name="157" href="#157">157</a> PKIXParameters param = <strong class="jxr_keyword">new</strong> PKIXParameters(set);
-<a name="158" href="#158">158</a>
-<a name="159" href="#159">159</a> <em class="jxr_comment">// Do not check a revocation list</em>
-<a name="160" href="#160">160</a> param.setRevocationEnabled(false);
-<a name="161" href="#161">161</a>
-<a name="162" href="#162">162</a> <em class="jxr_comment">// Verify the trust path using the above settings</em>
-<a name="163" href="#163">163</a> String provider = getCryptoProvider();
-<a name="164" href="#164">164</a> CertPathValidator validator = <strong class="jxr_keyword">null</strong>;
-<a name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> (provider == <strong class="jxr_keyword">null</strong> || provider.length() == 0) {
-<a name="166" href="#166">166</a> validator = CertPathValidator.getInstance(<span class="jxr_string">"PKIX"</span>);
-<a name="167" href="#167">167</a> } <strong class="jxr_keyword">else</strong> {
-<a name="168" href="#168">168</a> validator = CertPathValidator.getInstance(<span class="jxr_string">"PKIX"</span>, provider);
-<a name="169" href="#169">169</a> }
-<a name="170" href="#170">170</a> validator.validate(path, param);
-<a name="171" href="#171">171</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a name="172" href="#172">172</a> } <strong class="jxr_keyword">catch</strong> (java.security.NoSuchProviderException e) {
-<a name="173" href="#173">173</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="174" href="#174">174</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
-<a name="175" href="#175">175</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
-<a name="176" href="#176">176</a> );
-<a name="177" href="#177">177</a> } <strong class="jxr_keyword">catch</strong> (java.security.NoSuchAlgorithmException e) {
-<a name="178" href="#178">178</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="179" href="#179">179</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
-<a name="180" href="#180">180</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
-<a name="181" href="#181">181</a> );
-<a name="182" href="#182">182</a> } <strong class="jxr_keyword">catch</strong> (java.security.cert.CertificateException e) {
-<a name="183" href="#183">183</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="184" href="#184">184</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
-<a name="185" href="#185">185</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
-<a name="186" href="#186">186</a> );
-<a name="187" href="#187">187</a> } <strong class="jxr_keyword">catch</strong> (java.security.InvalidAlgorithmParameterException e) {
-<a name="188" href="#188">188</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="189" href="#189">189</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
-<a name="190" href="#190">190</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
-<a name="191" href="#191">191</a> );
-<a name="192" href="#192">192</a> } <strong class="jxr_keyword">catch</strong> (java.security.cert.CertPathValidatorException e) {
-<a name="193" href="#193">193</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="194" href="#194">194</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
-<a name="195" href="#195">195</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
-<a name="196" href="#196">196</a> );
-<a name="197" href="#197">197</a> }
-<a name="198" href="#198">198</a> }
-<a name="199" href="#199">199</a>
-<a name="200" href="#200">200</a> <em class="jxr_javadoccomment">/**</em>
-<a name="201" href="#201">201</a> <em class="jxr_javadoccomment"> * Evaluate whether a given public key should be trusted.</em>
-<a name="202" href="#202">202</a> <em class="jxr_javadoccomment"> * </em>
-<a name="203" href="#203">203</a> <em class="jxr_javadoccomment"> * @param publicKey The PublicKey to be evaluated</em>
-<a name="204" href="#204">204</a> <em class="jxr_javadoccomment"> * @return whether the PublicKey parameter is trusted or not</em>
-<a name="205" href="#205">205</a> <em class="jxr_javadoccomment"> */</em>
-<a name="206" href="#206">206</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(PublicKey publicKey) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="207" href="#207">207</a> <em class="jxr_comment">//</em>
-<a name="208" href="#208">208</a> <em class="jxr_comment">// If the public key is null, do not trust the signature</em>
-<a name="209" href="#209">209</a> <em class="jxr_comment">//</em>
-<a name="210" href="#210">210</a> <strong class="jxr_keyword">if</strong> (publicKey == <strong class="jxr_keyword">null</strong>) {
-<a name="211" href="#211">211</a> <strong class="jxr_keyword">return</strong> false;
-<a name="212" href="#212">212</a> }
-<a name="213" href="#213">213</a>
-<a name="214" href="#214">214</a> <em class="jxr_comment">//</em>
-<a name="215" href="#215">215</a> <em class="jxr_comment">// Search the trusted certs for the transmitted public key (direct trust)</em>
-<a name="216" href="#216">216</a> <em class="jxr_comment">//</em>
-<a name="217" href="#217">217</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
-<a name="218" href="#218">218</a> <strong class="jxr_keyword">if</strong> (publicKey.equals(trustedCert.getPublicKey())) {
-<a name="219" href="#219">219</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a name="220" href="#220">220</a> }
-<a name="221" href="#221">221</a> }
-<a name="222" href="#222">222</a> <strong class="jxr_keyword">return</strong> false;
-<a name="223" href="#223">223</a> }
-<a name="224" href="#224">224</a>
-<a name="225" href="#225">225</a> <em class="jxr_javadoccomment">/**</em>
-<a name="226" href="#226">226</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given serial number and issuer string.</em>
-<a name="227" href="#227">227</a> <em class="jxr_javadoccomment"> *</em>
-<a name="228" href="#228">228</a> <em class="jxr_javadoccomment"> * @param issuer The Issuer String</em>
-<a name="229" href="#229">229</a> <em class="jxr_javadoccomment"> * @param serialNumber The serial number of the certificate</em>
-<a name="230" href="#230">230</a> <em class="jxr_javadoccomment"> * @return the X509 Certificate (chain) that was found</em>
-<a name="231" href="#231">231</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="232" href="#232">232</a> <em class="jxr_javadoccomment"> */</em>
-<a name="233" href="#233">233</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509Certificates(
-<a name="234" href="#234">234</a> String issuer,
-<a name="235" href="#235">235</a> BigInteger serialNumber
-<a name="236" href="#236">236</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="237" href="#237">237</a> <em class="jxr_comment">//</em>
-<a name="238" href="#238">238</a> <em class="jxr_comment">// Convert the subject DN to a java X500Principal object first. This is to ensure</em>
-<a name="239" href="#239">239</a> <em class="jxr_comment">// interop with a DN constructed from .NET, where e.g. it uses "S" instead of "ST".</em>
-<a name="240" href="#240">240</a> <em class="jxr_comment">// Then convert it to a BouncyCastle X509Name, which will order the attributes of</em>
-<a name="241" href="#241">241</a> <em class="jxr_comment">// the DN in a particular way (see WSS-168). If the conversion to an X500Principal</em>
-<a name="242" href="#242">242</a> <em class="jxr_comment">// object fails (e.g. if the DN contains "E" instead of "EMAILADDRESS"), then fall</em>
-<a name="243" href="#243">243</a> <em class="jxr_comment">// back on a direct conversion to a BC X509Name</em>
-<a name="244" href="#244">244</a> <em class="jxr_comment">//</em>
-<a name="245" href="#245">245</a> Object issuerName = <strong class="jxr_keyword">null</strong>;
-<a name="246" href="#246">246</a> <strong class="jxr_keyword">try</strong> {
-<a name="247" href="#247">247</a> X500Principal issuerRDN = <strong class="jxr_keyword">new</strong> X500Principal(issuer);
-<a name="248" href="#248">248</a> issuerName = createBCX509Name(issuerRDN.getName());
-<a name="249" href="#249">249</a> } <strong class="jxr_keyword">catch</strong> (java.lang.IllegalArgumentException ex) {
-<a name="250" href="#250">250</a> issuerName = createBCX509Name(issuer);
-<a name="251" href="#251">251</a> }
-<a name="252" href="#252">252</a>
-<a name="253" href="#253">253</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
-<a name="254" href="#254">254</a> <strong class="jxr_keyword">if</strong> (trustedCert.getSerialNumber().compareTo(serialNumber) == 0) {
-<a name="255" href="#255">255</a> Object certName =
-<a name="256" href="#256">256</a> createBCX509Name(trustedCert.getIssuerX500Principal().getName());
-<a name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong> (certName.equals(issuerName)) {
-<a name="258" href="#258">258</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
-<a name="259" href="#259">259</a> }
-<a name="260" href="#260">260</a> }
-<a name="261" href="#261">261</a> }
-<a name="262" href="#262">262</a>
-<a name="263" href="#263">263</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="264" href="#264">264</a> }
-<a name="265" href="#265">265</a>
-<a name="266" href="#266">266</a> <em class="jxr_javadoccomment">/**</em>
-<a name="267" href="#267">267</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given Thumbprint.</em>
-<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> *</em>
-<a name="269" href="#269">269</a> <em class="jxr_javadoccomment"> * @param thumb The SHA1 thumbprint info bytes</em>
-<a name="270" href="#270">270</a> <em class="jxr_javadoccomment"> * @return the X509 certificate (chain) that was found (can be null)</em>
-<a name="271" href="#271">271</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException if problems during keystore handling or wrong certificate</em>
-<a name="272" href="#272">272</a> <em class="jxr_javadoccomment"> */</em>
-<a name="273" href="#273">273</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509Certificates(byte[] thumb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="274" href="#274">274</a> MessageDigest sha = <strong class="jxr_keyword">null</strong>;
-<a name="275" href="#275">275</a>
-<a name="276" href="#276">276</a> <strong class="jxr_keyword">if</strong> (trustedCerts == <strong class="jxr_keyword">null</strong>) {
-<a name="277" href="#277">277</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="278" href="#278">278</a> }
-<a name="279" href="#279">279</a>
-<a name="280" href="#280">280</a> <strong class="jxr_keyword">try</strong> {
-<a name="281" href="#281">281</a> sha = MessageDigest.getInstance(<span class="jxr_string">"SHA1"</span>);
-<a name="282" href="#282">282</a> } <strong class="jxr_keyword">catch</strong> (NoSuchAlgorithmException e) {
-<a name="283" href="#283">283</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="284" href="#284">284</a> WSSecurityException.FAILURE, <span class="jxr_string">"noSHA1availabe"</span>, <strong class="jxr_keyword">null</strong>, e
-<a name="285" href="#285">285</a> );
-<a name="286" href="#286">286</a> }
-<a name="287" href="#287">287</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
-<a name="288" href="#288">288</a> <strong class="jxr_keyword">try</strong> {
-<a name="289" href="#289">289</a> sha.update(trustedCert.getEncoded());
-<a name="290" href="#290">290</a> } <strong class="jxr_keyword">catch</strong> (CertificateEncodingException ex) {
-<a name="291" href="#291">291</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="292" href="#292">292</a> WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, <span class="jxr_string">"encodeError"</span>,
-<a name="293" href="#293">293</a> <strong class="jxr_keyword">null</strong>, ex
-<a name="294" href="#294">294</a> );
-<a name="295" href="#295">295</a> }
-<a name="296" href="#296">296</a> byte[] data = sha.digest();
-<a name="297" href="#297">297</a>
-<a name="298" href="#298">298</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(data, thumb)) {
-<a name="299" href="#299">299</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
-<a name="300" href="#300">300</a> }
-<a name="301" href="#301">301</a> }
-<a name="302" href="#302">302</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="303" href="#303">303</a> }
-<a name="304" href="#304">304</a>
-<a name="305" href="#305">305</a> <em class="jxr_javadoccomment">/**</em>
-<a name="306" href="#306">306</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given SubjectKeyIdentifier.</em>
-<a name="307" href="#307">307</a> <em class="jxr_javadoccomment"> *</em>
-<a name="308" href="#308">308</a> <em class="jxr_javadoccomment"> * @param skiBytes The SKI bytes</em>
-<a name="309" href="#309">309</a> <em class="jxr_javadoccomment"> * @return the X509 certificate (chain) that was found (can be null)</em>
-<a name="310" href="#310">310</a> <em class="jxr_javadoccomment"> */</em>
-<a name="311" href="#311">311</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509CertificatesSKI(byte[] skiBytes) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="312" href="#312">312</a> <strong class="jxr_keyword">if</strong> (trustedCerts == <strong class="jxr_keyword">null</strong>) {
-<a name="313" href="#313">313</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="314" href="#314">314</a> }
-<a name="315" href="#315">315</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
-<a name="316" href="#316">316</a> byte[] data = getSKIBytesFromCert(trustedCert);
-<a name="317" href="#317">317</a> <strong class="jxr_keyword">if</strong> (data.length == skiBytes.length && Arrays.equals(data, skiBytes)) {
-<a name="318" href="#318">318</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
-<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">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="322" href="#322">322</a> }
-<a name="323" href="#323">323</a>
-<a name="324" href="#324">324</a> <em class="jxr_javadoccomment">/**</em>
-<a name="325" href="#325">325</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given DN of the subject of the certificate</em>
-<a name="326" href="#326">326</a> <em class="jxr_javadoccomment"> *</em>
-<a name="327" href="#327">327</a> <em class="jxr_javadoccomment"> * @param subjectDN The DN of subject to look for</em>
-<a name="328" href="#328">328</a> <em class="jxr_javadoccomment"> * @return An X509 Certificate (chain) with the same DN as given in the parameters</em>
-<a name="329" href="#329">329</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="330" href="#330">330</a> <em class="jxr_javadoccomment"> */</em>
-<a name="331" href="#331">331</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509CertificatesSubjectDN(String subjectDN)
-<a name="332" href="#332">332</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="333" href="#333">333</a> <em class="jxr_comment">//</em>
-<a name="334" href="#334">334</a> <em class="jxr_comment">// Convert the subject DN to a java X500Principal object first. This is to ensure</em>
-<a name="335" href="#335">335</a> <em class="jxr_comment">// interop with a DN constructed from .NET, where e.g. it uses "S" instead of "ST".</em>
-<a name="336" href="#336">336</a> <em class="jxr_comment">// Then convert it to a BouncyCastle X509Name, which will order the attributes of</em>
-<a name="337" href="#337">337</a> <em class="jxr_comment">// the DN in a particular way (see WSS-168). If the conversion to an X500Principal</em>
-<a name="338" href="#338">338</a> <em class="jxr_comment">// object fails (e.g. if the DN contains "E" instead of "EMAILADDRESS"), then fall</em>
-<a name="339" href="#339">339</a> <em class="jxr_comment">// back on a direct conversion to a BC X509Name</em>
-<a name="340" href="#340">340</a> <em class="jxr_comment">//</em>
-<a name="341" href="#341">341</a> Object subject;
-<a name="342" href="#342">342</a> <strong class="jxr_keyword">try</strong> {
-<a name="343" href="#343">343</a> X500Principal subjectRDN = <strong class="jxr_keyword">new</strong> X500Principal(subjectDN);
-<a name="344" href="#344">344</a> subject = createBCX509Name(subjectRDN.getName());
-<a name="345" href="#345">345</a> } <strong class="jxr_keyword">catch</strong> (java.lang.IllegalArgumentException ex) {
-<a name="346" href="#346">346</a> subject = createBCX509Name(subjectDN);
-<a name="347" href="#347">347</a> }
-<a name="348" href="#348">348</a>
-<a name="349" href="#349">349</a> <strong class="jxr_keyword">if</strong> (trustedCerts != <strong class="jxr_keyword">null</strong>) {
-<a name="350" href="#350">350</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
-<a name="351" href="#351">351</a> X500Principal foundRDN = trustedCert.getSubjectX500Principal();
-<a name="352" href="#352">352</a> Object certName = createBCX509Name(foundRDN.getName());
-<a name="353" href="#353">353</a>
-<a name="354" href="#354">354</a> <strong class="jxr_keyword">if</strong> (subject.equals(certName)) {
-<a name="355" href="#355">355</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
-<a name="356" href="#356">356</a> }
-<a name="357" href="#357">357</a> }
-<a name="358" href="#358">358</a> }
-<a name="359" href="#359">359</a>
-<a name="360" href="#360">360</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="361" href="#361">361</a> }
-<a name="362" href="#362">362</a>
-<a name="363" href="#363">363</a> }
+<a name="142" href="#142">142</a> @Deprecated
+<a name="143" href="#143">143</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(X509Certificate[] certs) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="144" href="#144">144</a> <strong class="jxr_keyword">return</strong> verifyTrust(certs, false);
+<a name="145" href="#145">145</a> }
+<a name="146" href="#146">146</a>
+<a name="147" href="#147">147</a> <em class="jxr_javadoccomment">/**</em>
+<a name="148" href="#148">148</a> <em class="jxr_javadoccomment"> * Evaluate whether a given certificate chain should be trusted.</em>
+<a name="149" href="#149">149</a> <em class="jxr_javadoccomment"> *</em>
+<a name="150" href="#150">150</a> <em class="jxr_javadoccomment"> * @param certs Certificate chain to validate</em>
+<a name="151" href="#151">151</a> <em class="jxr_javadoccomment"> * @param enableRevocation whether to enable CRL verification or not</em>
+<a name="152" href="#152">152</a> <em class="jxr_javadoccomment"> * @return true if the certificate chain is valid, false otherwise</em>
+<a name="153" href="#153">153</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="154" href="#154">154</a> <em class="jxr_javadoccomment"> */</em>
+<a name="155" href="#155">155</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(
+<a name="156" href="#156">156</a> X509Certificate[] certs,
+<a name="157" href="#157">157</a> <strong class="jxr_keyword">boolean</strong> enableRevocation
+<a name="158" href="#158">158</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="159" href="#159">159</a> <strong class="jxr_keyword">try</strong> {
+<a name="160" href="#160">160</a> <em class="jxr_comment">// Generate cert path</em>
+<a name="161" href="#161">161</a> List<X509Certificate> certList = Arrays.asList(certs);
+<a name="162" href="#162">162</a> CertPath path = getCertificateFactory().generateCertPath(certList);
+<a name="163" href="#163">163</a>
+<a name="164" href="#164">164</a> Set<TrustAnchor> set = <strong class="jxr_keyword">new</strong> HashSet<TrustAnchor>();
+<a name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> (trustedCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="166" href="#166">166</a> <strong class="jxr_keyword">for</strong> (X509Certificate cert : trustedCerts) {
+<a name="167" href="#167">167</a> TrustAnchor anchor =
+<a name="168" href="#168">168</a> <strong class="jxr_keyword">new</strong> TrustAnchor(cert, cert.getExtensionValue(NAME_CONSTRAINTS_OID));
+<a name="169" href="#169">169</a> set.add(anchor);
+<a name="170" href="#170">170</a> }
+<a name="171" href="#171">171</a> }
+<a name="172" href="#172">172</a>
+<a name="173" href="#173">173</a> PKIXParameters param = <strong class="jxr_keyword">new</strong> PKIXParameters(set);
+<a name="174" href="#174">174</a> param.setRevocationEnabled(enableRevocation);
+<a name="175" href="#175">175</a>
+<a name="176" href="#176">176</a> <em class="jxr_comment">// Verify the trust path using the above settings</em>
+<a name="177" href="#177">177</a> String provider = getCryptoProvider();
+<a name="178" href="#178">178</a> CertPathValidator validator = <strong class="jxr_keyword">null</strong>;
+<a name="179" href="#179">179</a> <strong class="jxr_keyword">if</strong> (provider == <strong class="jxr_keyword">null</strong> || provider.length() == 0) {
+<a name="180" href="#180">180</a> validator = CertPathValidator.getInstance(<span class="jxr_string">"PKIX"</span>);
+<a name="181" href="#181">181</a> } <strong class="jxr_keyword">else</strong> {
+<a name="182" href="#182">182</a> validator = CertPathValidator.getInstance(<span class="jxr_string">"PKIX"</span>, provider);
+<a name="183" href="#183">183</a> }
+<a name="184" href="#184">184</a> validator.validate(path, param);
+<a name="185" href="#185">185</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a name="186" href="#186">186</a> } <strong class="jxr_keyword">catch</strong> (java.security.NoSuchProviderException e) {
+<a name="187" href="#187">187</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="188" href="#188">188</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
+<a name="189" href="#189">189</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
+<a name="190" href="#190">190</a> );
+<a name="191" href="#191">191</a> } <strong class="jxr_keyword">catch</strong> (java.security.NoSuchAlgorithmException e) {
+<a name="192" href="#192">192</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="193" href="#193">193</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
+<a name="194" href="#194">194</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
+<a name="195" href="#195">195</a> );
+<a name="196" href="#196">196</a> } <strong class="jxr_keyword">catch</strong> (java.security.cert.CertificateException e) {
+<a name="197" href="#197">197</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="198" href="#198">198</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
+<a name="199" href="#199">199</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
+<a name="200" href="#200">200</a> );
+<a name="201" href="#201">201</a> } <strong class="jxr_keyword">catch</strong> (java.security.InvalidAlgorithmParameterException e) {
+<a name="202" href="#202">202</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="203" href="#203">203</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
+<a name="204" href="#204">204</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
+<a name="205" href="#205">205</a> );
+<a name="206" href="#206">206</a> } <strong class="jxr_keyword">catch</strong> (java.security.cert.CertPathValidatorException e) {
+<a name="207" href="#207">207</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="208" href="#208">208</a> WSSecurityException.FAILURE, <span class="jxr_string">"certpath"</span>,
+<a name="209" href="#209">209</a> <strong class="jxr_keyword">new</strong> Object[] { e.getMessage() }, e
+<a name="210" href="#210">210</a> );
+<a name="211" href="#211">211</a> }
+<a name="212" href="#212">212</a> }
+<a name="213" href="#213">213</a>
+<a name="214" href="#214">214</a> <em class="jxr_javadoccomment">/**</em>
+<a name="215" href="#215">215</a> <em class="jxr_javadoccomment"> * Evaluate whether a given public key should be trusted.</em>
+<a name="216" href="#216">216</a> <em class="jxr_javadoccomment"> * </em>
+<a name="217" href="#217">217</a> <em class="jxr_javadoccomment"> * @param publicKey The PublicKey to be evaluated</em>
+<a name="218" href="#218">218</a> <em class="jxr_javadoccomment"> * @return whether the PublicKey parameter is trusted or not</em>
+<a name="219" href="#219">219</a> <em class="jxr_javadoccomment"> */</em>
+<a name="220" href="#220">220</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(PublicKey publicKey) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="221" href="#221">221</a> <em class="jxr_comment">//</em>
+<a name="222" href="#222">222</a> <em class="jxr_comment">// If the public key is null, do not trust the signature</em>
+<a name="223" href="#223">223</a> <em class="jxr_comment">//</em>
+<a name="224" href="#224">224</a> <strong class="jxr_keyword">if</strong> (publicKey == <strong class="jxr_keyword">null</strong>) {
+<a name="225" href="#225">225</a> <strong class="jxr_keyword">return</strong> false;
+<a name="226" href="#226">226</a> }
+<a name="227" href="#227">227</a>
+<a name="228" href="#228">228</a> <em class="jxr_comment">//</em>
+<a name="229" href="#229">229</a> <em class="jxr_comment">// Search the trusted certs for the transmitted public key (direct trust)</em>
+<a name="230" href="#230">230</a> <em class="jxr_comment">//</em>
+<a name="231" href="#231">231</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
+<a name="232" href="#232">232</a> <strong class="jxr_keyword">if</strong> (publicKey.equals(trustedCert.getPublicKey())) {
+<a name="233" href="#233">233</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a name="234" href="#234">234</a> }
+<a name="235" href="#235">235</a> }
+<a name="236" href="#236">236</a> <strong class="jxr_keyword">return</strong> false;
+<a name="237" href="#237">237</a> }
+<a name="238" href="#238">238</a>
+<a name="239" href="#239">239</a> <em class="jxr_javadoccomment">/**</em>
+<a name="240" href="#240">240</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given serial number and issuer string.</em>
+<a name="241" href="#241">241</a> <em class="jxr_javadoccomment"> *</em>
+<a name="242" href="#242">242</a> <em class="jxr_javadoccomment"> * @param issuer The Issuer String</em>
+<a name="243" href="#243">243</a> <em class="jxr_javadoccomment"> * @param serialNumber The serial number of the certificate</em>
+<a name="244" href="#244">244</a> <em class="jxr_javadoccomment"> * @return the X509 Certificate (chain) that was found</em>
+<a name="245" href="#245">245</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="246" href="#246">246</a> <em class="jxr_javadoccomment"> */</em>
+<a name="247" href="#247">247</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509Certificates(
+<a name="248" href="#248">248</a> String issuer,
+<a name="249" href="#249">249</a> BigInteger serialNumber
+<a name="250" href="#250">250</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="251" href="#251">251</a> <em class="jxr_comment">//</em>
+<a name="252" href="#252">252</a> <em class="jxr_comment">// Convert the subject DN to a java X500Principal object first. This is to ensure</em>
+<a name="253" href="#253">253</a> <em class="jxr_comment">// interop with a DN constructed from .NET, where e.g. it uses "S" instead of "ST".</em>
+<a name="254" href="#254">254</a> <em class="jxr_comment">// Then convert it to a BouncyCastle X509Name, which will order the attributes of</em>
+<a name="255" href="#255">255</a> <em class="jxr_comment">// the DN in a particular way (see WSS-168). If the conversion to an X500Principal</em>
+<a name="256" href="#256">256</a> <em class="jxr_comment">// object fails (e.g. if the DN contains "E" instead of "EMAILADDRESS"), then fall</em>
+<a name="257" href="#257">257</a> <em class="jxr_comment">// back on a direct conversion to a BC X509Name</em>
+<a name="258" href="#258">258</a> <em class="jxr_comment">//</em>
+<a name="259" href="#259">259</a> Object issuerName = <strong class="jxr_keyword">null</strong>;
+<a name="260" href="#260">260</a> <strong class="jxr_keyword">try</strong> {
+<a name="261" href="#261">261</a> X500Principal issuerRDN = <strong class="jxr_keyword">new</strong> X500Principal(issuer);
+<a name="262" href="#262">262</a> issuerName = createBCX509Name(issuerRDN.getName());
+<a name="263" href="#263">263</a> } <strong class="jxr_keyword">catch</strong> (java.lang.IllegalArgumentException ex) {
+<a name="264" href="#264">264</a> issuerName = createBCX509Name(issuer);
+<a name="265" href="#265">265</a> }
+<a name="266" href="#266">266</a>
+<a name="267" href="#267">267</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
+<a name="268" href="#268">268</a> <strong class="jxr_keyword">if</strong> (trustedCert.getSerialNumber().compareTo(serialNumber) == 0) {
+<a name="269" href="#269">269</a> Object certName =
+<a name="270" href="#270">270</a> createBCX509Name(trustedCert.getIssuerX500Principal().getName());
+<a name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> (certName.equals(issuerName)) {
+<a name="272" href="#272">272</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
+<a name="273" href="#273">273</a> }
+<a name="274" href="#274">274</a> }
+<a name="275" href="#275">275</a> }
+<a name="276" href="#276">276</a>
+<a name="277" href="#277">277</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<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"> * Get an X509 Certificate (chain) according to a given Thumbprint.</em>
+<a name="282" href="#282">282</a> <em class="jxr_javadoccomment"> *</em>
+<a name="283" href="#283">283</a> <em class="jxr_javadoccomment"> * @param thumb The SHA1 thumbprint info bytes</em>
+<a name="284" href="#284">284</a> <em class="jxr_javadoccomment"> * @return the X509 certificate (chain) that was found (can be null)</em>
+<a name="285" href="#285">285</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException if problems during keystore handling or wrong certificate</em>
+<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> */</em>
+<a name="287" href="#287">287</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509Certificates(byte[] thumb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="288" href="#288">288</a> MessageDigest sha = <strong class="jxr_keyword">null</strong>;
+<a name="289" href="#289">289</a>
+<a name="290" href="#290">290</a> <strong class="jxr_keyword">if</strong> (trustedCerts == <strong class="jxr_keyword">null</strong>) {
+<a name="291" href="#291">291</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="292" href="#292">292</a> }
+<a name="293" href="#293">293</a>
+<a name="294" href="#294">294</a> <strong class="jxr_keyword">try</strong> {
+<a name="295" href="#295">295</a> sha = MessageDigest.getInstance(<span class="jxr_string">"SHA1"</span>);
+<a name="296" href="#296">296</a> } <strong class="jxr_keyword">catch</strong> (NoSuchAlgorithmException e) {
+<a name="297" href="#297">297</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="298" href="#298">298</a> WSSecurityException.FAILURE, <span class="jxr_string">"noSHA1availabe"</span>, <strong class="jxr_keyword">null</strong>, e
+<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">for</strong> (X509Certificate trustedCert : trustedCerts) {
+<a name="302" href="#302">302</a> <strong class="jxr_keyword">try</strong> {
+<a name="303" href="#303">303</a> sha.update(trustedCert.getEncoded());
+<a name="304" href="#304">304</a> } <strong class="jxr_keyword">catch</strong> (CertificateEncodingException ex) {
+<a name="305" href="#305">305</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="306" href="#306">306</a> WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, <span class="jxr_string">"encodeError"</span>,
+<a name="307" href="#307">307</a> <strong class="jxr_keyword">null</strong>, ex
+<a name="308" href="#308">308</a> );
+<a name="309" href="#309">309</a> }
+<a name="310" href="#310">310</a> byte[] data = sha.digest();
+<a name="311" href="#311">311</a>
+<a name="312" href="#312">312</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(data, thumb)) {
+<a name="313" href="#313">313</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
+<a name="314" href="#314">314</a> }
+<a name="315" href="#315">315</a> }
+<a name="316" href="#316">316</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="317" href="#317">317</a> }
+<a name="318" href="#318">318</a>
+<a name="319" href="#319">319</a> <em class="jxr_javadoccomment">/**</em>
+<a name="320" href="#320">320</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given SubjectKeyIdentifier.</em>
+<a name="321" href="#321">321</a> <em class="jxr_javadoccomment"> *</em>
+<a name="322" href="#322">322</a> <em class="jxr_javadoccomment"> * @param skiBytes The SKI bytes</em>
+<a name="323" href="#323">323</a> <em class="jxr_javadoccomment"> * @return the X509 certificate (chain) that was found (can be null)</em>
+<a name="324" href="#324">324</a> <em class="jxr_javadoccomment"> */</em>
+<a name="325" href="#325">325</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509CertificatesSKI(byte[] skiBytes) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="326" href="#326">326</a> <strong class="jxr_keyword">if</strong> (trustedCerts == <strong class="jxr_keyword">null</strong>) {
+<a name="327" href="#327">327</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="328" href="#328">328</a> }
+<a name="329" href="#329">329</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
+<a name="330" href="#330">330</a> byte[] data = getSKIBytesFromCert(trustedCert);
+<a name="331" href="#331">331</a> <strong class="jxr_keyword">if</strong> (data.length == skiBytes.length && Arrays.equals(data, skiBytes)) {
+<a name="332" href="#332">332</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
+<a name="333" href="#333">333</a> }
+<a name="334" href="#334">334</a> }
+<a name="335" href="#335">335</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="336" href="#336">336</a> }
+<a name="337" href="#337">337</a>
+<a name="338" href="#338">338</a> <em class="jxr_javadoccomment">/**</em>
+<a name="339" href="#339">339</a> <em class="jxr_javadoccomment"> * Get an X509 Certificate (chain) according to a given DN of the subject of the certificate</em>
+<a name="340" href="#340">340</a> <em class="jxr_javadoccomment"> *</em>
+<a name="341" href="#341">341</a> <em class="jxr_javadoccomment"> * @param subjectDN The DN of subject to look for</em>
+<a name="342" href="#342">342</a> <em class="jxr_javadoccomment"> * @return An X509 Certificate (chain) with the same DN as given in the parameters</em>
+<a name="343" href="#343">343</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="344" href="#344">344</a> <em class="jxr_javadoccomment"> */</em>
+<a name="345" href="#345">345</a> <strong class="jxr_keyword">private</strong> X509Certificate[] getX509CertificatesSubjectDN(String subjectDN)
+<a name="346" href="#346">346</a> <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="347" href="#347">347</a> <em class="jxr_comment">//</em>
+<a name="348" href="#348">348</a> <em class="jxr_comment">// Convert the subject DN to a java X500Principal object first. This is to ensure</em>
+<a name="349" href="#349">349</a> <em class="jxr_comment">// interop with a DN constructed from .NET, where e.g. it uses "S" instead of "ST".</em>
+<a name="350" href="#350">350</a> <em class="jxr_comment">// Then convert it to a BouncyCastle X509Name, which will order the attributes of</em>
+<a name="351" href="#351">351</a> <em class="jxr_comment">// the DN in a particular way (see WSS-168). If the conversion to an X500Principal</em>
+<a name="352" href="#352">352</a> <em class="jxr_comment">// object fails (e.g. if the DN contains "E" instead of "EMAILADDRESS"), then fall</em>
+<a name="353" href="#353">353</a> <em class="jxr_comment">// back on a direct conversion to a BC X509Name</em>
+<a name="354" href="#354">354</a> <em class="jxr_comment">//</em>
+<a name="355" href="#355">355</a> Object subject;
+<a name="356" href="#356">356</a> <strong class="jxr_keyword">try</strong> {
+<a name="357" href="#357">357</a> X500Principal subjectRDN = <strong class="jxr_keyword">new</strong> X500Principal(subjectDN);
+<a name="358" href="#358">358</a> subject = createBCX509Name(subjectRDN.getName());
+<a name="359" href="#359">359</a> } <strong class="jxr_keyword">catch</strong> (java.lang.IllegalArgumentException ex) {
+<a name="360" href="#360">360</a> subject = createBCX509Name(subjectDN);
+<a name="361" href="#361">361</a> }
+<a name="362" href="#362">362</a>
+<a name="363" href="#363">363</a> <strong class="jxr_keyword">if</strong> (trustedCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="364" href="#364">364</a> <strong class="jxr_keyword">for</strong> (X509Certificate trustedCert : trustedCerts) {
+<a name="365" href="#365">365</a> X500Principal foundRDN = trustedCert.getSubjectX500Principal();
+<a name="366" href="#366">366</a> Object certName = createBCX509Name(foundRDN.getName());
+<a name="367" href="#367">367</a>
+<a name="368" href="#368">368</a> <strong class="jxr_keyword">if</strong> (subject.equals(certName)) {
+<a name="369" href="#369">369</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> X509Certificate[]{trustedCert};
+<a name="370" href="#370">370</a> }
+<a name="371" href="#371">371</a> }
+<a name="372" href="#372">372</a> }
+<a name="373" href="#373">373</a>
+<a name="374" href="#374">374</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="375" href="#375">375</a> }
+<a name="376" href="#376">376</a>
+<a name="377" href="#377">377</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/Crypto.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/Crypto.html?rev=1133081&r1=1133080&r2=1133081&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/Crypto.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/components/crypto/Crypto.html Tue Jun 7 16:25:20 2011
@@ -195,17 +195,30 @@
<a name="185" href="#185">185</a> <em class="jxr_javadoccomment"> * @return true if the certificate chain is valid, false otherwise</em>
<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
<a name="187" href="#187">187</a> <em class="jxr_javadoccomment"> */</em>
-<a name="188" href="#188">188</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(X509Certificate[] certs) <strong class="jxr_keyword">throws</strong> WSSecurityException;
-<a name="189" href="#189">189</a>
-<a name="190" href="#190">190</a> <em class="jxr_javadoccomment">/**</em>
-<a name="191" href="#191">191</a> <em class="jxr_javadoccomment"> * Evaluate whether a given public key should be trusted.</em>
-<a name="192" href="#192">192</a> <em class="jxr_javadoccomment"> * </em>
-<a name="193" href="#193">193</a> <em class="jxr_javadoccomment"> * @param publicKey The PublicKey to be evaluated</em>
-<a name="194" href="#194">194</a> <em class="jxr_javadoccomment"> * @return whether the PublicKey parameter is trusted or not</em>
-<a name="195" href="#195">195</a> <em class="jxr_javadoccomment"> */</em>
-<a name="196" href="#196">196</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(PublicKey publicKey) <strong class="jxr_keyword">throws</strong> WSSecurityException;
-<a name="197" href="#197">197</a>
-<a name="198" href="#198">198</a> }
+<a name="188" href="#188">188</a> @Deprecated
+<a name="189" href="#189">189</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(X509Certificate[] certs) <strong class="jxr_keyword">throws</strong> WSSecurityException;
+<a name="190" href="#190">190</a>
+<a name="191" href="#191">191</a> <em class="jxr_javadoccomment">/**</em>
+<a name="192" href="#192">192</a> <em class="jxr_javadoccomment"> * Evaluate whether a given certificate chain should be trusted.</em>
+<a name="193" href="#193">193</a> <em class="jxr_javadoccomment"> *</em>
+<a name="194" href="#194">194</a> <em class="jxr_javadoccomment"> * @param certs Certificate chain to validate</em>
+<a name="195" href="#195">195</a> <em class="jxr_javadoccomment"> * @param enableRevocation whether to enable CRL verification or not</em>
+<a name="196" href="#196">196</a> <em class="jxr_javadoccomment"> * @return true if the certificate chain is valid, false otherwise</em>
+<a name="197" href="#197">197</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="198" href="#198">198</a> <em class="jxr_javadoccomment"> */</em>
+<a name="199" href="#199">199</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(
+<a name="200" href="#200">200</a> X509Certificate[] certs, <strong class="jxr_keyword">boolean</strong> enableRevocation
+<a name="201" href="#201">201</a> ) <strong class="jxr_keyword">throws</strong> WSSecurityException;
+<a name="202" href="#202">202</a>
+<a name="203" href="#203">203</a> <em class="jxr_javadoccomment">/**</em>
+<a name="204" href="#204">204</a> <em class="jxr_javadoccomment"> * Evaluate whether a given public key should be trusted.</em>
+<a name="205" href="#205">205</a> <em class="jxr_javadoccomment"> * </em>
+<a name="206" href="#206">206</a> <em class="jxr_javadoccomment"> * @param publicKey The PublicKey to be evaluated</em>
+<a name="207" href="#207">207</a> <em class="jxr_javadoccomment"> * @return whether the PublicKey parameter is trusted or not</em>
+<a name="208" href="#208">208</a> <em class="jxr_javadoccomment"> */</em>
+<a name="209" href="#209">209</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> verifyTrust(PublicKey publicKey) <strong class="jxr_keyword">throws</strong> WSSecurityException;
+<a name="210" href="#210">210</a>
+<a name="211" href="#211">211</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>