summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/api/sgml/version.sgml6
-rw-r--r--docs/api/xmlsec-version.html6
-rw-r--r--docs/xmlsec-man.html304
-rw-r--r--man/xmlsec1-config.12
-rw-r--r--man/xmlsec1.16
5 files changed, 310 insertions, 14 deletions
diff --git a/docs/api/sgml/version.sgml b/docs/api/sgml/version.sgml
index 4738a2f7..6a9865ac 100644
--- a/docs/api/sgml/version.sgml
+++ b/docs/api/sgml/version.sgml
@@ -40,7 +40,7 @@
<title>Details</title>
<refsect2>
<title><anchor id="XMLSEC-VERSION-CAPS">XMLSEC_VERSION</title>
-<programlisting>#define XMLSEC_VERSION "1.2.2"
+<programlisting>#define XMLSEC_VERSION "1.2.3"
</programlisting>
<para>
The library version string in the format
@@ -68,7 +68,7 @@ The library minor version number.</para>
</para></refsect2>
<refsect2>
<title><anchor id="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC_VERSION_SUBMINOR</title>
-<programlisting>#define XMLSEC_VERSION_SUBMINOR 2
+<programlisting>#define XMLSEC_VERSION_SUBMINOR 3
</programlisting>
<para>
The library sub-minor version number.</para>
@@ -77,7 +77,7 @@ The library sub-minor version number.</para>
</para></refsect2>
<refsect2>
<title><anchor id="XMLSEC-VERSION-INFO-CAPS">XMLSEC_VERSION_INFO</title>
-<programlisting>#define XMLSEC_VERSION_INFO "3:2:2"
+<programlisting>#define XMLSEC_VERSION_INFO "3:3:2"
</programlisting>
<para>
The library version info string in the format
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
index 83d5bf50..d986feb2 100644
--- a/docs/api/xmlsec-version.html
+++ b/docs/api/xmlsec-version.html
@@ -108,7 +108,7 @@
<div class="REFSECT2">
<a name="AEN14612"></a><h3>
<a name="XMLSEC-VERSION-CAPS"></a>XMLSEC_VERSION</h3>
-<pre class="PROGRAMLISTING">#define XMLSEC_VERSION "1.2.2"</pre>
+<pre class="PROGRAMLISTING">#define XMLSEC_VERSION "1.2.3"</pre>
<p>The library version string in the format
"&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".</p>
<p></p>
@@ -133,7 +133,7 @@
<div class="REFSECT2">
<a name="AEN14630"></a><h3>
<a name="XMLSEC-VERSION-SUBMINOR-CAPS"></a>XMLSEC_VERSION_SUBMINOR</h3>
-<pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR 2</pre>
+<pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR 3</pre>
<p>The library sub-minor version number.</p>
<p></p>
</div>
@@ -141,7 +141,7 @@
<div class="REFSECT2">
<a name="AEN14636"></a><h3>
<a name="XMLSEC-VERSION-INFO-CAPS"></a>XMLSEC_VERSION_INFO</h3>
-<pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "3:2:2"</pre>
+<pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO "3:3:2"</pre>
<p>The library version info string in the format
"&lt;major-number&gt;+&lt;minor-number&gt;:&lt;sub-minor-number&gt;:&lt;minor-number&gt;".</p>
<p></p>
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html
index 26cccb37..d2e74c47 100644
--- a/docs/xmlsec-man.html
+++ b/docs/xmlsec-man.html
@@ -1 +1,303 @@
- <HTML><HEAD><TITLE>Manpage of XMLSEC1</TITLE> </HEAD><BODY> <H1>XMLSEC1</H1> Section: User Commands (1)<BR>Updated: January 2004<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB">&nbsp;</A> <H2>NAME</H2> xmlsec1 - manual page for xmlsec1 1.2.3 (openssl) <A NAME="lbAC">&nbsp;</A> <H2>SYNOPSIS</H2> <B>xmlsec</B> <I>&lt;command&gt; </I>[<I>&lt;options&gt;</I>] [<I>&lt;file&gt;</I>] <A NAME="lbAD">&nbsp;</A> <H2>DESCRIPTION</H2> xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents. The allowed &lt;command&gt; values are: <DL COMPACT> <DT><B>--help</B><DD> display this help information and exit <DT><B>--help-all</B><DD> display help information for all commands/options and exit <DT><B>--help-</B>&lt;cmd&gt;<DD> display help information for command &lt;cmd&gt; and exit <DT><B>--version</B><DD> print version information and exit <DT><B>--keys</B><DD> keys XML file manipulation <DT><B>--sign</B><DD> sign data and output XML document <DT><B>--verify</B><DD> verify signed document <DT><B>--sign-tmpl</B><DD> create and sign dynamicaly generated signature template <DT><B>--encrypt</B><DD> encrypt data and output XML document <DT><B>--decrypt</B><DD> decrypt data from XML document <DT><B>--xkis-server-locate</B><DD> process data as XKMS/XKISS Locate request <DT><B>--xkis-server-validate</B><DD> process data as XKMS/XKISS Validate request </DL> <A NAME="lbAE">&nbsp;</A> <H2>OPTIONS</H2> <DL COMPACT> <DT> <B>--ignore-manifests</B> <DT><DD> <DD>do not process &lt;dsig:Manifest&gt; elements <DT> <B>--store-references</B> <DT><DD> <DD>store and print the result of &lt;dsig:Reference/&gt; element processing just before calculating digest <DT> <B>--store-signatures</B> <DT><DD> <DD>store and print the result of &lt;dsig:Signature&gt; processing just before calculating signature <DT> <B>--enabled-reference-uris</B> &lt;list&gt; <DT><DD> <DD>comma separated list of of the following values: &quot;empty&quot;, &quot;same-doc&quot;, &quot;local&quot;,&quot;remote&quot; to restrict possible URI attribute values for the &lt;dsig:Reference&gt; element <DT> <B>--enable-visa3d-hack</B> <DT><DD> <DD>enables Visa3D protocol specific hack for URI attributes processing when we are trying not to use XPath/XPointer engine; this is a hack and I don't know what else might be broken in your application when you use it (also check &quot;--id-attr&quot; option because you might need it) <DT> <B>--binary-data</B> &lt;file&gt; <DT><DD> <DD>binary &lt;file&gt; to encrypt <DT> <B>--xml-data</B> &lt;file&gt; <DT><DD> <DD>XML &lt;file&gt; to encrypt <DT> <B>--enabled-cipher-reference-uris</B> &lt;list&gt; <DT><DD> <DD>comma separated list of of the following values: &quot;empty&quot;, &quot;same-doc&quot;, &quot;local&quot;,&quot;remote&quot; to restrict possible URI attribute values for the &lt;enc:CipherReference&gt; element <DT> <B>--session-key</B> &lt;keyKlass&gt;-&lt;keySize&gt; <DT><DD> <DD>generate new session &lt;keyKlass&gt; key of &lt;keySize&gt; bits size (for example, &quot;--session des-192&quot; generates a new 192 bits DES key for DES3 encryption) <DT> <B>--output</B> &lt;filename&gt; <DT><DD> <DD>write result document to file &lt;filename&gt; <DT> <B>--print-debug</B> <DT><DD> <DD>print debug information to stdout <DT> <B>--print-xml-debug</B> <DT><DD> <DD>print debug information to stdout in xml format <DT> <B>--dtd-file</B> &lt;file&gt; <DT><DD> <DD>load the specified file as the DTD <DT> <B>--node-id</B> &lt;id&gt; <DT><DD> <DD>set the operation start point to the node with given &lt;id&gt; <DT> <B>--node-name</B> [&lt;namespace-uri&gt;:]&lt;name&gt; <DT><DD> <DD>set the operation start point to the first node with given &lt;name&gt; and &lt;namespace&gt; URI <DT> <B>--node-xpath</B> &lt;expr&gt; <DT><DD> <DD>set the operation start point to the first node selected by the specified XPath expression <DT> <B>--id-attr[</B>:&lt;attr-name&gt;] [&lt;node-namespace-uri&gt;:]&lt;node-name&gt; <DT><DD> <DD>adds attributes &lt;attr-name&gt; (default value &quot;id&quot;) from all nodes with&lt;node-name&gt; and namespace &lt;node-namespace-uri&gt; to the list of known ID attributes; this is a hack and if you can use DTD or schema to declare ID attributes instead (see &quot;--dtd-file&quot; option), I don't know what else might be broken in your application when you use this hack <DT> <B>--enabled-key-data</B> &lt;list&gt; <DT><DD> <DD>comma separated list of enabled key data (list of registered key data klasses is available with &quot;--list-key-data&quot; command); by default, all registered key data are enabled <DT> <B>--enabled-retrieval-uris</B> &lt;list&gt; <DT><DD> <DD>comma separated list of of the following values: &quot;empty&quot;, &quot;same-doc&quot;, &quot;local&quot;,&quot;remote&quot; to restrict possible URI attribute values for the &lt;dsig:RetrievalMethod&gt; element. <DT> <B>--gen-key[</B>:&lt;name&gt;] &lt;keyKlass&gt;-&lt;keySize&gt; <DT><DD> <DD>generate new &lt;keyKlass&gt; key of &lt;keySize&gt; bits size, set the key name to &lt;name&gt; and add the result to keys manager (for example, &quot;--gen:mykey rsa-1024&quot; generates a new 1024 bits RSA key and sets it's name to &quot;mykey&quot;) <DT> <B>--keys-file</B> &lt;file&gt; <DT><DD> <DD>load keys from XML file <DT> <B>--privkey-pem[</B>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <DT><DD> <DD>load private key from PEM file and certificates that verify this key <DT> <B>--privkey-der[</B>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <DT><DD> <DD>load private key from DER file and certificates that verify this key <DT> <B>--pkcs-pem[</B>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <DT><DD> <DD>load private key from PKCS8 PEM file and PEM certificates that verify this key <DT> <B>--pkcs8-der[</B>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <DT><DD> <DD>load private key from PKCS8 DER file and DER certificates that verify this key <DT> <B>--pubkey-pem[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load public key from PEM file <DT> <B>--pubkey-der[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load public key from DER file <DT> <B>--aeskey[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load AES key from binary file &lt;file&gt; <DT> <B>--deskey[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load DES key from binary file &lt;file&gt; <DT> <B>--hmackey[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load HMAC key from binary file &lt;file&gt; <DT> <B>--pwd</B> &lt;password&gt; <DT><DD> <DD>the password to use for reading keys and certs <DT> <B>--pkcs12[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load load private key from pkcs12 file &lt;file&gt; <DT> <B>--pubkey-cert-pem[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load public key from PEM cert file <DT> <B>--pubkey-cert-der[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load public key from DER cert file <DT> <B>--trusted-pem</B> &lt;file&gt; <DT><DD> <DD>load trusted (root) certificate from PEM file &lt;file&gt; <DT> <B>--untrusted-pem</B> &lt;file&gt; <DT><DD> <DD>load untrusted certificate from PEM file &lt;file&gt; <DT> <B>--trusted-der</B> &lt;file&gt; <DT><DD> <DD>load trusted (root) certificate from DER file &lt;file&gt; <DT> <B>--untrusted-der</B> &lt;file&gt; <DT><DD> <DD>load untrusted certificate from DER file &lt;file&gt; <DT> <B>--verification-time</B> &lt;time&gt; <DT><DD> <DD>the local time in &quot;YYYY-MM-DD HH:MM:SS&quot; format used certificates verification <DT> <B>--depth</B> &lt;number&gt; <DT><DD> <DD>maximum certificates chain depth <DT> <B>--X509-skip-strict-checks</B> <DT><DD> <DD>skip strict checking of X509 data <DT> <B>--crypto</B> &lt;name&gt; <DT><DD> <DD>the name of the crypto engine to use (if not specified, the default crypto engine is used) <DT> <B>--crypto-config</B> &lt;path&gt; <DT><DD> <DD>path to crypto engine configuration <DT> <B>--repeat</B> &lt;number&gt; <DT><DD> <DD>repeat the operation &lt;number&gt; times <DT> <B>--disable-error-msgs</B> <DT><DD> <DD>do not print xmlsec error messages <DT> <B>--print-crypto-error-msgs</B> <DT><DD> <DD>print errors stack at the end <DT> <B>--help</B> <DT><DD> <DD>print help information about the command </DL> <A NAME="lbAF">&nbsp;</A> <H2>AUTHOR</H2> Written by Aleksey Sanin &lt;<A HREF="mailto:aleksey@aleksey.com">aleksey@aleksey.com</A>&gt;. <A NAME="lbAG">&nbsp;</A> <H2>REPORTING BUGS</H2> Report bugs to <A HREF="http://www.aleksey.com/xmlsec/bugs.html">http://www.aleksey.com/xmlsec/bugs.html</A> <A NAME="lbAH">&nbsp;</A> <H2>COPYRIGHT</H2> Copyright &#169; 2002-2003 Aleksey Sanin. <BR> This is free software: see the source for copying information. <P> <HR> <A NAME="index">&nbsp;</A><H2>Index</H2> <DL> <DT><A HREF="#lbAB">NAME</A><DD> <DT><A HREF="#lbAC">SYNOPSIS</A><DD> <DT><A HREF="#lbAD">DESCRIPTION</A><DD> <DT><A HREF="#lbAE">OPTIONS</A><DD> <DT><A HREF="#lbAF">AUTHOR</A><DD> <DT><A HREF="#lbAG">REPORTING BUGS</A><DD> <DT><A HREF="#lbAH">COPYRIGHT</A><DD> </DL> <HR> This document was created by <A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> Time: 21:01:40 GMT, January 05, 2004 </BODY> </HTML> \ No newline at end of file
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Manpage of XMLSEC1</title>
+</head>
+<body><table witdh="100%" valign="top"><tr valign="top">
+<td valign="top" align="left" width="210">
+<img src="images/logo.gif" alt="XML Security Library" border="0"><p></p>
+<ul>
+<li><a href="index.html">Home</a></li>
+<li><a href="download.html">Download</a></li>
+<li><a href="news.html">News</a></li>
+<li><a href="documentation.html">Documentation</a></li>
+<ul>
+<li><a href="faq.html">FAQ</a></li>
+<li><a href="api/xmlsec-notes.html">Tutorial</a></li>
+<li><a href="api/xmlsec-reference.html">API reference</a></li>
+<li><a href="api/xmlsec-examples.html">Examples</a></li>
+</ul>
+<li><a href="xmldsig.html">XML Digital Signature</a></li>
+<ul><li><a href="http://www.aleksey.com/xmlsec/xmldsig-verifier.html">Online Verifier</a></li></ul>
+<li><a href="xmlenc.html">XML Encryption</a></li>
+<li><a href="c14n.html">XML Canonicalization</a></li>
+<li><a href="bugs.html">Reporting Bugs</a></li>
+<li><a href="http://www.aleksey.com/pipermail/xmlsec">Mailing list</a></li>
+<li><a href="related.html">Related</a></li>
+<li><a href="authors.html">Authors</a></li>
+</ul>
+<table width="100%">
+<tr>
+<td width="15"></td>
+<td><a href="http://xmlsoft.org/"><img src="images/libxml2-logo.png" alt="LibXML2" border="0"></a></td>
+</tr>
+<tr>
+<td width="15"></td>
+<td><a href="http://xmlsoft.org/XSLT"><img src="images/libxslt-logo.png" alt="LibXSLT" border="0"></a></td>
+</tr>
+<tr>
+<td width="15"></td>
+<td><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a></td>
+</tr>
+</table>
+</td>
+<td valign="top"><table width="100%" valign="top">
+<tr><td valign="top" align="left" id="xmlsecContent">
+<h1>XMLSEC1</h1>
+<p> Section: User Commands (1)<br>Updated: January 2004<br><a href="#index">Index</a> <a href="http://localhost/cgi-bin/man/man2html">Return to Main Contents</a>
+</p>
+<hr>
+<a name="lbAB"> </a><h2>NAME</h2>
+<p> xmlsec1 - manual page for xmlsec1 1.2.3 (openssl) <a name="lbAC"> </a> </p>
+<h2>SYNOPSIS</h2>
+<b>xmlsec</b><i>&lt;command&gt; </i><p>[<i>&lt;options&gt;</i>] [<i>&lt;file&gt;</i>] <a name="lbAD"> </a> </p>
+<h2>DESCRIPTION</h2>
+<p> xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents. The allowed &lt;command&gt; values are: </p>
+<dl compact>
+<dt><b>--help</b></dt>
+<dd> display this help information and exit </dd>
+<dt><b>--help-all</b></dt>
+<dd> display help information for all commands/options and exit </dd>
+<dt>
+<b>--help-</b>&lt;cmd&gt;</dt>
+<dd> display help information for command &lt;cmd&gt; and exit </dd>
+<dt><b>--version</b></dt>
+<dd> print version information and exit </dd>
+<dt><b>--keys</b></dt>
+<dd> keys XML file manipulation </dd>
+<dt><b>--sign</b></dt>
+<dd> sign data and output XML document </dd>
+<dt><b>--verify</b></dt>
+<dd> verify signed document </dd>
+<dt><b>--sign-tmpl</b></dt>
+<dd> create and sign dynamicaly generated signature template </dd>
+<dt><b>--encrypt</b></dt>
+<dd> encrypt data and output XML document </dd>
+<dt><b>--decrypt</b></dt>
+<dd> decrypt data from XML document </dd>
+</dl>
+<a name="lbAE"> </a><h2>OPTIONS</h2>
+<dl compact>
+<dt> <b>--ignore-manifests</b> <dt></dt>
+</dt>
+<dd> <dd>do not process &lt;dsig:Manifest&gt; elements </dd>
+</dd>
+<dt> <b>--store-references</b> <dt></dt>
+</dt>
+<dd> <dd>store and print the result of &lt;dsig:Reference/&gt; element processing just before calculating digest </dd>
+</dd>
+<dt> <b>--store-signatures</b> <dt></dt>
+</dt>
+<dd> <dd>store and print the result of &lt;dsig:Signature&gt; processing just before calculating signature </dd>
+</dd>
+<dt> <b>--enabled-reference-uris</b> &lt;list&gt; <dt></dt>
+</dt>
+<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the &lt;dsig:Reference&gt; element </dd>
+</dd>
+<dt> <b>--enable-visa3d-hack</b> <dt></dt>
+</dt>
+<dd> <dd>enables Visa3D protocol specific hack for URI attributes processing when we are trying not to use XPath/XPointer engine; this is a hack and I don't know what else might be broken in your application when you use it (also check "--id-attr" option because you might need it) </dd>
+</dd>
+<dt> <b>--binary-data</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>binary &lt;file&gt; to encrypt </dd>
+</dd>
+<dt> <b>--xml-data</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>XML &lt;file&gt; to encrypt </dd>
+</dd>
+<dt> <b>--enabled-cipher-reference-uris</b> &lt;list&gt; <dt></dt>
+</dt>
+<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the &lt;enc:CipherReference&gt; element </dd>
+</dd>
+<dt> <b>--session-key</b> &lt;keyKlass&gt;-&lt;keySize&gt; <dt></dt>
+</dt>
+<dd> <dd>generate new session &lt;keyKlass&gt; key of &lt;keySize&gt; bits size (for example, "--session des-192" generates a new 192 bits DES key for DES3 encryption) </dd>
+</dd>
+<dt> <b>--output</b> &lt;filename&gt; <dt></dt>
+</dt>
+<dd> <dd>write result document to file &lt;filename&gt; </dd>
+</dd>
+<dt> <b>--print-debug</b> <dt></dt>
+</dt>
+<dd> <dd>print debug information to stdout </dd>
+</dd>
+<dt> <b>--print-xml-debug</b> <dt></dt>
+</dt>
+<dd> <dd>print debug information to stdout in xml format </dd>
+</dd>
+<dt> <b>--dtd-file</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load the specified file as the DTD </dd>
+</dd>
+<dt> <b>--node-id</b> &lt;id&gt; <dt></dt>
+</dt>
+<dd> <dd>set the operation start point to the node with given &lt;id&gt; </dd>
+</dd>
+<dt> <b>--node-name</b> [&lt;namespace-uri&gt;:]&lt;name&gt; <dt></dt>
+</dt>
+<dd> <dd>set the operation start point to the first node with given &lt;name&gt; and &lt;namespace&gt; URI </dd>
+</dd>
+<dt> <b>--node-xpath</b> &lt;expr&gt; <dt></dt>
+</dt>
+<dd> <dd>set the operation start point to the first node selected by the specified XPath expression </dd>
+</dd>
+<dt> <b>--id-attr[</b>:&lt;attr-name&gt;] [&lt;node-namespace-uri&gt;:]&lt;node-name&gt; <dt></dt>
+</dt>
+<dd> <dd>adds attributes &lt;attr-name&gt; (default value "id") from all nodes with&lt;node-name&gt; and namespace &lt;node-namespace-uri&gt; to the list of known ID attributes; this is a hack and if you can use DTD or schema to declare ID attributes instead (see "--dtd-file" option), I don't know what else might be broken in your application when you use this hack </dd>
+</dd>
+<dt> <b>--enabled-key-data</b> &lt;list&gt; <dt></dt>
+</dt>
+<dd> <dd>comma separated list of enabled key data (list of registered key data klasses is available with "--list-key-data" command); by default, all registered key data are enabled </dd>
+</dd>
+<dt> <b>--enabled-retrieval-uris</b> &lt;list&gt; <dt></dt>
+</dt>
+<dd> <dd>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the &lt;dsig:RetrievalMethod&gt; element. </dd>
+</dd>
+<dt> <b>--gen-key[</b>:&lt;name&gt;] &lt;keyKlass&gt;-&lt;keySize&gt; <dt></dt>
+</dt>
+<dd> <dd>generate new &lt;keyKlass&gt; key of &lt;keySize&gt; bits size, set the key name to &lt;name&gt; and add the result to keys manager (for example, "--gen:mykey rsa-1024" generates a new 1024 bits RSA key and sets it's name to "mykey") </dd>
+</dd>
+<dt> <b>--keys-file</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load keys from XML file </dd>
+</dd>
+<dt> <b>--privkey-pem[</b>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <dt></dt>
+</dt>
+<dd> <dd>load private key from PEM file and certificates that verify this key </dd>
+</dd>
+<dt> <b>--privkey-der[</b>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <dt></dt>
+</dt>
+<dd> <dd>load private key from DER file and certificates that verify this key </dd>
+</dd>
+<dt> <b>--pkcs-pem[</b>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <dt></dt>
+</dt>
+<dd> <dd>load private key from PKCS8 PEM file and PEM certificates that verify this key </dd>
+</dd>
+<dt> <b>--pkcs8-der[</b>:&lt;name&gt;] &lt;file&gt;[,&lt;cafile&gt;[,&lt;cafile&gt;[...]]] <dt></dt>
+</dt>
+<dd> <dd>load private key from PKCS8 DER file and DER certificates that verify this key </dd>
+</dd>
+<dt> <b>--pubkey-pem[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load public key from PEM file </dd>
+</dd>
+<dt> <b>--pubkey-der[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load public key from DER file </dd>
+</dd>
+<dt> <b>--aeskey[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load AES key from binary file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--deskey[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load DES key from binary file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--hmackey[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load HMAC key from binary file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--pwd</b> &lt;password&gt; <dt></dt>
+</dt>
+<dd> <dd>the password to use for reading keys and certs </dd>
+</dd>
+<dt> <b>--pkcs12[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load load private key from pkcs12 file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--pubkey-cert-pem[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load public key from PEM cert file </dd>
+</dd>
+<dt> <b>--pubkey-cert-der[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load public key from DER cert file </dd>
+</dd>
+<dt> <b>--trusted-pem</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load trusted (root) certificate from PEM file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--untrusted-pem</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load untrusted certificate from PEM file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--trusted-der</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load trusted (root) certificate from DER file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--untrusted-der</b> &lt;file&gt; <dt></dt>
+</dt>
+<dd> <dd>load untrusted certificate from DER file &lt;file&gt; </dd>
+</dd>
+<dt> <b>--verification-time</b> &lt;time&gt; <dt></dt>
+</dt>
+<dd> <dd>the local time in "YYYY-MM-DD HH:MM:SS" format used certificates verification </dd>
+</dd>
+<dt> <b>--depth</b> &lt;number&gt; <dt></dt>
+</dt>
+<dd> <dd>maximum certificates chain depth </dd>
+</dd>
+<dt> <b>--X509-skip-strict-checks</b> <dt></dt>
+</dt>
+<dd> <dd>skip strict checking of X509 data </dd>
+</dd>
+<dt> <b>--crypto</b> &lt;name&gt; <dt></dt>
+</dt>
+<dd> <dd>the name of the crypto engine to use (if not specified, the default crypto engine is used) </dd>
+</dd>
+<dt> <b>--crypto-config</b> &lt;path&gt; <dt></dt>
+</dt>
+<dd> <dd>path to crypto engine configuration </dd>
+</dd>
+<dt> <b>--repeat</b> &lt;number&gt; <dt></dt>
+</dt>
+<dd> <dd>repeat the operation &lt;number&gt; times </dd>
+</dd>
+<dt> <b>--disable-error-msgs</b> <dt></dt>
+</dt>
+<dd> <dd>do not print xmlsec error messages </dd>
+</dd>
+<dt> <b>--print-crypto-error-msgs</b> <dt></dt>
+</dt>
+<dd> <dd>print errors stack at the end </dd>
+</dd>
+<dt> <b>--help</b> <dt></dt>
+</dt>
+<dd> <dd>print help information about the command </dd>
+</dd>
+</dl>
+<a name="lbAF"> </a><h2>AUTHOR</h2>
+<p> Written by Aleksey Sanin &lt;<a href="mailto:aleksey@aleksey.com">aleksey@aleksey.com</a>&gt;. <a name="lbAG"> </a> </p>
+<h2>REPORTING BUGS</h2>
+<p> Report bugs to <a href="http://www.aleksey.com/xmlsec/bugs.html">http://www.aleksey.com/xmlsec/bugs.html</a> <a name="lbAH"> </a> </p>
+<h2>COPYRIGHT</h2>
+<p> Copyright © 2002-2003 Aleksey Sanin. <br> This is free software: see the source for copying information. </p>
+<p> </p>
+<hr>
+<a name="index"> </a><h2>Index</h2>
+<dl>
+<dt><a href="#lbAB">NAME</a></dt>
+<dd> </dd>
+<dt><a href="#lbAC">SYNOPSIS</a></dt>
+<dd> </dd>
+<dt><a href="#lbAD">DESCRIPTION</a></dt>
+<dd> </dd>
+<dt><a href="#lbAE">OPTIONS</a></dt>
+<dd> </dd>
+<dt><a href="#lbAF">AUTHOR</a></dt>
+<dd> </dd>
+<dt><a href="#lbAG">REPORTING BUGS</a></dt>
+<dd> </dd>
+<dt><a href="#lbAH">COPYRIGHT</a></dt>
+<dd> </dd>
+</dl>
+<hr>
+<p> This document was created by <a href="http://localhost/cgi-bin/man/man2html">man2html</a>, using the manual pages.<br> Time: 21:30:15 GMT, January 05, 2004 </p>
+</td></tr>
+<tr><td>
+<br><br><p><a href="bugs.html">Aleksey Sanin</a></p>
+</td></tr>
+</table></td>
+</tr></table></body>
+</html>
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
index c91a4b8c..06a798d9 100644
--- a/man/xmlsec1-config.1
+++ b/man/xmlsec1-config.1
@@ -31,5 +31,5 @@ output version information
.TP
\fB\-\-crypto\fR=\fILIB\fR
configure with XMLSEC crypto library (one of the
-following: none default openssl gnutls nss)
+following: none default openssl nss)
[default "openssl"]
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
index f74ffff6..705226d8 100644
--- a/man/xmlsec1.1
+++ b/man/xmlsec1.1
@@ -38,12 +38,6 @@ encrypt data and output XML document
.TP
\fB\-\-decrypt\fR
decrypt data from XML document
-.TP
-\fB\-\-xkis\-server\-locate\fR
-process data as XKMS/XKISS Locate request
-.TP
-\fB\-\-xkis\-server\-validate\fR
-process data as XKMS/XKISS Validate request
.SH OPTIONS
.HP
\fB\-\-ignore\-manifests\fR