You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by co...@apache.org on 2009/07/28 15:24:03 UTC

svn commit: r798514 [4/44] - 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-use/...

Modified: webservices/wss4j/site/apidocs/org/apache/ws/security/class-use/WSSecurityException.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/apidocs/org/apache/ws/security/class-use/WSSecurityException.html?rev=798514&r1=798513&r2=798514&view=diff
==============================================================================
--- webservices/wss4j/site/apidocs/org/apache/ws/security/class-use/WSSecurityException.html (original)
+++ webservices/wss4j/site/apidocs/org/apache/ws/security/class-use/WSSecurityException.html Tue Jul 28 13:23:48 2009
@@ -2,10 +2,10 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.4.2_17) on Thu Apr 16 10:48:43 EDT 2009 -->
+<!-- Generated by javadoc (build 1.4.2_17) on Fri Jul 24 07:34:56 EDT 2009 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.ws.security.WSSecurityException (WSS4J 1.5.7 API)
+Uses of Class org.apache.ws.security.WSSecurityException (WSS4J 1.5.8 API)
 </TITLE>
 
 
@@ -14,7 +14,7 @@
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Uses of Class org.apache.ws.security.WSSecurityException (WSS4J 1.5.7 API)";
+    parent.document.title="Uses of Class org.apache.ws.security.WSSecurityException (WSS4J 1.5.8 API)";
 }
 </SCRIPT>
 
@@ -216,7 +216,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>TimestampAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/TimestampAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>Action.</B><B><A HREF="../../../../../org/apache/ws/security/action/Action.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -227,7 +227,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>UsernameTokenSignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/UsernameTokenSignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>SAMLTokenUnsignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SAMLTokenUnsignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -238,7 +238,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>SAMLTokenSignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SAMLTokenSignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>UsernameTokenAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/UsernameTokenAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -249,7 +249,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>SignatureAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SignatureAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>UsernameTokenSignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/UsernameTokenSignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -260,7 +260,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>SignatureConfirmationAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SignatureConfirmationAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>SAMLTokenSignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SAMLTokenSignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -271,7 +271,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>UsernameTokenAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/UsernameTokenAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>SignatureConfirmationAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SignatureConfirmationAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -282,7 +282,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>EncryptionAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/EncryptionAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>TimestampAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/TimestampAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -293,7 +293,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>SAMLTokenUnsignedAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SAMLTokenUnsignedAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>SignatureAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/SignatureAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -304,7 +304,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>Action.</B><B><A HREF="../../../../../org/apache/ws/security/action/Action.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
+<TD><CODE><B>EncryptionAction.</B><B><A HREF="../../../../../org/apache/ws/security/action/EncryptionAction.html#execute(org.apache.ws.security.handler.WSHandler, int, org.w3c.dom.Document, org.apache.ws.security.handler.RequestData)">execute</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html" title="class in org.apache.ws.security.handler">WSHandler</A>&nbsp;handler,
         int&nbsp;actionToDo,
         org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
@@ -331,8 +331,16 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.security.cert.X509Certificate</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#loadCertificate(java.io.InputStream)">loadCertificate</A></B>(java.io.InputStream&nbsp;in)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;load a X509Certificate from the input stream.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
-<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
                     boolean&nbsp;reverse)</CODE>
 
 <BR>
@@ -341,7 +349,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
                    java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
