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/01/17 16:49:30 UTC

svn commit: r1059959 [18/20] - in /webservices/wss4j/site: ./ apidocs/ apidocs/org/apache/ws/axis/security/ apidocs/org/apache/ws/axis/security/class-use/ apidocs/org/apache/ws/axis/security/handler/ apidocs/org/apache/ws/axis/security/handler/class-us...

Modified: webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html?rev=1059959&r1=1059958&r2=1059959&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/processor/package-frame.html Mon Jan 17 15:49:15 2011
@@ -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.5.10 Reference Package org.apache.ws.security.processor</title>
+		<title>WSS4J 1.5.11 Reference Package org.apache.ws.security.processor</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html?rev=1059959&r1=1059958&r2=1059959&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/processor/package-summary.html Mon Jan 17 15:49:15 2011
@@ -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.5.10 Reference Package org.apache.ws.security.processor</title>
+		<title>WSS4J 1.5.11 Reference Package org.apache.ws.security.processor</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -122,6 +122,6 @@
         	</ul>
       	</div>
 				<hr />
-		Copyright &copy; 2004-2010 The Apache Software Foundation. All Rights Reserved.
+		Copyright &copy; 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/saml/SAMLUtil.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/SAMLUtil.html?rev=1059959&r1=1059958&r2=1059959&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/saml/SAMLUtil.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/saml/SAMLUtil.html Mon Jan 17 15:49:15 2011
@@ -44,249 +44,257 @@
 <a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.keys.KeyInfo;
 <a name="35" href="#35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.keys.content.X509Data;
 <a name="36" href="#36">36</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.keys.content.x509.XMLX509Certificate;
-<a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAssertion;
-<a name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAttributeStatement;
-<a name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAuthenticationStatement;
-<a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLException;
-<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLObject;
-<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLStatement;
-<a name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLSubject;
-<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLSubjectStatement;
-<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Element;
-<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Node;
-<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList;
-<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Text;
-<a name="49" href="#49">49</a>  
-<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
-<a name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
-<a name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> javax.xml.namespace.QName;
-<a name="53" href="#53">53</a>  
-<a name="54" href="#54">54</a>  <strong class="jxr_keyword">import</strong> java.security.PublicKey;
-<a name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> java.security.cert.X509Certificate;
-<a name="56" href="#56">56</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
-<a name="57" href="#57">57</a>  
-<a name="58" href="#58">58</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="59" href="#59">59</a>  <em class="jxr_javadoccomment"> * Utility methods for SAML stuff</em>
-<a name="60" href="#60">60</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="61" href="#61">61</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLUtil.html">SAMLUtil</a> {
-<a name="62" href="#62">62</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Log log = LogFactory.getLog(SAMLUtil.<strong class="jxr_keyword">class</strong>.getName());
-<a name="63" href="#63">63</a>  
-<a name="64" href="#64">64</a>      
+<a name="37" href="#37">37</a>  <strong class="jxr_keyword">import</strong> org.apache.xml.security.keys.content.x509.XMLX509IssuerSerial;
+<a name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAssertion;
+<a name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAttributeStatement;
+<a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLAuthenticationStatement;
+<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLException;
+<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLObject;
+<a name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLStatement;
+<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLSubject;
+<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> org.opensaml.SAMLSubjectStatement;
+<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Element;
+<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Node;
+<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.NodeList;
+<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Text;
+<a name="50" href="#50">50</a>  
+<a name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
+<a name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
+<a name="53" href="#53">53</a>  <strong class="jxr_keyword">import</strong> javax.xml.namespace.QName;
+<a name="54" href="#54">54</a>  
+<a name="55" href="#55">55</a>  <strong class="jxr_keyword">import</strong> java.security.PublicKey;
+<a name="56" href="#56">56</a>  <strong class="jxr_keyword">import</strong> java.security.cert.X509Certificate;
+<a name="57" href="#57">57</a>  <strong class="jxr_keyword">import</strong> java.util.Iterator;
+<a name="58" href="#58">58</a>  
+<a name="59" href="#59">59</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="60" href="#60">60</a>  <em class="jxr_javadoccomment"> * Utility methods for SAML stuff</em>
+<a name="61" href="#61">61</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="62" href="#62">62</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLUtil.html">SAMLUtil</a> {
+<a name="63" href="#63">63</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> Log log = LogFactory.getLog(SAMLUtil.<strong class="jxr_keyword">class</strong>.getName());
+<a name="64" href="#64">64</a>  
 <a name="65" href="#65">65</a>      
