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 2012/07/31 18:30:30 UTC
svn commit: r1367668 [31/32] - 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/cache/ apidocs/org/apache/ws/s...
Modified: webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html Tue Jul 31 16:30:10 2012
@@ -224,321 +224,336 @@
<a name="214" href="#214">214</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(id);
<a name="215" href="#215">215</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())
<a name="216" href="#216">216</a> || WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(secRef.getKeyIdentifierValueType())) {
-<a name="217" href="#217">217</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
-<a name="218" href="#218">218</a> SAMLUtil.getAssertionFromKeyIdentifier(
-<a name="219" href="#219">219</a> secRef, strElement, data, wsDocInfo
-<a name="220" href="#220">220</a> );
-<a name="221" href="#221">221</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="222" href="#222">222</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
-<a name="223" href="#223">223</a> }
-<a name="224" href="#224">224</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKi =
-<a name="225" href="#225">225</a> SAMLUtil.getCredentialFromSubject(assertion, data,
-<a name="226" href="#226">226</a> wsDocInfo, bspCompliant);
-<a name="227" href="#227">227</a> X509Certificate[] foundCerts = samlKi.getCerts();
-<a name="228" href="#228">228</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong> && foundCerts.length > 0) {
-<a name="229" href="#229">229</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
-<a name="230" href="#230">230</a> }
-<a name="231" href="#231">231</a> secretKey = samlKi.getSecret();
-<a name="232" href="#232">232</a> publicKey = samlKi.getPublicKey();
-<a name="233" href="#233">233</a> principal = createPrincipalFromSAML(assertion);
-<a name="234" href="#234">234</a> } <strong class="jxr_keyword">else</strong> {
-<a name="235" href="#235">235</a> parseBSTKeyIdentifier(secRef, crypto, wsDocInfo, data, bspCompliant);
-<a name="236" href="#236">236</a> }
-<a name="237" href="#237">237</a> } <strong class="jxr_keyword">else</strong> {
-<a name="238" href="#238">238</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="239" href="#239">239</a> WSSecurityException.INVALID_SECURITY,
-<a name="240" href="#240">240</a> <span class="jxr_string">"unsupportedKeyInfo"</span>,
-<a name="241" href="#241">241</a> <strong class="jxr_keyword">new</strong> Object[]{strElement.toString()}
-<a name="242" href="#242">242</a> );
-<a name="243" href="#243">243</a> }
-<a name="244" href="#244">244</a>
-<a name="245" href="#245">245</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong> && certs.length > 0 && principal == <strong class="jxr_keyword">null</strong>) {
-<a name="246" href="#246">246</a> principal = certs[0].getSubjectX500Principal();
-<a name="247" href="#247">247</a> }
+<a name="217" href="#217">217</a> parseSAMLKeyIdentifier(secRef, wsDocInfo, data, bspCompliant);
+<a name="218" href="#218">218</a> } <strong class="jxr_keyword">else</strong> {
+<a name="219" href="#219">219</a> parseBSTKeyIdentifier(secRef, crypto, wsDocInfo, data, bspCompliant);
+<a name="220" href="#220">220</a> }
+<a name="221" href="#221">221</a> } <strong class="jxr_keyword">else</strong> {
+<a name="222" href="#222">222</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="223" href="#223">223</a> WSSecurityException.INVALID_SECURITY,
+<a name="224" href="#224">224</a> <span class="jxr_string">"unsupportedKeyInfo"</span>,
+<a name="225" href="#225">225</a> <strong class="jxr_keyword">new</strong> Object[]{strElement.toString()}
+<a name="226" href="#226">226</a> );
+<a name="227" href="#227">227</a> }
+<a name="228" href="#228">228</a>
+<a name="229" href="#229">229</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong> && certs.length > 0 && principal == <strong class="jxr_keyword">null</strong>) {
+<a name="230" href="#230">230</a> principal = certs[0].getSubjectX500Principal();
+<a name="231" href="#231">231</a> }
+<a name="232" href="#232">232</a> }
+<a name="233" href="#233">233</a>
+<a name="234" href="#234">234</a> <em class="jxr_javadoccomment">/**</em>
+<a name="235" href="#235">235</a> <em class="jxr_javadoccomment"> * Get the X509Certificates associated with this SecurityTokenReference</em>
+<a name="236" href="#236">236</a> <em class="jxr_javadoccomment"> * @return the X509Certificates associated with this SecurityTokenReference</em>
+<a name="237" href="#237">237</a> <em class="jxr_javadoccomment"> */</em>
+<a name="238" href="#238">238</a> <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificates() {
+<a name="239" href="#239">239</a> <strong class="jxr_keyword">return</strong> certs;
+<a name="240" href="#240">240</a> }
+<a name="241" href="#241">241</a>
+<a name="242" href="#242">242</a> <em class="jxr_javadoccomment">/**</em>
+<a name="243" href="#243">243</a> <em class="jxr_javadoccomment"> * Get the Principal associated with this SecurityTokenReference</em>
+<a name="244" href="#244">244</a> <em class="jxr_javadoccomment"> * @return the Principal associated with this SecurityTokenReference</em>
+<a name="245" href="#245">245</a> <em class="jxr_javadoccomment"> */</em>
+<a name="246" href="#246">246</a> <strong class="jxr_keyword">public</strong> Principal getPrincipal() {
+<a name="247" href="#247">247</a> <strong class="jxr_keyword">return</strong> principal;
<a name="248" href="#248">248</a> }
<a name="249" href="#249">249</a>
<a name="250" href="#250">250</a> <em class="jxr_javadoccomment">/**</em>
-<a name="251" href="#251">251</a> <em class="jxr_javadoccomment"> * Get the X509Certificates associated with this SecurityTokenReference</em>
-<a name="252" href="#252">252</a> <em class="jxr_javadoccomment"> * @return the X509Certificates associated with this SecurityTokenReference</em>
+<a name="251" href="#251">251</a> <em class="jxr_javadoccomment"> * Get the PublicKey associated with this SecurityTokenReference</em>
+<a name="252" href="#252">252</a> <em class="jxr_javadoccomment"> * @return the PublicKey associated with this SecurityTokenReference</em>
<a name="253" href="#253">253</a> <em class="jxr_javadoccomment"> */</em>
-<a name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificates() {
-<a name="255" href="#255">255</a> <strong class="jxr_keyword">return</strong> certs;
+<a name="254" href="#254">254</a> <strong class="jxr_keyword">public</strong> PublicKey getPublicKey() {
+<a name="255" href="#255">255</a> <strong class="jxr_keyword">return</strong> publicKey;
<a name="256" href="#256">256</a> }
<a name="257" href="#257">257</a>
<a name="258" href="#258">258</a> <em class="jxr_javadoccomment">/**</em>
-<a name="259" href="#259">259</a> <em class="jxr_javadoccomment"> * Get the Principal associated with this SecurityTokenReference</em>
-<a name="260" href="#260">260</a> <em class="jxr_javadoccomment"> * @return the Principal associated with this SecurityTokenReference</em>
+<a name="259" href="#259">259</a> <em class="jxr_javadoccomment"> * Get the Secret Key associated with this SecurityTokenReference</em>
+<a name="260" href="#260">260</a> <em class="jxr_javadoccomment"> * @return the Secret Key associated with this SecurityTokenReference</em>
<a name="261" href="#261">261</a> <em class="jxr_javadoccomment"> */</em>
-<a name="262" href="#262">262</a> <strong class="jxr_keyword">public</strong> Principal getPrincipal() {
-<a name="263" href="#263">263</a> <strong class="jxr_keyword">return</strong> principal;
+<a name="262" href="#262">262</a> <strong class="jxr_keyword">public</strong> byte[] getSecretKey() {
+<a name="263" href="#263">263</a> <strong class="jxr_keyword">return</strong> secretKey;
<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 the PublicKey associated with this SecurityTokenReference</em>
-<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> * @return the PublicKey associated with this SecurityTokenReference</em>
-<a name="269" href="#269">269</a> <em class="jxr_javadoccomment"> */</em>
-<a name="270" href="#270">270</a> <strong class="jxr_keyword">public</strong> PublicKey getPublicKey() {
-<a name="271" href="#271">271</a> <strong class="jxr_keyword">return</strong> publicKey;
-<a name="272" href="#272">272</a> }
-<a name="273" href="#273">273</a>
-<a name="274" href="#274">274</a> <em class="jxr_javadoccomment">/**</em>
-<a name="275" href="#275">275</a> <em class="jxr_javadoccomment"> * Get the Secret Key associated with this SecurityTokenReference</em>
-<a name="276" href="#276">276</a> <em class="jxr_javadoccomment"> * @return the Secret Key associated with this SecurityTokenReference</em>
-<a name="277" href="#277">277</a> <em class="jxr_javadoccomment"> */</em>
-<a name="278" href="#278">278</a> <strong class="jxr_keyword">public</strong> byte[] getSecretKey() {
-<a name="279" href="#279">279</a> <strong class="jxr_keyword">return</strong> secretKey;
-<a name="280" href="#280">280</a> }
-<a name="281" href="#281">281</a>
-<a name="282" href="#282">282</a> <em class="jxr_javadoccomment">/**</em>
-<a name="283" href="#283">283</a> <em class="jxr_javadoccomment"> * Get whether the returned credential is already trusted or not. This is currently</em>
-<a name="284" href="#284">284</a> <em class="jxr_javadoccomment"> * applicable in the case of a credential extracted from a trusted HOK SAML Assertion,</em>
-<a name="285" href="#285">285</a> <em class="jxr_javadoccomment"> * and a BinarySecurityToken that has been processed by a Validator. In these cases,</em>
-<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * the SignatureProcessor does not need to verify trust on the credential.</em>
-<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> * @return true if trust has already been verified on the returned Credential</em>
-<a name="288" href="#288">288</a> <em class="jxr_javadoccomment"> */</em>
-<a name="289" href="#289">289</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrustedCredential() {
-<a name="290" href="#290">290</a> <strong class="jxr_keyword">return</strong> trustedCredential;
-<a name="291" href="#291">291</a> }
-<a name="292" href="#292">292</a>
-<a name="293" href="#293">293</a> <em class="jxr_javadoccomment">/**</em>
-<a name="294" href="#294">294</a> <em class="jxr_javadoccomment"> * Get how the certificates were referenced</em>
-<a name="295" href="#295">295</a> <em class="jxr_javadoccomment"> * @return how the certificates were referenced</em>
-<a name="296" href="#296">296</a> <em class="jxr_javadoccomment"> */</em>
-<a name="297" href="#297">297</a> <strong class="jxr_keyword">public</strong> REFERENCE_TYPE getCertificatesReferenceType() {
-<a name="298" href="#298">298</a> <strong class="jxr_keyword">return</strong> referenceType;
-<a name="299" href="#299">299</a> }
-<a name="300" href="#300">300</a>
-<a name="301" href="#301">301</a> <em class="jxr_javadoccomment">/**</em>
-<a name="302" href="#302">302</a> <em class="jxr_javadoccomment"> * A method to create a Principal from a SAML Assertion</em>
-<a name="303" href="#303">303</a> <em class="jxr_javadoccomment"> * @param assertion An AssertionWrapper object</em>
-<a name="304" href="#304">304</a> <em class="jxr_javadoccomment"> * @return A principal</em>
-<a name="305" href="#305">305</a> <em class="jxr_javadoccomment"> */</em>
-<a name="306" href="#306">306</a> <strong class="jxr_keyword">private</strong> Principal createPrincipalFromSAML(
-<a name="307" href="#307">307</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion
-<a name="308" href="#308">308</a> ) {
-<a name="309" href="#309">309</a> <a href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a> samlPrincipal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>(assertion);
-<a name="310" href="#310">310</a> String confirmMethod = <strong class="jxr_keyword">null</strong>;
-<a name="311" href="#311">311</a> List<String> methods = assertion.getConfirmationMethods();
-<a name="312" href="#312">312</a> <strong class="jxr_keyword">if</strong> (methods != <strong class="jxr_keyword">null</strong> && methods.size() > 0) {
-<a name="313" href="#313">313</a> confirmMethod = methods.get(0);
-<a name="314" href="#314">314</a> }
-<a name="315" href="#315">315</a> <strong class="jxr_keyword">if</strong> (OpenSAMLUtil.isMethodHolderOfKey(confirmMethod) && assertion.isSigned()) {
-<a name="316" href="#316">316</a> trustedCredential = <strong class="jxr_keyword">true</strong>;
-<a name="317" href="#317">317</a> }
-<a name="318" href="#318">318</a> <strong class="jxr_keyword">return</strong> samlPrincipal;
-<a name="319" href="#319">319</a> }
-<a name="320" href="#320">320</a>
-<a name="321" href="#321">321</a> <em class="jxr_javadoccomment">/**</em>
-<a name="322" href="#322">322</a> <em class="jxr_javadoccomment"> * Get the Secret Key from a CallbackHandler</em>
-<a name="323" href="#323">323</a> <em class="jxr_javadoccomment"> * @param id The id of the element</em>
-<a name="324" href="#324">324</a> <em class="jxr_javadoccomment"> * @param type The type of the element (can be null)</em>
-<a name="325" href="#325">325</a> <em class="jxr_javadoccomment"> * @param cb The CallbackHandler object</em>
-<a name="326" href="#326">326</a> <em class="jxr_javadoccomment"> * @return A Secret Key</em>
-<a name="327" href="#327">327</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="328" href="#328">328</a> <em class="jxr_javadoccomment"> */</em>
-<a name="329" href="#329">329</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromToken(
-<a name="330" href="#330">330</a> String id,
-<a name="331" href="#331">331</a> String type,
-<a name="332" href="#332">332</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
-<a name="333" href="#333">333</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="334" href="#334">334</a> <strong class="jxr_keyword">if</strong> (id.charAt(0) == '#') {
-<a name="335" href="#335">335</a> id = id.substring(1);
+<a name="267" href="#267">267</a> <em class="jxr_javadoccomment"> * Get whether the returned credential is already trusted or not. This is currently</em>
+<a name="268" href="#268">268</a> <em class="jxr_javadoccomment"> * applicable in the case of a credential extracted from a trusted HOK SAML Assertion,</em>
+<a name="269" href="#269">269</a> <em class="jxr_javadoccomment"> * and a BinarySecurityToken that has been processed by a Validator. In these cases,</em>
+<a name="270" href="#270">270</a> <em class="jxr_javadoccomment"> * the SignatureProcessor does not need to verify trust on the credential.</em>
+<a name="271" href="#271">271</a> <em class="jxr_javadoccomment"> * @return true if trust has already been verified on the returned Credential</em>
+<a name="272" href="#272">272</a> <em class="jxr_javadoccomment"> */</em>
+<a name="273" href="#273">273</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrustedCredential() {
+<a name="274" href="#274">274</a> <strong class="jxr_keyword">return</strong> trustedCredential;
+<a name="275" href="#275">275</a> }
+<a name="276" href="#276">276</a>
+<a name="277" href="#277">277</a> <em class="jxr_javadoccomment">/**</em>
+<a name="278" href="#278">278</a> <em class="jxr_javadoccomment"> * Get how the certificates were referenced</em>
+<a name="279" href="#279">279</a> <em class="jxr_javadoccomment"> * @return how the certificates were referenced</em>
+<a name="280" href="#280">280</a> <em class="jxr_javadoccomment"> */</em>
+<a name="281" href="#281">281</a> <strong class="jxr_keyword">public</strong> REFERENCE_TYPE getCertificatesReferenceType() {
+<a name="282" href="#282">282</a> <strong class="jxr_keyword">return</strong> referenceType;
+<a name="283" href="#283">283</a> }
+<a name="284" href="#284">284</a>
+<a name="285" href="#285">285</a> <em class="jxr_javadoccomment">/**</em>
+<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * A method to create a Principal from a SAML Assertion</em>
+<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> * @param assertion An AssertionWrapper object</em>
+<a name="288" href="#288">288</a> <em class="jxr_javadoccomment"> * @return A principal</em>
+<a name="289" href="#289">289</a> <em class="jxr_javadoccomment"> */</em>
+<a name="290" href="#290">290</a> <strong class="jxr_keyword">private</strong> Principal createPrincipalFromSAML(
+<a name="291" href="#291">291</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion
+<a name="292" href="#292">292</a> ) {
+<a name="293" href="#293">293</a> <a href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a> samlPrincipal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/SAMLTokenPrincipal.html">SAMLTokenPrincipal</a>(assertion);
+<a name="294" href="#294">294</a> String confirmMethod = <strong class="jxr_keyword">null</strong>;
+<a name="295" href="#295">295</a> List<String> methods = assertion.getConfirmationMethods();
+<a name="296" href="#296">296</a> <strong class="jxr_keyword">if</strong> (methods != <strong class="jxr_keyword">null</strong> && methods.size() > 0) {
+<a name="297" href="#297">297</a> confirmMethod = methods.get(0);
+<a name="298" href="#298">298</a> }
+<a name="299" href="#299">299</a> <strong class="jxr_keyword">if</strong> (OpenSAMLUtil.isMethodHolderOfKey(confirmMethod) && assertion.isSigned()) {
+<a name="300" href="#300">300</a> trustedCredential = <strong class="jxr_keyword">true</strong>;
+<a name="301" href="#301">301</a> }
+<a name="302" href="#302">302</a> <strong class="jxr_keyword">return</strong> samlPrincipal;
+<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 the Secret Key from a CallbackHandler</em>
+<a name="307" href="#307">307</a> <em class="jxr_javadoccomment"> * @param id The id of the element</em>
+<a name="308" href="#308">308</a> <em class="jxr_javadoccomment"> * @param type The type of the element (can be null)</em>
+<a name="309" href="#309">309</a> <em class="jxr_javadoccomment"> * @param cb The CallbackHandler object</em>
+<a name="310" href="#310">310</a> <em class="jxr_javadoccomment"> * @return A Secret Key</em>
+<a name="311" href="#311">311</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="312" href="#312">312</a> <em class="jxr_javadoccomment"> */</em>
+<a name="313" href="#313">313</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromToken(
+<a name="314" href="#314">314</a> String id,
+<a name="315" href="#315">315</a> String type,
+<a name="316" href="#316">316</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
+<a name="317" href="#317">317</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="318" href="#318">318</a> <strong class="jxr_keyword">if</strong> (id.charAt(0) == '#') {
+<a name="319" href="#319">319</a> id = id.substring(1);
+<a name="320" href="#320">320</a> }
+<a name="321" href="#321">321</a> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb =
+<a name="322" href="#322">322</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(id, <strong class="jxr_keyword">null</strong>, type, WSPasswordCallback.SECRET_KEY, data);
+<a name="323" href="#323">323</a> <strong class="jxr_keyword">try</strong> {
+<a name="324" href="#324">324</a> Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[]{pwcb};
+<a name="325" href="#325">325</a> <strong class="jxr_keyword">if</strong> (data.getCallbackHandler() != <strong class="jxr_keyword">null</strong>) {
+<a name="326" href="#326">326</a> data.getCallbackHandler().handle(callbacks);
+<a name="327" href="#327">327</a> <strong class="jxr_keyword">return</strong> pwcb.getKey();
+<a name="328" href="#328">328</a> }
+<a name="329" href="#329">329</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a name="330" href="#330">330</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="331" href="#331">331</a> WSSecurityException.FAILURE,
+<a name="332" href="#332">332</a> <span class="jxr_string">"noPassword"</span>,
+<a name="333" href="#333">333</a> <strong class="jxr_keyword">new</strong> Object[] {id},
+<a name="334" href="#334">334</a> e
+<a name="335" href="#335">335</a> );
<a name="336" href="#336">336</a> }
-<a name="337" href="#337">337</a> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb =
-<a name="338" href="#338">338</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(id, <strong class="jxr_keyword">null</strong>, type, WSPasswordCallback.SECRET_KEY, data);
-<a name="339" href="#339">339</a> <strong class="jxr_keyword">try</strong> {
-<a name="340" href="#340">340</a> Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[]{pwcb};
-<a name="341" href="#341">341</a> <strong class="jxr_keyword">if</strong> (data.getCallbackHandler() != <strong class="jxr_keyword">null</strong>) {
-<a name="342" href="#342">342</a> data.getCallbackHandler().handle(callbacks);
-<a name="343" href="#343">343</a> <strong class="jxr_keyword">return</strong> pwcb.getKey();
-<a name="344" href="#344">344</a> }
-<a name="345" href="#345">345</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a name="346" href="#346">346</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="347" href="#347">347</a> WSSecurityException.FAILURE,
-<a name="348" href="#348">348</a> <span class="jxr_string">"noPassword"</span>,
-<a name="349" href="#349">349</a> <strong class="jxr_keyword">new</strong> Object[] {id},
-<a name="350" href="#350">350</a> e
-<a name="351" href="#351">351</a> );
-<a name="352" href="#352">352</a> }
-<a name="353" href="#353">353</a>
-<a name="354" href="#354">354</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="355" href="#355">355</a> }
-<a name="356" href="#356">356</a>
-<a name="357" href="#357">357</a> <em class="jxr_javadoccomment">/**</em>
-<a name="358" href="#358">358</a> <em class="jxr_javadoccomment"> * Parse the KeyIdentifier for a BinarySecurityToken</em>
-<a name="359" href="#359">359</a> <em class="jxr_javadoccomment"> */</em>
-<a name="360" href="#360">360</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> parseBSTKeyIdentifier(
-<a name="361" href="#361">361</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
-<a name="362" href="#362">362</a> <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
-<a name="363" href="#363">363</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
-<a name="364" href="#364">364</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
-<a name="365" href="#365">365</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
-<a name="366" href="#366">366</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="367" href="#367">367</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="368" href="#368">368</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, <strong class="jxr_keyword">null</strong>);
+<a name="337" href="#337">337</a>
+<a name="338" href="#338">338</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="339" href="#339">339</a> }
+<a name="340" href="#340">340</a>
+<a name="341" href="#341">341</a> <em class="jxr_javadoccomment">/**</em>
+<a name="342" href="#342">342</a> <em class="jxr_javadoccomment"> * Parse the KeyIdentifier for a SAML Assertion</em>
+<a name="343" href="#343">343</a> <em class="jxr_javadoccomment"> */</em>
+<a name="344" href="#344">344</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> parseSAMLKeyIdentifier(
+<a name="345" href="#345">345</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
+<a name="346" href="#346">346</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
+<a name="347" href="#347">347</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
+<a name="348" href="#348">348</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
+<a name="349" href="#349">349</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="350" href="#350">350</a> String valueType = secRef.getKeyIdentifierValueType();
+<a name="351" href="#351">351</a> secretKey = getSecretKeyFromToken(secRef.getKeyIdentifierValue(), valueType, data);
+<a name="352" href="#352">352</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="353" href="#353">353</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
+<a name="354" href="#354">354</a> SAMLUtil.getAssertionFromKeyIdentifier(
+<a name="355" href="#355">355</a> secRef, secRef.getElement(), data, wsDocInfo
+<a name="356" href="#356">356</a> );
+<a name="357" href="#357">357</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="358" href="#358">358</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
+<a name="359" href="#359">359</a> }
+<a name="360" href="#360">360</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKi =
+<a name="361" href="#361">361</a> SAMLUtil.getCredentialFromSubject(assertion, data, wsDocInfo, bspCompliant);
+<a name="362" href="#362">362</a> X509Certificate[] foundCerts = samlKi.getCerts();
+<a name="363" href="#363">363</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong> && foundCerts.length > 0) {
+<a name="364" href="#364">364</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
+<a name="365" href="#365">365</a> }
+<a name="366" href="#366">366</a> secretKey = samlKi.getSecret();
+<a name="367" href="#367">367</a> publicKey = samlKi.getPublicKey();
+<a name="368" href="#368">368</a> principal = createPrincipalFromSAML(assertion);
<a name="369" href="#369">369</a> }
-<a name="370" href="#370">370</a> String valueType = secRef.getKeyIdentifierValueType();
-<a name="371" href="#371">371</a> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(valueType)) {
-<a name="372" href="#372">372</a> secretKey =
-<a name="373" href="#373">373</a> getSecretKeyFromToken(secRef.getKeyIdentifierValue(), valueType, data);
-<a name="374" href="#374">374</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="375" href="#375">375</a> byte[] keyBytes = secRef.getSKIBytes();
-<a name="376" href="#376">376</a> List<WSSecurityEngineResult> resultsList =
-<a name="377" href="#377">377</a> wsDocInfo.getResultsByTag(WSConstants.BST);
-<a name="378" href="#378">378</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
-<a name="379" href="#379">379</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
-<a name="380" href="#380">380</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-<a name="381" href="#381">381</a> byte[] tokenDigest = WSSecurityUtil.generateDigest(bstToken.getToken());
-<a name="382" href="#382">382</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(tokenDigest, keyBytes)) {
-<a name="383" href="#383">383</a> secretKey = (byte[])bstResult.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="384" href="#384">384</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-<a name="385" href="#385">385</a> <strong class="jxr_keyword">break</strong>;
-<a name="386" href="#386">386</a> }
-<a name="387" href="#387">387</a> }
-<a name="388" href="#388">388</a> } <strong class="jxr_keyword">else</strong> {
-<a name="389" href="#389">389</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(secRef.getKeyIdentifierValue());
-<a name="390" href="#390">390</a> }
-<a name="391" href="#391">391</a> } <strong class="jxr_keyword">else</strong> {
-<a name="392" href="#392">392</a> X509Certificate[] foundCerts = secRef.getKeyIdentifier(crypto);
-<a name="393" href="#393">393</a> <strong class="jxr_keyword">if</strong> (foundCerts == <strong class="jxr_keyword">null</strong>) {
-<a name="394" href="#394">394</a> <em class="jxr_comment">// The reference may be to a BST in the security header rather than in the keystore</em>
-<a name="395" href="#395">395</a> <strong class="jxr_keyword">if</strong> (SecurityTokenReference.SKI_URI.equals(valueType)) {
-<a name="396" href="#396">396</a> byte[] skiBytes = secRef.getSKIBytes();
-<a name="397" href="#397">397</a> List<WSSecurityEngineResult> resultsList =
-<a name="398" href="#398">398</a> wsDocInfo.getResultsByTag(WSConstants.BST);
-<a name="399" href="#399">399</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
-<a name="400" href="#400">400</a> X509Certificate[] certs =
-<a name="401" href="#401">401</a> (X509Certificate[])bstResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
-<a name="402" href="#402">402</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>
-<a name="403" href="#403">403</a> && Arrays.equals(skiBytes, crypto.getSKIBytesFromCert(certs[0]))) {
-<a name="404" href="#404">404</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-<a name="405" href="#405">405</a> foundCerts = certs;
-<a name="406" href="#406">406</a> <strong class="jxr_keyword">break</strong>;
-<a name="407" href="#407">407</a> }
-<a name="408" href="#408">408</a> }
-<a name="409" href="#409">409</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (SecurityTokenReference.THUMB_URI.equals(valueType)) {
-<a name="410" href="#410">410</a> String kiValue = secRef.getKeyIdentifierValue();
-<a name="411" href="#411">411</a> List<WSSecurityEngineResult> resultsList =
-<a name="412" href="#412">412</a> wsDocInfo.getResultsByTag(WSConstants.BST);
-<a name="413" href="#413">413</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
-<a name="414" href="#414">414</a> X509Certificate[] certs =
-<a name="415" href="#415">415</a> (X509Certificate[])bstResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
-<a name="416" href="#416">416</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
-<a name="417" href="#417">417</a> <strong class="jxr_keyword">try</strong> {
-<a name="418" href="#418">418</a> byte[] digest = WSSecurityUtil.generateDigest(certs[0].getEncoded());
-<a name="419" href="#419">419</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(Base64.decode(kiValue), digest)) {
-<a name="420" href="#420">420</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-<a name="421" href="#421">421</a> foundCerts = certs;
-<a name="422" href="#422">422</a> <strong class="jxr_keyword">break</strong>;
-<a name="423" href="#423">423</a> }
-<a name="424" href="#424">424</a> } <strong class="jxr_keyword">catch</strong> (CertificateEncodingException ex) {
-<a name="425" href="#425">425</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="426" href="#426">426</a> WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, <span class="jxr_string">"encodeError"</span>,
-<a name="427" href="#427">427</a> <strong class="jxr_keyword">null</strong>, ex
-<a name="428" href="#428">428</a> );
-<a name="429" href="#429">429</a> }
-<a name="430" href="#430">430</a> }
-<a name="431" href="#431">431</a> }
-<a name="432" href="#432">432</a> }
-<a name="433" href="#433">433</a> }
-<a name="434" href="#434">434</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
-<a name="435" href="#435">435</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
-<a name="436" href="#436">436</a> }
-<a name="437" href="#437">437</a> }
-<a name="438" href="#438">438</a> }
-<a name="439" href="#439">439</a>
-<a name="440" href="#440">440</a> <em class="jxr_javadoccomment">/**</em>
-<a name="441" href="#441">441</a> <em class="jxr_javadoccomment"> * Process a previous security result</em>
-<a name="442" href="#442">442</a> <em class="jxr_javadoccomment"> */</em>
-<a name="443" href="#443">443</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> processPreviousResult(
-<a name="444" href="#444">444</a> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a> result,
-<a name="445" href="#445">445</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
-<a name="446" href="#446">446</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
-<a name="447" href="#447">447</a> Map<String, Object> parameters,
-<a name="448" href="#448">448</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
-<a name="449" href="#449">449</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="450" href="#450">450</a> <strong class="jxr_keyword">int</strong> action = ((Integer)result.get(WSSecurityEngineResult.TAG_ACTION)).intValue();
-<a name="451" href="#451">451</a> <strong class="jxr_keyword">if</strong> (WSConstants.UT_NOPASSWORD == action || WSConstants.UT == action) {
-<a name="452" href="#452">452</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="453" href="#453">453</a> BSPEnforcer.checkUsernameTokenBSPCompliance(secRef);
-<a name="454" href="#454">454</a> }
-<a name="455" href="#455">455</a> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> usernameToken =
-<a name="456" href="#456">456</a> (<a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>)result.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
-<a name="457" href="#457">457</a>
-<a name="458" href="#458">458</a> usernameToken.setRawPassword(data);
-<a name="459" href="#459">459</a> <strong class="jxr_keyword">if</strong> (usernameToken.isDerivedKey()) {
-<a name="460" href="#460">460</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="461" href="#461">461</a> } <strong class="jxr_keyword">else</strong> {
-<a name="462" href="#462">462</a> <strong class="jxr_keyword">int</strong> keyLength = ((Integer)parameters.get(SECRET_KEY_LENGTH)).intValue();
-<a name="463" href="#463">463</a> secretKey = usernameToken.getSecretKey(keyLength);
-<a name="464" href="#464">464</a> }
-<a name="465" href="#465">465</a> principal = usernameToken.createPrincipal();
-<a name="466" href="#466">466</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.BST == action) {
+<a name="370" href="#370">370</a> }
+<a name="371" href="#371">371</a>
+<a name="372" href="#372">372</a> <em class="jxr_javadoccomment">/**</em>
+<a name="373" href="#373">373</a> <em class="jxr_javadoccomment"> * Parse the KeyIdentifier for a BinarySecurityToken</em>
+<a name="374" href="#374">374</a> <em class="jxr_javadoccomment"> */</em>
+<a name="375" href="#375">375</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> parseBSTKeyIdentifier(
+<a name="376" href="#376">376</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
+<a name="377" href="#377">377</a> <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
+<a name="378" href="#378">378</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
+<a name="379" href="#379">379</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
+<a name="380" href="#380">380</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
+<a name="381" href="#381">381</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="382" href="#382">382</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="383" href="#383">383</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, <strong class="jxr_keyword">null</strong>);
+<a name="384" href="#384">384</a> }
+<a name="385" href="#385">385</a> String valueType = secRef.getKeyIdentifierValueType();
+<a name="386" href="#386">386</a> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(valueType)) {
+<a name="387" href="#387">387</a> secretKey =
+<a name="388" href="#388">388</a> getSecretKeyFromToken(secRef.getKeyIdentifierValue(), valueType, data);
+<a name="389" href="#389">389</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="390" href="#390">390</a> byte[] keyBytes = secRef.getSKIBytes();
+<a name="391" href="#391">391</a> List<WSSecurityEngineResult> resultsList =
+<a name="392" href="#392">392</a> wsDocInfo.getResultsByTag(WSConstants.BST);
+<a name="393" href="#393">393</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
+<a name="394" href="#394">394</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
+<a name="395" href="#395">395</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
+<a name="396" href="#396">396</a> byte[] tokenDigest = WSSecurityUtil.generateDigest(bstToken.getToken());
+<a name="397" href="#397">397</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(tokenDigest, keyBytes)) {
+<a name="398" href="#398">398</a> secretKey = (byte[])bstResult.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="399" href="#399">399</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+<a name="400" href="#400">400</a> <strong class="jxr_keyword">break</strong>;
+<a name="401" href="#401">401</a> }
+<a name="402" href="#402">402</a> }
+<a name="403" href="#403">403</a> } <strong class="jxr_keyword">else</strong> {
+<a name="404" href="#404">404</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(secRef.getKeyIdentifierValue());
+<a name="405" href="#405">405</a> }
+<a name="406" href="#406">406</a> } <strong class="jxr_keyword">else</strong> {
+<a name="407" href="#407">407</a> X509Certificate[] foundCerts = secRef.getKeyIdentifier(crypto);
+<a name="408" href="#408">408</a> <strong class="jxr_keyword">if</strong> (foundCerts == <strong class="jxr_keyword">null</strong>) {
+<a name="409" href="#409">409</a> <em class="jxr_comment">// The reference may be to a BST in the security header rather than in the keystore</em>
+<a name="410" href="#410">410</a> <strong class="jxr_keyword">if</strong> (SecurityTokenReference.SKI_URI.equals(valueType)) {
+<a name="411" href="#411">411</a> byte[] skiBytes = secRef.getSKIBytes();
+<a name="412" href="#412">412</a> List<WSSecurityEngineResult> resultsList =
+<a name="413" href="#413">413</a> wsDocInfo.getResultsByTag(WSConstants.BST);
+<a name="414" href="#414">414</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
+<a name="415" href="#415">415</a> X509Certificate[] certs =
+<a name="416" href="#416">416</a> (X509Certificate[])bstResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
+<a name="417" href="#417">417</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>
+<a name="418" href="#418">418</a> && Arrays.equals(skiBytes, crypto.getSKIBytesFromCert(certs[0]))) {
+<a name="419" href="#419">419</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+<a name="420" href="#420">420</a> foundCerts = certs;
+<a name="421" href="#421">421</a> <strong class="jxr_keyword">break</strong>;
+<a name="422" href="#422">422</a> }
+<a name="423" href="#423">423</a> }
+<a name="424" href="#424">424</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (SecurityTokenReference.THUMB_URI.equals(valueType)) {
+<a name="425" href="#425">425</a> String kiValue = secRef.getKeyIdentifierValue();
+<a name="426" href="#426">426</a> List<WSSecurityEngineResult> resultsList =
+<a name="427" href="#427">427</a> wsDocInfo.getResultsByTag(WSConstants.BST);
+<a name="428" href="#428">428</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
+<a name="429" href="#429">429</a> X509Certificate[] certs =
+<a name="430" href="#430">430</a> (X509Certificate[])bstResult.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
+<a name="431" href="#431">431</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong>) {
+<a name="432" href="#432">432</a> <strong class="jxr_keyword">try</strong> {
+<a name="433" href="#433">433</a> byte[] digest = WSSecurityUtil.generateDigest(certs[0].getEncoded());
+<a name="434" href="#434">434</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(Base64.decode(kiValue), digest)) {
+<a name="435" href="#435">435</a> principal = (Principal)bstResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+<a name="436" href="#436">436</a> foundCerts = certs;
+<a name="437" href="#437">437</a> <strong class="jxr_keyword">break</strong>;
+<a name="438" href="#438">438</a> }
+<a name="439" href="#439">439</a> } <strong class="jxr_keyword">catch</strong> (CertificateEncodingException ex) {
+<a name="440" href="#440">440</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="441" href="#441">441</a> WSSecurityException.SECURITY_TOKEN_UNAVAILABLE, <span class="jxr_string">"encodeError"</span>,
+<a name="442" href="#442">442</a> <strong class="jxr_keyword">null</strong>, ex
+<a name="443" href="#443">443</a> );
+<a name="444" href="#444">444</a> }
+<a name="445" href="#445">445</a> }
+<a name="446" href="#446">446</a> }
+<a name="447" href="#447">447</a> }
+<a name="448" href="#448">448</a> }
+<a name="449" href="#449">449</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="450" href="#450">450</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
+<a name="451" href="#451">451</a> }
+<a name="452" href="#452">452</a> }
+<a name="453" href="#453">453</a> }
+<a name="454" href="#454">454</a>
+<a name="455" href="#455">455</a> <em class="jxr_javadoccomment">/**</em>
+<a name="456" href="#456">456</a> <em class="jxr_javadoccomment"> * Process a previous security result</em>
+<a name="457" href="#457">457</a> <em class="jxr_javadoccomment"> */</em>
+<a name="458" href="#458">458</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> processPreviousResult(
+<a name="459" href="#459">459</a> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a> result,
+<a name="460" href="#460">460</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
+<a name="461" href="#461">461</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
+<a name="462" href="#462">462</a> Map<String, Object> parameters,
+<a name="463" href="#463">463</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
+<a name="464" href="#464">464</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="465" href="#465">465</a> <strong class="jxr_keyword">int</strong> action = ((Integer)result.get(WSSecurityEngineResult.TAG_ACTION)).intValue();
+<a name="466" href="#466">466</a> <strong class="jxr_keyword">if</strong> (WSConstants.UT_NOPASSWORD == action || WSConstants.UT == action) {
<a name="467" href="#467">467</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="468" href="#468">468</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token =
-<a name="469" href="#469">469</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)result.get(
-<a name="470" href="#470">470</a> WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN
-<a name="471" href="#471">471</a> );
-<a name="472" href="#472">472</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, token);
-<a name="473" href="#473">473</a> }
-<a name="474" href="#474">474</a> certs =
-<a name="475" href="#475">475</a> (X509Certificate[])result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
-<a name="476" href="#476">476</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="477" href="#477">477</a> Boolean validatedToken =
-<a name="478" href="#478">478</a> (Boolean)result.get(WSSecurityEngineResult.TAG_VALIDATED_TOKEN);
-<a name="479" href="#479">479</a> <strong class="jxr_keyword">if</strong> (validatedToken.booleanValue()) {
-<a name="480" href="#480">480</a> trustedCredential = <strong class="jxr_keyword">true</strong>;
-<a name="481" href="#481">481</a> }
-<a name="482" href="#482">482</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ENCR == action) {
-<a name="483" href="#483">483</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="484" href="#484">484</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
-<a name="485" href="#485">485</a> }
-<a name="486" href="#486">486</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="487" href="#487">487</a> String id = (String)result.get(WSSecurityEngineResult.TAG_ID);
-<a name="488" href="#488">488</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(id);
-<a name="489" href="#489">489</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.SCT == action) {
-<a name="490" href="#490">490</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="491" href="#491">491</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a> sct =
-<a name="492" href="#492">492</a> (<a href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>)result.get(
-<a name="493" href="#493">493</a> WSSecurityEngineResult.TAG_SECURITY_CONTEXT_TOKEN
-<a name="494" href="#494">494</a> );
-<a name="495" href="#495">495</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(sct.getIdentifier());
-<a name="496" href="#496">496</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.DKT == action) {
-<a name="497" href="#497">497</a> <a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a> dkt =
-<a name="498" href="#498">498</a> (<a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a>)result.get(WSSecurityEngineResult.TAG_DERIVED_KEY_TOKEN);
-<a name="499" href="#499">499</a> <strong class="jxr_keyword">int</strong> keyLength = dkt.getLength();
-<a name="500" href="#500">500</a> <strong class="jxr_keyword">if</strong> (keyLength <= 0) {
-<a name="501" href="#501">501</a> String algorithm = (String)parameters.get(SIGNATURE_METHOD);
-<a name="502" href="#502">502</a> keyLength = WSSecurityUtil.getKeyLength(algorithm);
-<a name="503" href="#503">503</a> }
-<a name="504" href="#504">504</a> byte[] secret = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="505" href="#505">505</a> secretKey = dkt.deriveKey(keyLength, secret);
-<a name="506" href="#506">506</a> principal = dkt.createPrincipal();
-<a name="507" href="#507">507</a> ((<a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a>)principal).setSecret(secret);
-<a name="508" href="#508">508</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ST_UNSIGNED == action || WSConstants.ST_SIGNED == action) {
-<a name="509" href="#509">509</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
-<a name="510" href="#510">510</a> (<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a>)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
-<a name="511" href="#511">511</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="512" href="#512">512</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
-<a name="513" href="#513">513</a> }
-<a name="514" href="#514">514</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> keyInfo = assertion.getSubjectKeyInfo();
-<a name="515" href="#515">515</a> <strong class="jxr_keyword">if</strong> (keyInfo == <strong class="jxr_keyword">null</strong>) {
-<a name="516" href="#516">516</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="517" href="#517">517</a> WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>
-<a name="518" href="#518">518</a> );
-<a name="519" href="#519">519</a> }
-<a name="520" href="#520">520</a> X509Certificate[] foundCerts = keyInfo.getCerts();
-<a name="521" href="#521">521</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
-<a name="522" href="#522">522</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
-<a name="523" href="#523">523</a> }
-<a name="524" href="#524">524</a> secretKey = keyInfo.getSecret();
-<a name="525" href="#525">525</a> publicKey = keyInfo.getPublicKey();
-<a name="526" href="#526">526</a> principal = createPrincipalFromSAML(assertion);
-<a name="527" href="#527">527</a> }
-<a name="528" href="#528">528</a> }
-<a name="529" href="#529">529</a>
-<a name="530" href="#530">530</a>
-<a name="531" href="#531">531</a> }
+<a name="468" href="#468">468</a> BSPEnforcer.checkUsernameTokenBSPCompliance(secRef);
+<a name="469" href="#469">469</a> }
+<a name="470" href="#470">470</a> <a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a> usernameToken =
+<a name="471" href="#471">471</a> (<a href="../../../../../org/apache/ws/security/message/token/UsernameToken.html">UsernameToken</a>)result.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
+<a name="472" href="#472">472</a>
+<a name="473" href="#473">473</a> usernameToken.setRawPassword(data);
+<a name="474" href="#474">474</a> <strong class="jxr_keyword">if</strong> (usernameToken.isDerivedKey()) {
+<a name="475" href="#475">475</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="476" href="#476">476</a> } <strong class="jxr_keyword">else</strong> {
+<a name="477" href="#477">477</a> <strong class="jxr_keyword">int</strong> keyLength = ((Integer)parameters.get(SECRET_KEY_LENGTH)).intValue();
+<a name="478" href="#478">478</a> secretKey = usernameToken.getSecretKey(keyLength);
+<a name="479" href="#479">479</a> }
+<a name="480" href="#480">480</a> principal = usernameToken.createPrincipal();
+<a name="481" href="#481">481</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.BST == action) {
+<a name="482" href="#482">482</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="483" href="#483">483</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> token =
+<a name="484" href="#484">484</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)result.get(
+<a name="485" href="#485">485</a> WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN
+<a name="486" href="#486">486</a> );
+<a name="487" href="#487">487</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, token);
+<a name="488" href="#488">488</a> }
+<a name="489" href="#489">489</a> certs =
+<a name="490" href="#490">490</a> (X509Certificate[])result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATES);
+<a name="491" href="#491">491</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="492" href="#492">492</a> Boolean validatedToken =
+<a name="493" href="#493">493</a> (Boolean)result.get(WSSecurityEngineResult.TAG_VALIDATED_TOKEN);
+<a name="494" href="#494">494</a> <strong class="jxr_keyword">if</strong> (validatedToken.booleanValue()) {
+<a name="495" href="#495">495</a> trustedCredential = <strong class="jxr_keyword">true</strong>;
+<a name="496" href="#496">496</a> }
+<a name="497" href="#497">497</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ENCR == action) {
+<a name="498" href="#498">498</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="499" href="#499">499</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
+<a name="500" href="#500">500</a> }
+<a name="501" href="#501">501</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="502" href="#502">502</a> String id = (String)result.get(WSSecurityEngineResult.TAG_ID);
+<a name="503" href="#503">503</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(id);
+<a name="504" href="#504">504</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.SCT == action) {
+<a name="505" href="#505">505</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="506" href="#506">506</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a> sct =
+<a name="507" href="#507">507</a> (<a href="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html">SecurityContextToken</a>)result.get(
+<a name="508" href="#508">508</a> WSSecurityEngineResult.TAG_SECURITY_CONTEXT_TOKEN
+<a name="509" href="#509">509</a> );
+<a name="510" href="#510">510</a> principal = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/CustomTokenPrincipal.html">CustomTokenPrincipal</a>(sct.getIdentifier());
+<a name="511" href="#511">511</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.DKT == action) {
+<a name="512" href="#512">512</a> <a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a> dkt =
+<a name="513" href="#513">513</a> (<a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a>)result.get(WSSecurityEngineResult.TAG_DERIVED_KEY_TOKEN);
+<a name="514" href="#514">514</a> <strong class="jxr_keyword">int</strong> keyLength = dkt.getLength();
+<a name="515" href="#515">515</a> <strong class="jxr_keyword">if</strong> (keyLength <= 0) {
+<a name="516" href="#516">516</a> String algorithm = (String)parameters.get(SIGNATURE_METHOD);
+<a name="517" href="#517">517</a> keyLength = WSSecurityUtil.getKeyLength(algorithm);
+<a name="518" href="#518">518</a> }
+<a name="519" href="#519">519</a> byte[] secret = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="520" href="#520">520</a> secretKey = dkt.deriveKey(keyLength, secret);
+<a name="521" href="#521">521</a> principal = dkt.createPrincipal();
+<a name="522" href="#522">522</a> ((<a href="../../../../../org/apache/ws/security/WSDerivedKeyTokenPrincipal.html">WSDerivedKeyTokenPrincipal</a>)principal).setSecret(secret);
+<a name="523" href="#523">523</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ST_UNSIGNED == action || WSConstants.ST_SIGNED == action) {
+<a name="524" href="#524">524</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
+<a name="525" href="#525">525</a> (<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a>)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+<a name="526" href="#526">526</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="527" href="#527">527</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
+<a name="528" href="#528">528</a> }
+<a name="529" href="#529">529</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> keyInfo = assertion.getSubjectKeyInfo();
+<a name="530" href="#530">530</a> <strong class="jxr_keyword">if</strong> (keyInfo == <strong class="jxr_keyword">null</strong>) {
+<a name="531" href="#531">531</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="532" href="#532">532</a> WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>
+<a name="533" href="#533">533</a> );
+<a name="534" href="#534">534</a> }
+<a name="535" href="#535">535</a> X509Certificate[] foundCerts = keyInfo.getCerts();
+<a name="536" href="#536">536</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="537" href="#537">537</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
+<a name="538" href="#538">538</a> }
+<a name="539" href="#539">539</a> secretKey = keyInfo.getSecret();
+<a name="540" href="#540">540</a> publicKey = keyInfo.getPublicKey();
+<a name="541" href="#541">541</a> principal = createPrincipalFromSAML(assertion);
+<a name="542" href="#542">542</a> }
+<a name="543" href="#543">543</a> }
+<a name="544" href="#544">544</a>
+<a name="545" href="#545">545</a>
+<a name="546" href="#546">546</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/str/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.str</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.str</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.str</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.str</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.transform</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.transform</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.transform</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.transform</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/util/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/util/package-frame.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/util/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/util/package-frame.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.util</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.util</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/util/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/util/package-summary.html?rev=1367668&r1=1367667&r2=1367668&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/util/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/util/package-summary.html Tue Jul 31 16:30:10 2012
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
- <title>WSS4J 1.6.6 Reference Package org.apache.ws.security.util</title>
+ <title>WSS4J 1.6.7 Reference Package org.apache.ws.security.util</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>