@@ -349,11 +357,91 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificates(java.lang.String)">getCertificates</A></B>(java.lang.String&nbsp;alias)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;get the list of certificates for a given alias.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.security.cert.Certificate)">getAliasForX509Cert</A></B>(java.security.cert.Certificate&nbsp;cert)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return a X509 Certificate alias in the keystore according to a given Certificate
+ <p/></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.lang.String)">getAliasForX509Cert</A></B>(java.lang.String&nbsp;issuer)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
+ the issuer of a Certificate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.lang.String, java.math.BigInteger)">getAliasForX509Cert</A></B>(java.lang.String&nbsp;issuer,
+                    java.math.BigInteger&nbsp;serialNumber)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Search a X509 Certificate in the keystore according to a given serial number and
+ the issuer of a Certificate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(byte[])">getAliasForX509Cert</A></B>(byte[]&nbsp;skiBytes)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
+ SubjectKeyIdentifier.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getSKIBytesFromCert(java.security.cert.X509Certificate)">getSKIBytesFromCert</A></B>(java.security.cert.X509Certificate&nbsp;cert)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Reads the SubjectKeyIdentifier information from the certificate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509CertThumb(byte[])">getAliasForX509CertThumb</A></B>(byte[]&nbsp;thumb)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
+ Thumbprint.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.security.cert.CertificateFactory</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificateFactory()">getCertificateFactory</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the CertificateFactory instantiated by the underlying implementation</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Uses the CertPath API to validate a given certificate chain
+ <p/></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String[]</CODE></FONT></TD>
+<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasesForDN(java.lang.String)">getAliasesForDN</A></B>(java.lang.String&nbsp;subjectDN)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup X509 Certificates in the keystore according to a given DN of the subject of the certificate
+ <p/></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -474,7 +562,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
-<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
+<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
                     boolean&nbsp;reverse)</CODE>
 
 <BR>
@@ -483,7 +571,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
+<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
                    java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
@@ -492,23 +580,15 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Uses the CertPath API to validate a given certificate chain</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.security.cert.X509Certificate</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#loadCertificate(java.io.InputStream)">loadCertificate</A></B>(java.io.InputStream&nbsp;in)</CODE>
+<TD><CODE><B>Merlin.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Merlin.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;load a X509Certificate from the input stream.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
+<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#getX509Certificates(byte[], boolean)">getX509Certificates</A></B>(byte[]&nbsp;data,
                     boolean&nbsp;reverse)</CODE>
 
 <BR>
@@ -517,7 +597,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
+<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#getCertificateData(boolean, java.security.cert.X509Certificate[])">getCertificateData</A></B>(boolean&nbsp;reverse,
                    java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
@@ -525,91 +605,11 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificates(java.lang.String)">getCertificates</A></B>(java.lang.String&nbsp;alias)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;get the list of certificates for a given alias.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.security.cert.Certificate)">getAliasForX509Cert</A></B>(java.security.cert.Certificate&nbsp;cert)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return a X509 Certificate alias in the keystore according to a given Certificate
- <p/></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.lang.String)">getAliasForX509Cert</A></B>(java.lang.String&nbsp;issuer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
- the issuer of a Certificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(java.lang.String, java.math.BigInteger)">getAliasForX509Cert</A></B>(java.lang.String&nbsp;issuer,
-                    java.math.BigInteger&nbsp;serialNumber)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Search a X509 Certificate in the keystore according to a given serial number and
- the issuer of a Certificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509Cert(byte[])">getAliasForX509Cert</A></B>(byte[]&nbsp;skiBytes)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
- SubjectKeyIdentifier.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getSKIBytesFromCert(java.security.cert.X509Certificate)">getSKIBytesFromCert</A></B>(java.security.cert.X509Certificate&nbsp;cert)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Reads the SubjectKeyIdentifier information from the certificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasForX509CertThumb(byte[])">getAliasForX509CertThumb</A></B>(byte[]&nbsp;thumb)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup a X509 Certificate in the keystore according to a given
- Thumbprint.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.security.cert.CertificateFactory</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getCertificateFactory()">getCertificateFactory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the CertificateFactory instantiated by the underlying implementation</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Uses the CertPath API to validate a given certificate chain
- <p/></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B>Crypto.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html#getAliasesForDN(java.lang.String)">getAliasesForDN</A></B>(java.lang.String&nbsp;subjectDN)</CODE>
+<TD><CODE><B>BouncyCastle.</B><B><A HREF="../../../../../org/apache/ws/security/components/crypto/BouncyCastle.html#validateCertPath(java.security.cert.X509Certificate[])">validateCertPath</A></B>(java.security.cert.X509Certificate[]&nbsp;certs)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Lookup X509 Certificates in the keystore according to a given DN of the subject of the certificate
- <p/></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Uses the CertPath API to validate a given certificate chain</TD>
 </TR>
 </TABLE>
 &nbsp;