-<a name="66" href="#66">66</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="67" href="#67">67</a>  <em class="jxr_javadoccomment">     * Extract certificates or the key available in the SAMLAssertion</em>
-<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     * @param elem</em>
-<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * @return the SAML Key Info</em>
-<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
-<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="72" href="#72">72</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> getSAMLKeyInfo(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
-<a name="73" href="#73">73</a>              CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="74" href="#74">74</a>          SAMLAssertion assertion;
-<a name="75" href="#75">75</a>          <strong class="jxr_keyword">try</strong> {
-<a name="76" href="#76">76</a>              assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(elem);
-<a name="77" href="#77">77</a>              <strong class="jxr_keyword">return</strong> getSAMLKeyInfo(assertion, crypto, cb);
-<a name="78" href="#78">78</a>          } <strong class="jxr_keyword">catch</strong> (SAMLException e) {
-<a name="79" href="#79">79</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="80" href="#80">80</a>                      <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (cannot parse)"</span>}, e);
-<a name="81" href="#81">81</a>          }
-<a name="82" href="#82">82</a>  
-<a name="83" href="#83">83</a>      }
-<a name="84" href="#84">84</a>      
-<a name="85" href="#85">85</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> getSAMLKeyInfo(SAMLAssertion assertion, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
-<a name="86" href="#86">86</a>              CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="87" href="#87">87</a>          
-<a name="88" href="#88">88</a>          <em class="jxr_comment">//First ask the cb whether it can provide the secret</em>
-<a name="89" href="#89">89</a>          <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(assertion.getId(), WSPasswordCallback.CUSTOM_TOKEN);
-<a name="90" href="#90">90</a>          <strong class="jxr_keyword">if</strong> (cb != <strong class="jxr_keyword">null</strong>) {
-<a name="91" href="#91">91</a>              <strong class="jxr_keyword">try</strong> {
-<a name="92" href="#92">92</a>                  cb.handle(<strong class="jxr_keyword">new</strong> Callback[]{pwcb});
-<a name="93" href="#93">93</a>              } <strong class="jxr_keyword">catch</strong> (Exception e1) {
-<a name="94" href="#94">94</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noKey"</span>,
-<a name="95" href="#95">95</a>                          <strong class="jxr_keyword">new</strong> Object[] { assertion.getId() }, e1);
-<a name="96" href="#96">96</a>              }
-<a name="97" href="#97">97</a>          }
-<a name="98" href="#98">98</a>          
-<a name="99" href="#99">99</a>          byte[] key = pwcb.getKey();
-<a name="100" href="#100">100</a>         
-<a name="101" href="#101">101</a>         <strong class="jxr_keyword">if</strong> (key != <strong class="jxr_keyword">null</strong>) {
-<a name="102" href="#102">102</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, key);
-<a name="103" href="#103">103</a>         } <strong class="jxr_keyword">else</strong> {
-<a name="104" href="#104">104</a>             Iterator statements = assertion.getStatements();
-<a name="105" href="#105">105</a>             <strong class="jxr_keyword">while</strong> (statements.hasNext()) {
-<a name="106" href="#106">106</a>                 SAMLStatement stmt = (SAMLStatement) statements.next();
-<a name="107" href="#107">107</a>                 <strong class="jxr_keyword">if</strong> (stmt instanceof SAMLAttributeStatement) {
-<a name="108" href="#108">108</a>                     SAMLAttributeStatement attrStmt = (SAMLAttributeStatement) stmt;
-<a name="109" href="#109">109</a>                     SAMLSubject samlSubject = attrStmt.getSubject();
-<a name="110" href="#110">110</a>                     Element kiElem = samlSubject.getKeyInfo();
-<a name="111" href="#111">111</a>                     
-<a name="112" href="#112">112</a>                     NodeList children = kiElem.getChildNodes();
-<a name="113" href="#113">113</a>                     <strong class="jxr_keyword">int</strong> len = children.getLength();
-<a name="114" href="#114">114</a>                     
-<a name="115" href="#115">115</a>                     <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; len; i++) {
-<a name="116" href="#116">116</a>                         Node child = children.item(i);
-<a name="117" href="#117">117</a>                         <strong class="jxr_keyword">if</strong> (child.getNodeType() != Node.ELEMENT_NODE) {
-<a name="118" href="#118">118</a>                             <strong class="jxr_keyword">continue</strong>;
-<a name="119" href="#119">119</a>                         }
-<a name="120" href="#120">120</a>                         QName el = <strong class="jxr_keyword">new</strong> QName(child.getNamespaceURI(), child.getLocalName());
-<a name="121" href="#121">121</a>                         <strong class="jxr_keyword">if</strong> (el.equals(WSSecurityEngine.ENCRYPTED_KEY)) {
-<a name="122" href="#122">122</a>                             
-<a name="123" href="#123">123</a>                             <a href="../../../../../org/apache/ws/security/processor/EncryptedKeyProcessor.html">EncryptedKeyProcessor</a> proc = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/processor/EncryptedKeyProcessor.html">EncryptedKeyProcessor</a>();
-<a name="124" href="#124">124</a>                             proc.handleEncryptedKey((Element)child, cb, crypto, <strong class="jxr_keyword">null</strong>);
-<a name="125" href="#125">125</a>                             
-<a name="126" href="#126">126</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, proc.getDecryptedBytes());
-<a name="127" href="#127">127</a>                         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (el.equals(<strong class="jxr_keyword">new</strong> QName(WSConstants.WST_NS, <span class="jxr_string">"BinarySecret"</span>))) {
-<a name="128" href="#128">128</a>                             Text txt = (Text)child.getFirstChild();
-<a name="129" href="#129">129</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, Base64.decode(txt.getData()));
-<a name="130" href="#130">130</a>                         }
-<a name="131" href="#131">131</a>                     }
-<a name="132" href="#132">132</a> 
-<a name="133" href="#133">133</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (stmt instanceof SAMLAuthenticationStatement) {
-<a name="134" href="#134">134</a>                     SAMLAuthenticationStatement authStmt = (SAMLAuthenticationStatement)stmt;
-<a name="135" href="#135">135</a>                     SAMLSubject samlSubj = authStmt.getSubject(); 
-<a name="136" href="#136">136</a>                     <strong class="jxr_keyword">if</strong> (samlSubj == <strong class="jxr_keyword">null</strong>) {
-<a name="137" href="#137">137</a>                         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="138" href="#138">138</a>                                 <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (no Subject)"</span>});
-<a name="139" href="#139">139</a>                     }
-<a name="140" href="#140">140</a> 
-<a name="141" href="#141">141</a>                     Element e = samlSubj.getKeyInfo();
-<a name="142" href="#142">142</a>                     X509Certificate[] certs = <strong class="jxr_keyword">null</strong>;
-<a name="143" href="#143">143</a>                     <strong class="jxr_keyword">try</strong> {
-<a name="144" href="#144">144</a>                         KeyInfo ki = <strong class="jxr_keyword">new</strong> KeyInfo(e, <strong class="jxr_keyword">null</strong>);
-<a name="145" href="#145">145</a> 
-<a name="146" href="#146">146</a>                         <strong class="jxr_keyword">if</strong> (ki.containsX509Data()) {
-<a name="147" href="#147">147</a>                             X509Data data = ki.itemX509Data(0);
-<a name="148" href="#148">148</a>                             XMLX509Certificate certElem = <strong class="jxr_keyword">null</strong>;
+<a name="66" href="#66">66</a>      
+<a name="67" href="#67">67</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     * Extract certificates or the key available in the SAMLAssertion</em>
+<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * @param elem</em>
+<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * @return the SAML Key Info</em>
+<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
+<a name="72" href="#72">72</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="73" href="#73">73</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> getSAMLKeyInfo(Element elem, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
+<a name="74" href="#74">74</a>              CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="75" href="#75">75</a>          SAMLAssertion assertion;
+<a name="76" href="#76">76</a>          <strong class="jxr_keyword">try</strong> {
+<a name="77" href="#77">77</a>              assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(elem);
+<a name="78" href="#78">78</a>              <strong class="jxr_keyword">return</strong> getSAMLKeyInfo(assertion, crypto, cb);
+<a name="79" href="#79">79</a>          } <strong class="jxr_keyword">catch</strong> (SAMLException e) {
+<a name="80" href="#80">80</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="81" href="#81">81</a>                      <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (cannot parse)"</span>}, e);
+<a name="82" href="#82">82</a>          }
+<a name="83" href="#83">83</a>  
+<a name="84" href="#84">84</a>      }
+<a name="85" href="#85">85</a>      
+<a name="86" href="#86">86</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> getSAMLKeyInfo(SAMLAssertion assertion, <a href="../../../../../org/apache/ws/security/components/crypto/Crypto.html">Crypto</a> crypto,
+<a name="87" href="#87">87</a>              CallbackHandler cb) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="88" href="#88">88</a>          
+<a name="89" href="#89">89</a>          <em class="jxr_comment">//First ask the cb whether it can provide the secret</em>
+<a name="90" href="#90">90</a>          <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(assertion.getId(), WSPasswordCallback.CUSTOM_TOKEN);
+<a name="91" href="#91">91</a>          <strong class="jxr_keyword">if</strong> (cb != <strong class="jxr_keyword">null</strong>) {
+<a name="92" href="#92">92</a>              <strong class="jxr_keyword">try</strong> {
+<a name="93" href="#93">93</a>                  cb.handle(<strong class="jxr_keyword">new</strong> Callback[]{pwcb});
+<a name="94" href="#94">94</a>              } <strong class="jxr_keyword">catch</strong> (Exception e1) {
+<a name="95" href="#95">95</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noKey"</span>,
+<a name="96" href="#96">96</a>                          <strong class="jxr_keyword">new</strong> Object[] { assertion.getId() }, e1);
+<a name="97" href="#97">97</a>              }
+<a name="98" href="#98">98</a>          }
+<a name="99" href="#99">99</a>          
+<a name="100" href="#100">100</a>         byte[] key = pwcb.getKey();
+<a name="101" href="#101">101</a>         
+<a name="102" href="#102">102</a>         <strong class="jxr_keyword">if</strong> (key != <strong class="jxr_keyword">null</strong>) {
+<a name="103" href="#103">103</a>             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, key);
+<a name="104" href="#104">104</a>         } <strong class="jxr_keyword">else</strong> {
+<a name="105" href="#105">105</a>             Iterator statements = assertion.getStatements();
+<a name="106" href="#106">106</a>             <strong class="jxr_keyword">while</strong> (statements.hasNext()) {
+<a name="107" href="#107">107</a>                 SAMLStatement stmt = (SAMLStatement) statements.next();
+<a name="108" href="#108">108</a>                 <strong class="jxr_keyword">if</strong> (stmt instanceof SAMLAttributeStatement) {
+<a name="109" href="#109">109</a>                     SAMLAttributeStatement attrStmt = (SAMLAttributeStatement) stmt;
+<a name="110" href="#110">110</a>                     SAMLSubject samlSubject = attrStmt.getSubject();
+<a name="111" href="#111">111</a>                     Element kiElem = samlSubject.getKeyInfo();
+<a name="112" href="#112">112</a>                     
+<a name="113" href="#113">113</a>                     NodeList children = kiElem.getChildNodes();
+<a name="114" href="#114">114</a>                     <strong class="jxr_keyword">int</strong> len = children.getLength();
+<a name="115" href="#115">115</a>                     
+<a name="116" href="#116">116</a>                     <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; len; i++) {
+<a name="117" href="#117">117</a>                         Node child = children.item(i);
+<a name="118" href="#118">118</a>                         <strong class="jxr_keyword">if</strong> (child.getNodeType() != Node.ELEMENT_NODE) {
+<a name="119" href="#119">119</a>                             <strong class="jxr_keyword">continue</strong>;
+<a name="120" href="#120">120</a>                         }
+<a name="121" href="#121">121</a>                         QName el = <strong class="jxr_keyword">new</strong> QName(child.getNamespaceURI(), child.getLocalName());
+<a name="122" href="#122">122</a>                         <strong class="jxr_keyword">if</strong> (el.equals(WSSecurityEngine.ENCRYPTED_KEY)) {
+<a name="123" href="#123">123</a>                             
+<a name="124" href="#124">124</a>                             <a href="../../../../../org/apache/ws/security/processor/EncryptedKeyProcessor.html">EncryptedKeyProcessor</a> proc = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/processor/EncryptedKeyProcessor.html">EncryptedKeyProcessor</a>();
+<a name="125" href="#125">125</a>                             proc.handleEncryptedKey((Element)child, cb, crypto, <strong class="jxr_keyword">null</strong>);
+<a name="126" href="#126">126</a>                             
+<a name="127" href="#127">127</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, proc.getDecryptedBytes());
+<a name="128" href="#128">128</a>                         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (el.equals(<strong class="jxr_keyword">new</strong> QName(WSConstants.WST_NS, <span class="jxr_string">"BinarySecret"</span>))) {
+<a name="129" href="#129">129</a>                             Text txt = (Text)child.getFirstChild();
+<a name="130" href="#130">130</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, Base64.decode(txt.getData()));
+<a name="131" href="#131">131</a>                         }
+<a name="132" href="#132">132</a>                     }
+<a name="133" href="#133">133</a> 
+<a name="134" href="#134">134</a>                 } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (stmt instanceof SAMLAuthenticationStatement) {
+<a name="135" href="#135">135</a>                     SAMLAuthenticationStatement authStmt = (SAMLAuthenticationStatement)stmt;
+<a name="136" href="#136">136</a>                     SAMLSubject samlSubj = authStmt.getSubject(); 
+<a name="137" href="#137">137</a>                     <strong class="jxr_keyword">if</strong> (samlSubj == <strong class="jxr_keyword">null</strong>) {
+<a name="138" href="#138">138</a>                         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="139" href="#139">139</a>                                 <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (no Subject)"</span>});
+<a name="140" href="#140">140</a>                     }
+<a name="141" href="#141">141</a> 
+<a name="142" href="#142">142</a>                     Element e = samlSubj.getKeyInfo();
+<a name="143" href="#143">143</a>                     X509Certificate[] certs = <strong class="jxr_keyword">null</strong>;
+<a name="144" href="#144">144</a>                     <strong class="jxr_keyword">try</strong> {
+<a name="145" href="#145">145</a>                         KeyInfo ki = <strong class="jxr_keyword">new</strong> KeyInfo(e, <strong class="jxr_keyword">null</strong>);
+<a name="146" href="#146">146</a> 
+<a name="147" href="#147">147</a>                         <strong class="jxr_keyword">if</strong> (ki.containsX509Data()) {
+<a name="148" href="#148">148</a>                             X509Data data = ki.itemX509Data(0);
 <a name="149" href="#149">149</a>                             <strong class="jxr_keyword">if</strong> (data != <strong class="jxr_keyword">null</strong> &amp;&amp; data.containsCertificate()) {
-<a name="150" href="#150">150</a>                                 certElem = data.itemCertificate(0);
-<a name="151" href="#151">151</a>                             }
-<a name="152" href="#152">152</a>                             <strong class="jxr_keyword">if</strong> (certElem != <strong class="jxr_keyword">null</strong>) {
-<a name="153" href="#153">153</a>                                 X509Certificate cert = certElem.getX509Certificate();
-<a name="154" href="#154">154</a>                                 certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
-<a name="155" href="#155">155</a>                                 certs[0] = cert;
-<a name="156" href="#156">156</a>                                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, certs);
-<a name="157" href="#157">157</a>                             }
-<a name="158" href="#158">158</a>                         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ki.containsKeyValue()) {
-<a name="159" href="#159">159</a>                             PublicKey pk = ki.getPublicKey();
-<a name="160" href="#160">160</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, pk);
-<a name="161" href="#161">161</a>                         }
-<a name="162" href="#162">162</a>                     } <strong class="jxr_keyword">catch</strong> (XMLSecurityException e3) {
-<a name="163" href="#163">163</a>                         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="164" href="#164">164</a>                                 <span class="jxr_string">"invalidSAMLsecurity"</span>,
-<a name="165" href="#165">165</a>                                 <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate (key holder)"</span>}, e3);
-<a name="166" href="#166">166</a>                     }
-<a name="167" href="#167">167</a>                     
-<a name="168" href="#168">168</a>                 } <strong class="jxr_keyword">else</strong> {
-<a name="169" href="#169">169</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="170" href="#170">170</a>                             <span class="jxr_string">"invalidSAMLsecurity"</span>,
-<a name="171" href="#171">171</a>                             <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate or key "</span>});
-<a name="172" href="#172">172</a>                 }
-<a name="173" href="#173">173</a>             }
-<a name="174" href="#174">174</a>             
-<a name="175" href="#175">175</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="176" href="#176">176</a>                     <span class="jxr_string">"invalidSAMLsecurity"</span>,
-<a name="177" href="#177">177</a>                     <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate or key "</span>});
-<a name="178" href="#178">178</a>                         
-<a name="179" href="#179">179</a>         }
-<a name="180" href="#180">180</a> 
-<a name="181" href="#181">181</a>     }
-<a name="182" href="#182">182</a>     
-<a name="183" href="#183">183</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="184" href="#184">184</a> <em class="jxr_javadoccomment">     * Extracts the certificate(s) from the SAML token reference.</em>
-<a name="185" href="#185">185</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
-<a name="186" href="#186">186</a> <em class="jxr_javadoccomment">     *</em>
-<a name="187" href="#187">187</a> <em class="jxr_javadoccomment">     * @param elem The element containing the SAML token.</em>
-<a name="188" href="#188">188</a> <em class="jxr_javadoccomment">     * @return an array of X509 certificates</em>
-<a name="189" href="#189">189</a> <em class="jxr_javadoccomment">     * @throws org.apache.ws.security.WSSecurityException</em>
-<a name="190" href="#190">190</a> <em class="jxr_javadoccomment">     */</em>
-<a name="191" href="#191">191</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> X509Certificate[] getCertificatesFromSAML(Element elem)
-<a name="192" href="#192">192</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="193" href="#193">193</a> 
-<a name="194" href="#194">194</a>         <em class="jxr_comment">/*</em>
-<a name="195" href="#195">195</a> <em class="jxr_comment">         * Get some information about the SAML token content. This controls how</em>
-<a name="196" href="#196">196</a> <em class="jxr_comment">         * to deal with the whole stuff. First get the Authentication statement</em>
-<a name="197" href="#197">197</a> <em class="jxr_comment">         * (includes Subject), then get the _first_ confirmation method only.</em>
-<a name="198" href="#198">198</a> <em class="jxr_comment">         */</em>
-<a name="199" href="#199">199</a>         SAMLAssertion assertion;
-<a name="200" href="#200">200</a>         <strong class="jxr_keyword">try</strong> {
-<a name="201" href="#201">201</a>             assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(elem);
-<a name="202" href="#202">202</a>         } <strong class="jxr_keyword">catch</strong> (SAMLException e) {
-<a name="203" href="#203">203</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="204" href="#204">204</a>                     <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (cannot parse)"</span>}, e);
-<a name="205" href="#205">205</a>         }
-<a name="206" href="#206">206</a>         SAMLSubjectStatement samlSubjS = <strong class="jxr_keyword">null</strong>;
-<a name="207" href="#207">207</a>         Iterator it = assertion.getStatements();
-<a name="208" href="#208">208</a>         <strong class="jxr_keyword">while</strong> (it.hasNext()) {
-<a name="209" href="#209">209</a>             SAMLObject so = (SAMLObject) it.next();
-<a name="210" href="#210">210</a>             <strong class="jxr_keyword">if</strong> (so instanceof SAMLSubjectStatement) {
-<a name="211" href="#211">211</a>                 samlSubjS = (SAMLSubjectStatement) so;
-<a name="212" href="#212">212</a>                 <strong class="jxr_keyword">break</strong>;
-<a name="213" href="#213">213</a>             }
-<a name="214" href="#214">214</a>         }
-<a name="215" href="#215">215</a>         SAMLSubject samlSubj = <strong class="jxr_keyword">null</strong>;
-<a name="216" href="#216">216</a>         <strong class="jxr_keyword">if</strong> (samlSubjS != <strong class="jxr_keyword">null</strong>) {
-<a name="217" href="#217">217</a>             samlSubj = samlSubjS.getSubject();
-<a name="218" href="#218">218</a>         }
-<a name="219" href="#219">219</a>         <strong class="jxr_keyword">if</strong> (samlSubj == <strong class="jxr_keyword">null</strong>) {
-<a name="220" href="#220">220</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="221" href="#221">221</a>                     <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (no Subject)"</span>});
+<a name="150" href="#150">150</a>                                 XMLX509Certificate certElem = data.itemCertificate(0);
+<a name="151" href="#151">151</a>                                 <strong class="jxr_keyword">if</strong> (certElem != <strong class="jxr_keyword">null</strong>) {
+<a name="152" href="#152">152</a>                                     X509Certificate cert = certElem.getX509Certificate();
+<a name="153" href="#153">153</a>                                     certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
+<a name="154" href="#154">154</a>                                     certs[0] = cert;
+<a name="155" href="#155">155</a>                                     <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, certs);
+<a name="156" href="#156">156</a>                                 }
+<a name="157" href="#157">157</a>                             } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (data != <strong class="jxr_keyword">null</strong> &amp;&amp; data.containsIssuerSerial()) {
+<a name="158" href="#158">158</a>                                 XMLX509IssuerSerial issuerSerial = data.itemIssuerSerial(0);
+<a name="159" href="#159">159</a>                                 String alias = 
+<a name="160" href="#160">160</a>                                     crypto.getAliasForX509Cert(
+<a name="161" href="#161">161</a>                                         issuerSerial.getIssuerName(), issuerSerial.getSerialNumber()
+<a name="162" href="#162">162</a>                                     );
+<a name="163" href="#163">163</a>                                 certs = crypto.getCertificates(alias);
+<a name="164" href="#164">164</a>                                 <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, certs);
+<a name="165" href="#165">165</a>                             }
+<a name="166" href="#166">166</a>                         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (ki.containsKeyValue()) {
+<a name="167" href="#167">167</a>                             PublicKey pk = ki.getPublicKey();
+<a name="168" href="#168">168</a>                             <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a>(assertion, pk);
+<a name="169" href="#169">169</a>                         }
+<a name="170" href="#170">170</a>                     } <strong class="jxr_keyword">catch</strong> (XMLSecurityException e3) {
+<a name="171" href="#171">171</a>                         <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="172" href="#172">172</a>                                 <span class="jxr_string">"invalidSAMLsecurity"</span>,
+<a name="173" href="#173">173</a>                                 <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate (key holder)"</span>}, e3);
+<a name="174" href="#174">174</a>                     }
+<a name="175" href="#175">175</a>                     
+<a name="176" href="#176">176</a>                 } <strong class="jxr_keyword">else</strong> {
+<a name="177" href="#177">177</a>                     <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="178" href="#178">178</a>                             <span class="jxr_string">"invalidSAMLsecurity"</span>,
+<a name="179" href="#179">179</a>                             <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate or key "</span>});
+<a name="180" href="#180">180</a>                 }
+<a name="181" href="#181">181</a>             }
+<a name="182" href="#182">182</a>             
+<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>(WSSecurityException.FAILURE,
+<a name="184" href="#184">184</a>                     <span class="jxr_string">"invalidSAMLsecurity"</span>,
+<a name="185" href="#185">185</a>                     <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate or key "</span>});
+<a name="186" href="#186">186</a>                         
+<a name="187" href="#187">187</a>         }
+<a name="188" href="#188">188</a> 
+<a name="189" href="#189">189</a>     }
+<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">     * Extracts the certificate(s) from the SAML token reference.</em>
+<a name="193" href="#193">193</a> <em class="jxr_javadoccomment">     * &lt;p/&gt;</em>
+<a name="194" href="#194">194</a> <em class="jxr_javadoccomment">     *</em>
+<a name="195" href="#195">195</a> <em class="jxr_javadoccomment">     * @param elem The element containing the SAML token.</em>
+<a name="196" href="#196">196</a> <em class="jxr_javadoccomment">     * @return an array of X509 certificates</em>
+<a name="197" href="#197">197</a> <em class="jxr_javadoccomment">     * @throws org.apache.ws.security.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">static</strong> X509Certificate[] getCertificatesFromSAML(Element elem)
+<a name="200" href="#200">200</a>             <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="201" href="#201">201</a> 
+<a name="202" href="#202">202</a>         <em class="jxr_comment">/*</em>
+<a name="203" href="#203">203</a> <em class="jxr_comment">         * Get some information about the SAML token content. This controls how</em>
+<a name="204" href="#204">204</a> <em class="jxr_comment">         * to deal with the whole stuff. First get the Authentication statement</em>
+<a name="205" href="#205">205</a> <em class="jxr_comment">         * (includes Subject), then get the _first_ confirmation method only.</em>
+<a name="206" href="#206">206</a> <em class="jxr_comment">         */</em>
+<a name="207" href="#207">207</a>         SAMLAssertion assertion;
+<a name="208" href="#208">208</a>         <strong class="jxr_keyword">try</strong> {
+<a name="209" href="#209">209</a>             assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(elem);
+<a name="210" href="#210">210</a>         } <strong class="jxr_keyword">catch</strong> (SAMLException e) {
+<a name="211" href="#211">211</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="212" href="#212">212</a>                     <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (cannot parse)"</span>}, e);
+<a name="213" href="#213">213</a>         }
+<a name="214" href="#214">214</a>         SAMLSubjectStatement samlSubjS = <strong class="jxr_keyword">null</strong>;
+<a name="215" href="#215">215</a>         Iterator it = assertion.getStatements();
+<a name="216" href="#216">216</a>         <strong class="jxr_keyword">while</strong> (it.hasNext()) {
+<a name="217" href="#217">217</a>             SAMLObject so = (SAMLObject) it.next();
+<a name="218" href="#218">218</a>             <strong class="jxr_keyword">if</strong> (so instanceof SAMLSubjectStatement) {
+<a name="219" href="#219">219</a>                 samlSubjS = (SAMLSubjectStatement) so;
+<a name="220" href="#220">220</a>                 <strong class="jxr_keyword">break</strong>;
+<a name="221" href="#221">221</a>             }
 <a name="222" href="#222">222</a>         }