@@ -735,6 +735,14 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>protected &nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>WSHandler.</B><B><A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html#decodeNamespaceQualifiedPasswordTypes(org.apache.ws.security.handler.RequestData)">decodeNamespaceQualifiedPasswordTypes</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>protected &nbsp;boolean</CODE></FONT></TD>
 <TD><CODE><B>WSHandler.</B><B><A HREF="../../../../../org/apache/ws/security/handler/WSHandler.html#decodeTimestampStrict(org.apache.ws.security.handler.RequestData)">decodeTimestampStrict</A></B>(<A HREF="../../../../../org/apache/ws/security/handler/RequestData.html" title="class in org.apache.ws.security.handler">RequestData</A>&nbsp;reqData)</CODE>
 
 <BR>
@@ -852,125 +860,36 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected abstract &nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>WSSecDerivedKeyBase.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The derived key will change depending on the sig/encr algorithm.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecDerivedKeyBase.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html#prepare(org.w3c.dom.Document)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Initialize a WSSec Derived key.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
+<TD><CODE><B>WSSecSecurityContextToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecSecurityContextToken.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
         <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Prepare the ephemeralKey and the tokens required to be added to the
- security header</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#prepareInternal(byte[], java.security.cert.X509Certificate, org.apache.ws.security.components.crypto.Crypto)">prepareInternal</A></B>(byte[]&nbsp;keyBytes,
-                java.security.cert.X509Certificate&nbsp;remoteCert,
-                <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt the symmetric key data and prepare the EncryptedKey element
- 
- This method does the most work for to prepare the EncryptedKey element.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#generateEphemeralKey()">generateEphemeralKey</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create an ephemeral key</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#setKeySize(int)">setKeySize</A></B>(int&nbsp;keySize)</CODE>
-
-<BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
-        <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<TD><CODE><B>WSSecSecurityContextToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecSecurityContextToken.html#prependSCTElementToHeader(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">prependSCTElementToHeader</A></B>(org.w3c.dom.Document&nbsp;doc,
+                          <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Initialize a WSSec Encrypt.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
-      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
+<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#build(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
       <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds the SOAP envelope with encrypted Body and adds encrypted key.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#encryptForInternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForInternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
-                      java.util.Vector&nbsp;references)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (internal).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
-<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#encryptForExternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForExternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
-                      java.util.Vector&nbsp;references)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (external).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
-<TD><CODE><B>WSSignEnvelope.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSignEnvelope.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
-      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>replaced by <A HREF="../../../../../org/apache/ws/security/message/WSSecSignature.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)"><CODE>WSSecSignature.build(Document, Crypto, WSSecHeader)</CODE></A></I></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>WSSecUsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecUsernameToken.html#getSecretKey()">getSecretKey</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the derived secret key.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>WSSecUsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecUsernameToken.html#getDerivedKey()">getDerivedKey</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the derived key.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecSecurityContextToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecSecurityContextToken.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
-        <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#prepare(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
+        <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -978,37 +897,36 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecSecurityContextToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecSecurityContextToken.html#prependSCTElementToHeader(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">prependSCTElementToHeader</A></B>(org.w3c.dom.Document&nbsp;doc,
-                          <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
+<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#addReferencesToSign(java.util.Vector, org.apache.ws.security.message.WSSecHeader)">addReferencesToSign</A></B>(java.util.Vector&nbsp;references,
+                    <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This method adds references to the Signature.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
-      <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#computeSignature()">computeSignature</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Compute the Signature over the references.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#encryptForExternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForExternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
-                      java.util.Vector&nbsp;references)</CODE>
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (external).</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
+<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
+<TD><CODE><B>WSSignEnvelope.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSignEnvelope.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
+      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>replaced by <A HREF="../../../../../org/apache/ws/security/message/WSSecSignature.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)"><CODE>WSSecSignature.build(Document, Crypto, WSSecHeader)</CODE></A></I></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -1049,160 +967,163 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#build(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
-      <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
+        <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Initialize a WSSec Encrypt.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#prepare(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
-        <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
+<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
+      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
+      <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds the SOAP envelope with encrypted Body and adds encrypted key.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#addReferencesToSign(java.util.Vector, org.apache.ws.security.message.WSSecHeader)">addReferencesToSign</A></B>(java.util.Vector&nbsp;references,
-                    <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
+<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#encryptForInternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForInternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
+                      java.util.Vector&nbsp;references)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This method adds references to the Signature.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (internal).</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#computeSignature()">computeSignature</A></B>()</CODE>
+<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#encryptForExternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForExternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
+                      java.util.Vector&nbsp;references)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Compute the Signature over the references.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (external).</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>WSSecDKSign.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKSign.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#prepare(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc,
+        <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Prepare the ephemeralKey and the tokens required to be added to the
+ security header</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
-<TD><CODE><B>WSEncryptBody.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSEncryptBody.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
-      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<CODE>protected &nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#prepareInternal(byte[], java.security.cert.X509Certificate, org.apache.ws.security.components.crypto.Crypto)">prepareInternal</A></B>(byte[]&nbsp;keyBytes,
+                java.security.cert.X509Certificate&nbsp;remoteCert,
+                <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>replaced by
-             <A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)"><CODE>WSSecEncrypt.build(Document, Crypto, WSSecHeader)</CODE></A></I></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.apache.ws.security.message.token"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../org/apache/ws/security/WSSecurityException.html" title="class in org.apache.ws.security">WSSecurityException</A> in <A HREF="../../../../../org/apache/ws/security/message/token/package-summary.html">org.apache.ws.security.message.token</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../org/apache/ws/security/message/token/package-summary.html">org.apache.ws.security.message.token</A> that throw <A HREF="../../../../../org/apache/ws/security/WSSecurityException.html" title="class in org.apache.ws.security">WSSecurityException</A></FONT></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt the symmetric key data and prepare the EncryptedKey element
+ 
+ This method does the most work for to prepare the EncryptedKey element.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html" title="class in org.apache.ws.security.message.token">SecurityTokenReference</A></CODE></FONT></TD>
-<TD><CODE><B>DerivedKeyToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#getSecurityTokenReference()">getSecurityTokenReference</A></B>()</CODE>
+<CODE>protected &nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#generateEphemeralKey()">generateEphemeralKey</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the SecurityTokenReference of the derived key token</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Create an ephemeral key</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html" title="class in org.apache.ws.security.message.token">SecurityTokenReference</A></CODE></FONT></TD>
-<TD><CODE><B>DerivedKeyToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#getSecuityTokenReference()">getSecuityTokenReference</A></B>()</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecEncryptedKey.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecEncryptedKey.html#setKeySize(int)">setKeySize</A></B>(int&nbsp;keySize)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>use getSecurityTokenReference() instead</I></TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#getSalt()">getSalt</A></B>()</CODE>
+<TD><CODE><B>WSSecUsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecUsernameToken.html#getSecretKey()">getSecretKey</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the Salt value of this UsernameToken.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the derived secret key.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#generateDerivedKey(java.lang.String, byte[], int)">generateDerivedKey</A></B>(java.lang.String&nbsp;password,
-                   byte[]&nbsp;salt,
-                   int&nbsp;iteration)</CODE>
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>WSSecUsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecUsernameToken.html#getDerivedKey()">getDerivedKey</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This static method generates a derived key as defined in WSS Username
- Token Profile.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the derived key.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#getDerivedKey()">getDerivedKey</A></B>()</CODE>
+<CODE>protected abstract &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>WSSecDerivedKeyBase.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This method gets a derived key as defined in WSS Username Token Profile.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The derived key will change depending on the sig/encr algorithm.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#isDerivedKey()">isDerivedKey</A></B>()</CODE>
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>WSSecDerivedKeyBase.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDerivedKeyBase.html#prepare(org.w3c.dom.Document)">prepare</A></B>(org.w3c.dom.Document&nbsp;doc)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return whether the UsernameToken represented by this class is to be used
- for key derivation as per the UsernameToken Profile 1.1.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Initialize a WSSec Derived key.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.security.cert.X509Certificate</CODE></FONT></TD>
-<TD><CODE><B>X509Security.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#getX509Certificate(org.apache.ws.security.components.crypto.Crypto)">getX509Certificate</A></B>(<A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
+<TD><CODE><B>WSEncryptBody.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSEncryptBody.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
+      <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the X509Certificate certificate.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>replaced by
+             <A HREF="../../../../../org/apache/ws/security/message/WSSecEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.message.WSSecHeader)"><CODE>WSSecEncrypt.build(Document, Crypto, WSSecHeader)</CODE></A></I></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>X509Security.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#setX509Certificate(java.security.cert.X509Certificate)">setX509Certificate</A></B>(java.security.cert.X509Certificate&nbsp;cert)</CODE>
+<CODE>&nbsp;org.w3c.dom.Document</CODE></FONT></TD>
+<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#build(org.w3c.dom.Document, org.apache.ws.security.message.WSSecHeader)">build</A></B>(org.w3c.dom.Document&nbsp;doc,
+      <A HREF="../../../../../org/apache/ws/security/message/WSSecHeader.html" title="class in org.apache.ws.security.message">WSSecHeader</A>&nbsp;secHeader)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the X509Certificate.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
-<TD><CODE><B>PKIPathSecurity.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#getX509Certificates(boolean, org.apache.ws.security.components.crypto.Crypto)">getX509Certificates</A></B>(boolean&nbsp;reverse,
-                    <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<CODE>&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
+<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#encryptForExternalRef(org.w3c.dom.Element, java.util.Vector)">encryptForExternalRef</A></B>(org.w3c.dom.Element&nbsp;dataRef,
+                      java.util.Vector&nbsp;references)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;get the X509Certificate array.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encrypt one or more parts or elements of the message (external).</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>PKIPathSecurity.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#setX509Certificates(java.security.cert.X509Certificate[], boolean, org.apache.ws.security.components.crypto.Crypto)">setX509Certificates</A></B>(java.security.cert.X509Certificate[]&nbsp;certs,
-                    boolean&nbsp;reverse,
-                    <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<CODE>protected &nbsp;int</CODE></FONT></TD>
+<TD><CODE><B>WSSecDKEncrypt.</B><B><A HREF="../../../../../org/apache/ws/security/message/WSSecDKEncrypt.html#getDerivedKeyLength()">getDerivedKeyLength</A></B>()</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;set the X509Certificate array.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="org.apache.ws.security.message.token"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TD COLSPAN=2><FONT SIZE="+2">
+Uses of <A HREF="../../../../../org/apache/ws/security/WSSecurityException.html" title="class in org.apache.ws.security">WSSecurityException</A> in <A HREF="../../../../../org/apache/ws/security/message/token/package-summary.html">org.apache.ws.security.message.token</A></FONT></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TD COLSPAN=2>Methods in <A HREF="../../../../../org/apache/ws/security/message/token/package-summary.html">org.apache.ws.security.message.token</A> that throw <A HREF="../../../../../org/apache/ws/security/WSSecurityException.html" title="class in org.apache.ws.security">WSSecurityException</A></FONT></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -1316,6 +1237,93 @@
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the alias name of the certificate identified with X509 issuerSerial data.</TD>
 </TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.security.cert.X509Certificate</CODE></FONT></TD>