-<a name="223" href="#223">223</a> 
-<a name="224" href="#224">224</a> <em class="jxr_comment">//        String confirmMethod = null;</em>
-<a name="225" href="#225">225</a> <em class="jxr_comment">//        it = samlSubj.getConfirmationMethods();</em>
-<a name="226" href="#226">226</a> <em class="jxr_comment">//        if (it.hasNext()) {</em>
-<a name="227" href="#227">227</a> <em class="jxr_comment">//            confirmMethod = (String) it.next();</em>
-<a name="228" href="#228">228</a> <em class="jxr_comment">//        }</em>
-<a name="229" href="#229">229</a> <em class="jxr_comment">//        boolean senderVouches = false;</em>
-<a name="230" href="#230">230</a> <em class="jxr_comment">//        if (SAMLSubject.CONF_SENDER_VOUCHES.equals(confirmMethod)) {</em>
-<a name="231" href="#231">231</a> <em class="jxr_comment">//            senderVouches = true;</em>
-<a name="232" href="#232">232</a> <em class="jxr_comment">//        }</em>
-<a name="233" href="#233">233</a>         Element e = samlSubj.getKeyInfo();
-<a name="234" href="#234">234</a>         X509Certificate[] certs = <strong class="jxr_keyword">null</strong>;
-<a name="235" href="#235">235</a>         <strong class="jxr_keyword">try</strong> {
-<a name="236" href="#236">236</a>             KeyInfo ki = <strong class="jxr_keyword">new</strong> KeyInfo(e, <strong class="jxr_keyword">null</strong>);
-<a name="237" href="#237">237</a> 
-<a name="238" href="#238">238</a>             <strong class="jxr_keyword">if</strong> (ki.containsX509Data()) {
-<a name="239" href="#239">239</a>                 X509Data data = ki.itemX509Data(0);
-<a name="240" href="#240">240</a>                 XMLX509Certificate certElem = <strong class="jxr_keyword">null</strong>;
-<a name="241" href="#241">241</a>                 <strong class="jxr_keyword">if</strong> (data != <strong class="jxr_keyword">null</strong> &amp;&amp; data.containsCertificate()) {
-<a name="242" href="#242">242</a>                     certElem = data.itemCertificate(0);
-<a name="243" href="#243">243</a>                 }
-<a name="244" href="#244">244</a>                 <strong class="jxr_keyword">if</strong> (certElem != <strong class="jxr_keyword">null</strong>) {
-<a name="245" href="#245">245</a>                     X509Certificate cert = certElem.getX509Certificate();
-<a name="246" href="#246">246</a>                     certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
-<a name="247" href="#247">247</a>                     certs[0] = cert;
-<a name="248" href="#248">248</a>                 }
-<a name="249" href="#249">249</a>             }
-<a name="250" href="#250">250</a>             <em class="jxr_comment">// TODO: get alias name for cert, check against username set by caller</em>
-<a name="251" href="#251">251</a>         } <strong class="jxr_keyword">catch</strong> (XMLSecurityException e3) {
-<a name="252" href="#252">252</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
-<a name="253" href="#253">253</a>                     <span class="jxr_string">"invalidSAMLsecurity"</span>,
-<a name="254" href="#254">254</a>                     <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate (key holder)"</span>}, e3);
-<a name="255" href="#255">255</a>         }
-<a name="256" href="#256">256</a>         <strong class="jxr_keyword">return</strong> certs;
-<a name="257" href="#257">257</a>     }
-<a name="258" href="#258">258</a> 
-<a name="259" href="#259">259</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String getAssertionId(Element envelope, String elemName, String nmSpace) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="260" href="#260">260</a>         String id;
-<a name="261" href="#261">261</a>         <em class="jxr_comment">// Make the AssertionID the wsu:Id and the signature reference the same</em>
-<a name="262" href="#262">262</a>         SAMLAssertion assertion;
-<a name="263" href="#263">263</a> 
-<a name="264" href="#264">264</a>         Element assertionElement = (Element) WSSecurityUtil
-<a name="265" href="#265">265</a>                 .findElement(envelope, elemName, nmSpace);
+<a name="223" href="#223">223</a>         SAMLSubject samlSubj = <strong class="jxr_keyword">null</strong>;
+<a name="224" href="#224">224</a>         <strong class="jxr_keyword">if</strong> (samlSubjS != <strong class="jxr_keyword">null</strong>) {
+<a name="225" href="#225">225</a>             samlSubj = samlSubjS.getSubject();
+<a name="226" href="#226">226</a>         }
+<a name="227" href="#227">227</a>         <strong class="jxr_keyword">if</strong> (samlSubj == <strong class="jxr_keyword">null</strong>) {
+<a name="228" href="#228">228</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="229" href="#229">229</a>                     <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"for Signature (no Subject)"</span>});
+<a name="230" href="#230">230</a>         }
+<a name="231" href="#231">231</a> 
+<a name="232" href="#232">232</a> <em class="jxr_comment">//        String confirmMethod = null;</em>
+<a name="233" href="#233">233</a> <em class="jxr_comment">//        it = samlSubj.getConfirmationMethods();</em>
+<a name="234" href="#234">234</a> <em class="jxr_comment">//        if (it.hasNext()) {</em>
+<a name="235" href="#235">235</a> <em class="jxr_comment">//            confirmMethod = (String) it.next();</em>
+<a name="236" href="#236">236</a> <em class="jxr_comment">//        }</em>
+<a name="237" href="#237">237</a> <em class="jxr_comment">//        boolean senderVouches = false;</em>
+<a name="238" href="#238">238</a> <em class="jxr_comment">//        if (SAMLSubject.CONF_SENDER_VOUCHES.equals(confirmMethod)) {</em>
+<a name="239" href="#239">239</a> <em class="jxr_comment">//            senderVouches = true;</em>
+<a name="240" href="#240">240</a> <em class="jxr_comment">//        }</em>
+<a name="241" href="#241">241</a>         Element e = samlSubj.getKeyInfo();
+<a name="242" href="#242">242</a>         X509Certificate[] certs = <strong class="jxr_keyword">null</strong>;
+<a name="243" href="#243">243</a>         <strong class="jxr_keyword">try</strong> {
+<a name="244" href="#244">244</a>             KeyInfo ki = <strong class="jxr_keyword">new</strong> KeyInfo(e, <strong class="jxr_keyword">null</strong>);
+<a name="245" href="#245">245</a> 
+<a name="246" href="#246">246</a>             <strong class="jxr_keyword">if</strong> (ki.containsX509Data()) {
+<a name="247" href="#247">247</a>                 X509Data data = ki.itemX509Data(0);
+<a name="248" href="#248">248</a>                 XMLX509Certificate certElem = <strong class="jxr_keyword">null</strong>;
+<a name="249" href="#249">249</a>                 <strong class="jxr_keyword">if</strong> (data != <strong class="jxr_keyword">null</strong> &amp;&amp; data.containsCertificate()) {
+<a name="250" href="#250">250</a>                     certElem = data.itemCertificate(0);
+<a name="251" href="#251">251</a>                 }
+<a name="252" href="#252">252</a>                 <strong class="jxr_keyword">if</strong> (certElem != <strong class="jxr_keyword">null</strong>) {
+<a name="253" href="#253">253</a>                     X509Certificate cert = certElem.getX509Certificate();
+<a name="254" href="#254">254</a>                     certs = <strong class="jxr_keyword">new</strong> X509Certificate[1];
+<a name="255" href="#255">255</a>                     certs[0] = cert;
+<a name="256" href="#256">256</a>                 }
+<a name="257" href="#257">257</a>             }
+<a name="258" href="#258">258</a>             <em class="jxr_comment">// TODO: get alias name for cert, check against username set by caller</em>
+<a name="259" href="#259">259</a>         } <strong class="jxr_keyword">catch</strong> (XMLSecurityException e3) {
+<a name="260" href="#260">260</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE,
+<a name="261" href="#261">261</a>                     <span class="jxr_string">"invalidSAMLsecurity"</span>,
+<a name="262" href="#262">262</a>                     <strong class="jxr_keyword">new</strong> Object[]{<span class="jxr_string">"cannot get certificate (key holder)"</span>}, e3);
+<a name="263" href="#263">263</a>         }
+<a name="264" href="#264">264</a>         <strong class="jxr_keyword">return</strong> certs;
+<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">try</strong> {
-<a name="268" href="#268">268</a>             assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(assertionElement);
-<a name="269" href="#269">269</a>             id = assertion.getId();
-<a name="270" href="#270">270</a>         } <strong class="jxr_keyword">catch</strong> (Exception e1) {
-<a name="271" href="#271">271</a>             log.error(e1);
-<a name="272" href="#272">272</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="273" href="#273">273</a>                     WSSecurityException.FAILED_SIGNATURE,
-<a name="274" href="#274">274</a>                     <span class="jxr_string">"noXMLSig"</span>, <strong class="jxr_keyword">null</strong>, e1);
-<a name="275" href="#275">275</a>         }
-<a name="276" href="#276">276</a>         <strong class="jxr_keyword">return</strong> id;
-<a name="277" href="#277">277</a>     }
-<a name="278" href="#278">278</a> 
-<a name="279" href="#279">279</a> }
+<a name="267" href="#267">267</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> String getAssertionId(Element envelope, String elemName, String nmSpace) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="268" href="#268">268</a>         String id;
+<a name="269" href="#269">269</a>         <em class="jxr_comment">// Make the AssertionID the wsu:Id and the signature reference the same</em>
+<a name="270" href="#270">270</a>         SAMLAssertion assertion;
+<a name="271" href="#271">271</a> 
+<a name="272" href="#272">272</a>         Element assertionElement = (Element) WSSecurityUtil
+<a name="273" href="#273">273</a>                 .findElement(envelope, elemName, nmSpace);
+<a name="274" href="#274">274</a> 
+<a name="275" href="#275">275</a>         <strong class="jxr_keyword">try</strong> {
+<a name="276" href="#276">276</a>             assertion = <strong class="jxr_keyword">new</strong> SAMLAssertion(assertionElement);
+<a name="277" href="#277">277</a>             id = assertion.getId();
+<a name="278" href="#278">278</a>         } <strong class="jxr_keyword">catch</strong> (Exception e1) {
+<a name="279" href="#279">279</a>             log.error(e1);
+<a name="280" href="#280">280</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="281" href="#281">281</a>                     WSSecurityException.FAILED_SIGNATURE,
+<a name="282" href="#282">282</a>                     <span class="jxr_string">"noXMLSig"</span>, <strong class="jxr_keyword">null</strong>, e1);
+<a name="283" href="#283">283</a>         }
+<a name="284" href="#284">284</a>         <strong class="jxr_keyword">return</strong> id;
+<a name="285" href="#285">285</a>     }
+<a name="286" href="#286">286</a> 
+<a name="287" href="#287">287</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>