+<TD><CODE><B>X509Security.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#getX509Certificate(org.apache.ws.security.components.crypto.Crypto)">getX509Certificate</A></B>(<A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the X509Certificate certificate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>X509Security.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#setX509Certificate(java.security.cert.X509Certificate)">setX509Certificate</A></B>(java.security.cert.X509Certificate&nbsp;cert)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the X509Certificate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.security.cert.X509Certificate[]</CODE></FONT></TD>
+<TD><CODE><B>PKIPathSecurity.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#getX509Certificates(boolean, org.apache.ws.security.components.crypto.Crypto)">getX509Certificates</A></B>(boolean&nbsp;reverse,
+                    <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;get the X509Certificate array.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>PKIPathSecurity.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#setX509Certificates(java.security.cert.X509Certificate[], boolean, org.apache.ws.security.components.crypto.Crypto)">setX509Certificates</A></B>(java.security.cert.X509Certificate[]&nbsp;certs,
+                    boolean&nbsp;reverse,
+                    <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;set the X509Certificate array.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#getSalt()">getSalt</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Get the Salt value of this UsernameToken.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#generateDerivedKey(java.lang.String, byte[], int)">generateDerivedKey</A></B>(java.lang.String&nbsp;password,
+                   byte[]&nbsp;salt,
+                   int&nbsp;iteration)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This static method generates a derived key as defined in WSS Username
+ Token Profile.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#getDerivedKey()">getDerivedKey</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This method gets a derived key as defined in WSS Username Token Profile.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B>UsernameToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#isDerivedKey()">isDerivedKey</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Return whether the UsernameToken represented by this class is to be used
+ for key derivation as per the UsernameToken Profile 1.1.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html" title="class in org.apache.ws.security.message.token">SecurityTokenReference</A></CODE></FONT></TD>
+<TD><CODE><B>DerivedKeyToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#getSecurityTokenReference()">getSecurityTokenReference</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the SecurityTokenReference of the derived key token</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html" title="class in org.apache.ws.security.message.token">SecurityTokenReference</A></CODE></FONT></TD>
+<TD><CODE><B>DerivedKeyToken.</B><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#getSecuityTokenReference()">getSecuityTokenReference</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>use getSecurityTokenReference() instead</I></TD>
+</TR>
 </TABLE>
 &nbsp;
 <P>
@@ -1325,16 +1333,23 @@
 <TD COLSPAN=2>Constructors in <A HREF="../../../../../org/apache/ws/security/message/token/package-summary.html">org.apache.ws.security.message.token</A> that throw <A HREF="../../../../../org/apache/ws/security/WSSecurityException.html" title="class in org.apache.ws.security">WSSecurityException</A></FONT></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/BinarySecurity.html#BinarySecurity(org.w3c.dom.Element)">BinarySecurity</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html#SecurityTokenReference(org.w3c.dom.Element)">SecurityTokenReference</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#DerivedKeyToken(org.w3c.dom.Element)">DerivedKeyToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html#SecurityContextToken(org.w3c.dom.Element)">SecurityContextToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This will create a DerivedKeyToken object with the given DerivedKeyToken element</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This is used to create a SecurityContextToken using a DOM Element</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SignatureConfirmation.html#SignatureConfirmation(org.w3c.dom.Element)">SignatureConfirmation</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a <code>SignatureConfirmation</code> object and parses the
+ <code>wsse11:SignatureCOnfirmation</code> element to initialize it.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/Timestamp.html#Timestamp(org.w3c.dom.Element)">Timestamp</A></B>(org.w3c.dom.Element&nbsp;element)</CODE>
@@ -1344,49 +1359,50 @@
  <code>wsu:Timestamp</code> element to initialize it.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#UsernameToken(org.w3c.dom.Element)">UsernameToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#X509Security(org.w3c.dom.Element)">X509Security</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a <code>UsernameToken</code> object and parses the
- <code>wsse:UsernameToken</code> element to initialize it.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This constructor creates a new X509 certificate object and initializes
+ it from the data contained in the element.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/Reference.html#Reference(org.w3c.dom.Element)">Reference</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/BinarySecurity.html#BinarySecurity(org.w3c.dom.Element)">BinarySecurity</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/X509Security.html#X509Security(org.w3c.dom.Element)">X509Security</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#PKIPathSecurity(org.w3c.dom.Element)">PKIPathSecurity</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This constructor creates a new X509 certificate object and initializes
- it from the data contained in the element.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/PKIPathSecurity.html#PKIPathSecurity(org.w3c.dom.Element)">PKIPathSecurity</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#UsernameToken(org.w3c.dom.Element)">UsernameToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a <code>UsernameToken</code> object and parses the
+ <code>wsse:UsernameToken</code> element to initialize it.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SignatureConfirmation.html#SignatureConfirmation(org.w3c.dom.Element)">SignatureConfirmation</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/UsernameToken.html#UsernameToken(org.w3c.dom.Element, boolean)">UsernameToken</A></B>(org.w3c.dom.Element&nbsp;elem,
+              boolean&nbsp;allowNamespaceQualifiedPasswordTypes)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a <code>SignatureConfirmation</code> object and parses the
- <code>wsse11:SignatureCOnfirmation</code> element to initialize it.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a <code>UsernameToken</code> object and parses the
+ <code>wsse:UsernameToken</code> element to initialize it.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html#SecurityTokenReference(org.w3c.dom.Element)">SecurityTokenReference</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/Reference.html#Reference(org.w3c.dom.Element)">Reference</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/SecurityContextToken.html#SecurityContextToken(org.w3c.dom.Element)">SecurityContextToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
+<TD><CODE><B><A HREF="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html#DerivedKeyToken(org.w3c.dom.Element)">DerivedKeyToken</A></B>(org.w3c.dom.Element&nbsp;elem)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This is used to create a SecurityContextToken using a DOM Element</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This will create a DerivedKeyToken object with the given DerivedKeyToken element</TD>
 </TR>
 </TABLE>
 &nbsp;
@@ -1408,37 +1424,6 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>UsernameTokenProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/UsernameTokenProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
-            <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
-            <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;decCrypto,
-            javax.security.auth.callback.CallbackHandler&nbsp;cb,
-            <A HREF="../../../../../org/apache/ws/security/WSDocInfo.html" title="class in org.apache.ws.security">WSDocInfo</A>&nbsp;wsDocInfo,
-            java.util.Vector&nbsp;returnResults,
-            <A HREF="../../../../../org/apache/ws/security/WSSConfig.html" title="class in org.apache.ws.security">WSSConfig</A>&nbsp;wsc)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/apache/ws/security/WSUsernameTokenPrincipal.html" title="class in org.apache.ws.security">WSUsernameTokenPrincipal</A></CODE></FONT></TD>
-<TD><CODE><B>UsernameTokenProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/UsernameTokenProcessor.html#handleUsernameToken(org.w3c.dom.Element, javax.security.auth.callback.CallbackHandler)">handleUsernameToken</A></B>(org.w3c.dom.Element&nbsp;token,
-                    javax.security.auth.callback.CallbackHandler&nbsp;cb)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Check the UsernameToken element.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B>UsernameTokenProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/UsernameTokenProcessor.html#getDerivedKey(javax.security.auth.callback.CallbackHandler)">getDerivedKey</A></B>(javax.security.auth.callback.CallbackHandler&nbsp;cb)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
 <TD><CODE><B>EncryptedKeyProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/EncryptedKeyProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;decCrypto,
@@ -1491,11 +1476,11 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>SignatureConfirmationProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/SignatureConfirmationProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
+<TD><CODE><B>ReferenceListProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/ReferenceListProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;decCrypto,
             javax.security.auth.callback.CallbackHandler&nbsp;cb,
-            <A HREF="../../../../../org/apache/ws/security/WSDocInfo.html" title="class in org.apache.ws.security">WSDocInfo</A>&nbsp;wsDocInfo,
+            <A HREF="../../../../../org/apache/ws/security/WSDocInfo.html" title="class in org.apache.ws.security">WSDocInfo</A>&nbsp;wdi,
             java.util.Vector&nbsp;returnResults,
             <A HREF="../../../../../org/apache/ws/security/WSSConfig.html" title="class in org.apache.ws.security">WSSConfig</A>&nbsp;wsc)</CODE>
 
@@ -1504,12 +1489,33 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;org.w3c.dom.Element</CODE></FONT></TD>
+<TD><CODE><B>ReferenceListProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/ReferenceListProcessor.html#findEncryptedDataElement(org.w3c.dom.Document, java.lang.String)">findEncryptedDataElement</A></B>(org.w3c.dom.Document&nbsp;doc,
+                         java.lang.String&nbsp;dataRefURI)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Look up the encrypted data.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;<A HREF="../../../../../org/apache/ws/security/WSDataRef.html" title="class in org.apache.ws.security">WSDataRef</A></CODE></FONT></TD>
+<TD><CODE><B>ReferenceListProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/ReferenceListProcessor.html#decryptEncryptedData(org.w3c.dom.Document, java.lang.String, org.w3c.dom.Element, javax.crypto.SecretKey, java.lang.String)">decryptEncryptedData</A></B>(org.w3c.dom.Document&nbsp;doc,
+                     java.lang.String&nbsp;dataRefURI,
+                     org.w3c.dom.Element&nbsp;encData,
+                     javax.crypto.SecretKey&nbsp;symmetricKey,
+                     java.lang.String&nbsp;symEncAlgo)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Decrypt the EncryptedData argument using a SecretKey.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ReferenceListProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/ReferenceListProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
+<TD><CODE><B>TimestampProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/TimestampProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto,
             <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;decCrypto,
             javax.security.auth.callback.CallbackHandler&nbsp;cb,
-            <A HREF="../../../../../org/apache/ws/security/WSDocInfo.html" title="class in org.apache.ws.security">WSDocInfo</A>&nbsp;wdi,
+            <A HREF="../../../../../org/apache/ws/security/WSDocInfo.html" title="class in org.apache.ws.security">WSDocInfo</A>&nbsp;wsDocInfo,
             java.util.Vector&nbsp;returnResults,
             <A HREF="../../../../../org/apache/ws/security/WSSConfig.html" title="class in org.apache.ws.security">WSSConfig</A>&nbsp;wsc)</CODE>
 
@@ -1519,11 +1525,7 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ReferenceListProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/ReferenceListProcessor.html#decryptDataRefEmbedded(org.w3c.dom.Document, java.lang.String, org.apache.ws.security.WSDataRef, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.components.crypto.Crypto)">decryptDataRefEmbedded</A></B>(org.w3c.dom.Document&nbsp;doc,
-                       java.lang.String&nbsp;dataRefURI,
-                       <A HREF="../../../../../org/apache/ws/security/WSDataRef.html" title="class in org.apache.ws.security">WSDataRef</A>&nbsp;dataRef,
-                       javax.security.auth.callback.CallbackHandler&nbsp;cb,
-                       <A HREF="../../../../../org/apache/ws/security/components/crypto/Crypto.html" title="interface in org.apache.ws.security.components.crypto">Crypto</A>&nbsp;crypto)</CODE>
+<TD><CODE><B>TimestampProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/TimestampProcessor.html#handleTimestamp(org.apache.ws.security.message.token.Timestamp)">handleTimestamp</A></B>(<A HREF="../../../../../org/apache/ws/security/message/token/Timestamp.html" title="class in org.apache.ws.security.message.token">Timestamp</A>&nbsp;timestamp)</CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -1531,21 +1533,29 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>BinarySecurityTokenProcessor.</B><B><A HREF="../../../../../org/apache/ws/security/processor/BinarySecurityTokenProcessor.html#handleToken(org.w3c.dom.Element, org.apache.ws.security.components.crypto.Crypto, org.apache.ws.security.components.crypto.Crypto, javax.security.auth.callback.CallbackHandler, org.apache.ws.security.WSDocInfo, java.util.Vector, org.apache.ws.security.WSSConfig)">handleToken</A></B>(org.w3c.dom.Element&nbsp;elem,

[... 167 lines stripped ...]


---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org