diff options
author | Aleksey Sanin <aleksey@src.gnome.org> | 2003-05-26 05:06:15 +0000 |
---|---|---|
committer | Aleksey Sanin <aleksey@src.gnome.org> | 2003-05-26 05:06:15 +0000 |
commit | 313c9d7092b3ece0ddd03b2ec83fb7fffa7750d4 (patch) | |
tree | 727a898b28fe3090ccebd4357715d8c40c6a25dd | |
parent | 3982f5c02acea7ffcd4be79ee441d4ef8c4bc1a0 (diff) | |
download | xmlsec1-313c9d7092b3ece0ddd03b2ec83fb7fffa7750d4.tar.gz xmlsec1-313c9d7092b3ece0ddd03b2ec83fb7fffa7750d4.tar.bz2 xmlsec1-313c9d7092b3ece0ddd03b2ec83fb7fffa7750d4.zip |
made minor documentation and configuration fixes reported by John Belmonte
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | apps/xmlsec.c | 2 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | docs/xmlsec-man.html | 272 | ||||
-rw-r--r-- | examples/README | 9 | ||||
-rw-r--r-- | man/xmlsec1-config.1 | 10 | ||||
-rw-r--r-- | man/xmlsec1.1 | 29 | ||||
-rw-r--r-- | tests/keys.xml | 44 |
8 files changed, 61 insertions, 314 deletions
@@ -1,3 +1,10 @@ +Sun May 25 22:01:45 2003 Aleksey Sanin <aleksey@aleksey.com> + + * apps/xmlsec.c docs/xmlsec-man.html man/xmlsec1-config.1 man/xmlsec1.1: + fixed help typo (reported by John Belmonte) + * examples/README: removed obsolete autoconf information (reported by John Belmonte) + * configure.in: added /usr/include/mozilla to NSS include path search list (reported by John Belmonte) + Thu May 15 03:08:18 2003 Aleksey Sanin <aleksey@aleksey.com> * apps/crypto.c apps/crypto.h apps/xmlsec.c: added command line diff --git a/apps/xmlsec.c b/apps/xmlsec.c index 5aee1059..c2ea09de 100644 --- a/apps/xmlsec.c +++ b/apps/xmlsec.c @@ -52,7 +52,7 @@ static const char bugs[] = static const char helpCommands1[] = "Usage: xmlsec <command> [<options>] [<file>]\n" "\n" - "xmlsec is a command line tool for singining, verifying, encrypting and\n" + "xmlsec is a command line tool for signing, verifying, encrypting and\n" "decrypting XML documents. The allowed <command> values are:\n" " --help " "\tdisplay this help information and exit\n" " --help-all " "\tdisplay help information for all commands/options and exit\n" diff --git a/configure.in b/configure.in index 33b2d314..124534fe 100644 --- a/configure.in +++ b/configure.in @@ -434,7 +434,7 @@ else ac_mozilla_name=mozilla-$MOZILLA_VERSION ac_nss_lib_dir="/usr/lib /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" - ac_nss_inc_dir="/usr/include /usr/local/include /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name" + ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name" dnl now look for nspr AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html index 590e6ef5..67dfa99d 100644 --- a/docs/xmlsec-man.html +++ b/docs/xmlsec-man.html @@ -1,271 +1 @@ -<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="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> -</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: April 2003<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.0.0 (openssl) <a name="lbAC"> </a> </p> -<h2>SYNOPSIS</h2> -<b>xmlsec</b><i><command> </i><p>[<i><options></i>] [<i><file></i>] <a name="lbAD"> </a> </p> -<h2>DESCRIPTION</h2> -<p> xmlsec is a command line tool for singining, verifying, encrypting and decrypting XML documents. The allowed <command> 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><cmd></dt> -<dd> display help information for command <cmd> 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 <dsig:Manifest> elements </dd> -</dd> -<dt> <b>--store-references</b> <dt></dt> -</dt> -<dd> <dd>store and print the result of <dsig:Reference/> element processing just before calculating digest </dd> -</dd> -<dt> <b>--store-signatures</b> <dt></dt> -</dt> -<dd> <dd>store and print the result of <dsig:Signature> processing just before calculating signature </dd> -</dd> -<dt> <b>--enabled-reference-uris</b> <list> <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 <dsig:Reference> element </dd> -</dd> -<dt> <b>--binary-data</b> <file> <dt></dt> -</dt> -<dd> <dd>binary <file> to encrypt </dd> -</dd> -<dt> <b>--xml-data</b> <file> <dt></dt> -</dt> -<dd> <dd>XML <file> to encrypt </dd> -</dd> -<dt> <b>--enabled-cipher-reference-uris</b> <list> <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 <enc:CipherReference> element </dd> -</dd> -<dt> <b>--session-key</b> <keyKlass>-<keySize> <dt></dt> -</dt> -<dd> <dd>generate new session <keyKlass> key of <keySize> bits size (for example, "--session des-192" generates a new 192 bits DES key for DES3 encryption) </dd> -</dd> -<dt> <b>--output</b> <filename> <dt></dt> -</dt> -<dd> <dd>write result document to file <filename> </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> <file> <dt></dt> -</dt> -<dd> <dd>load the specified file as the DTD </dd> -</dd> -<dt> <b>--node-id</b> <id> <dt></dt> -</dt> -<dd> <dd>set the operation start point to the node with given <id> </dd> -</dd> -<dt> <b>--node-name</b> [<namespace-uri>:]<name> <dt></dt> -</dt> -<dd> <dd>set the operation start point to the first node with given <name> and <namespace> URI </dd> -</dd> -<dt> <b>--node-xpath</b> <expr> <dt></dt> -</dt> -<dd> <dd>set the operation start point to the first node selected by the specified XPath expression </dd> -</dd> -<dt> <b>--enabled-key-data</b> <list> <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> <list> <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 <dsig:RetrievalMethod> element. </dd> -</dd> -<dt> <b>--gen-key[</b>:<name>] <keyKlass>-<keySize> <dt></dt> -</dt> -<dd> <dd>generate new <keyKlass> key of <keySize> bits size, set the key name to <name> 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> <file> <dt></dt> -</dt> -<dd> <dd>load keys from XML file </dd> -</dd> -<dt> <b>--privkey[</b>:<name>] <file>[,<cafile>[,<cafile>[...]]] <dt></dt> -</dt> -<dd> <dd>load private key from PEM file and certificates that verify this key </dd> -</dd> -<dt> <b>--pubkey[</b>:<name>] <file> <dt></dt> -</dt> -<dd> <dd>load public key from PEM file </dd> -</dd> -<dt> <b>--aeskey[</b>:<name>] <file> <dt></dt> -</dt> -<dd> <dd>load AES key from binary file <file> </dd> -</dd> -<dt> <b>--deskey[</b>:<name>] <file> <dt></dt> -</dt> -<dd> <dd>load DES key from binary file <file> </dd> -</dd> -<dt> <b>--hmackey[</b>:<name>] <file> <dt></dt> -</dt> -<dd> <dd>load HMAC key from binary file <file> </dd> -</dd> -<dt> <b>--pwd</b> <password> <dt></dt> -</dt> -<dd> <dd>the password to use for reading keys and certs </dd> -</dd> -<dt> <b>--pkcs12[</b>:<name>] <file> <dt></dt> -</dt> -<dd> <dd>load load private key from pkcs12 file <file> </dd> -</dd> -<dt> <b>--trusted</b> <file> <dt></dt> -</dt> -<dd> <dd>load trusted (root) certificate from PEM file <file> </dd> -</dd> -<dt> <b>--untrusted</b> <file> <dt></dt> -</dt> -<dd> <dd>load untrusted certificate from PEM file <file> </dd> -</dd> -<dt> <b>--trusted-der</b> <file> <dt></dt> -</dt> -<dd> <dd>load trusted (root) certificate from DER file <file> </dd> -</dd> -<dt> <b>--untrusted-der</b> <file> <dt></dt> -</dt> -<dd> <dd>load untrusted certificate from DER file <file> </dd> -</dd> -<dt> <b>--verification-time</b> <time> <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> <number> <dt></dt> -</dt> -<dd> <dd>maximum certificates chain depth </dd> -</dd> -<dt> <b>--crypto-config</b> <dt></dt> -</dt> -<dd> <dd>path to crypto engine configuration </dd> -</dd> -<dt> <b>--repeat</b> <number> <dt></dt> -</dt> -<dd> <dd>repeat the operation <number> 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 openssl 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 <<a href="mailto:aleksey@aleksey.com">aleksey@aleksey.com</a>>. <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. <a name="lbAI"> </a> </p> -<h2>SEE ALSO</h2> -<p> The full documentation for <b>xmlsec1</b> is maintained as a Texinfo manual. If the <b>info</b> and <b>xmlsec1</b> programs are properly installed at your site, the command </p> -<dl compact> -<dt></dt> -<dd> <b>info xmlsec1</b> </dd> -</dl> -<p> should give you access to the complete manual. </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> -<dt><a href="#lbAI">SEE ALSO</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: 22:10:05 GMT, April 20, 2003 </p> -</td></tr> -<tr><td> -<br><br><p><a href="bugs.html">Aleksey Sanin</a></p> -</td></tr> -</table></td> -</tr></table></body> -</html> + <HTML><HEAD><TITLE>Manpage of XMLSEC1</TITLE> </HEAD><BODY> <H1>XMLSEC1</H1> Section: User Commands (1)<BR>Updated: May 2003<BR><A HREF="#index">Index</A> <A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> <H2>NAME</H2> xmlsec1 - manual page for xmlsec1 1.0.1 (openssl) <A NAME="lbAC"> </A> <H2>SYNOPSIS</H2> <B>xmlsec</B> <I><command> </I>[<I><options></I>] [<I><file></I>] <A NAME="lbAD"> </A> <H2>DESCRIPTION</H2> xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents. The allowed <command> 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><cmd><DD> display help information for command <cmd> 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"> </A> <H2>OPTIONS</H2> <DL COMPACT> <DT> <B>--ignore-manifests</B> <DT><DD> <DD>do not process <dsig:Manifest> elements <DT> <B>--store-references</B> <DT><DD> <DD>store and print the result of <dsig:Reference/> element processing just before calculating digest <DT> <B>--store-signatures</B> <DT><DD> <DD>store and print the result of <dsig:Signature> processing just before calculating signature <DT> <B>--enabled-reference-uris</B> <list> <DT><DD> <DD>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:Reference> element <DT> <B>--binary-data</B> <file> <DT><DD> <DD>binary <file> to encrypt <DT> <B>--xml-data</B> <file> <DT><DD> <DD>XML <file> to encrypt <DT> <B>--enabled-cipher-reference-uris</B> <list> <DT><DD> <DD>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <enc:CipherReference> element <DT> <B>--session-key</B> <keyKlass>-<keySize> <DT><DD> <DD>generate new session <keyKlass> key of <keySize> bits size (for example, "--session des-192" generates a new 192 bits DES key for DES3 encryption) <DT> <B>--output</B> <filename> <DT><DD> <DD>write result document to file <filename> <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> <file> <DT><DD> <DD>load the specified file as the DTD <DT> <B>--node-id</B> <id> <DT><DD> <DD>set the operation start point to the node with given <id> <DT> <B>--node-name</B> [<namespace-uri>:]<name> <DT><DD> <DD>set the operation start point to the first node with given <name> and <namespace> URI <DT> <B>--node-xpath</B> <expr> <DT><DD> <DD>set the operation start point to the first node selected by the specified XPath expression <DT> <B>--enabled-key-data</B> <list> <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 <DT> <B>--enabled-retrieval-uris</B> <list> <DT><DD> <DD>comma separated list of of the following values: "empty", "same-doc", "local","remote" to restrict possible URI attribute values for the <dsig:RetrievalMethod> element. <DT> <B>--gen-key[</B>:<name>] <keyKlass>-<keySize> <DT><DD> <DD>generate new <keyKlass> key of <keySize> bits size, set the key name to <name> 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") <DT> <B>--keys-file</B> <file> <DT><DD> <DD>load keys from XML file <DT> <B>--privkey-pem[</B>:<name>] <file>[,<cafile>[,<cafile>[...]]] <DT><DD> <DD>load private key from PEM file and certificates that verify this key <DT> <B>--privkey-der[</B>:<name>] <file>[,<cafile>[,<cafile>[...]]] <DT><DD> <DD>load private key from DER file and certificates that verify this key <DT> <B>--pubkey-pem[</B>:<name>] <file> <DT><DD> <DD>load public key from PEM file <DT> <B>--pubkey-der[</B>:<name>] <file> <DT><DD> <DD>load public key from DER file <DT> <B>--aeskey[</B>:<name>] <file> <DT><DD> <DD>load AES key from binary file <file> <DT> <B>--deskey[</B>:<name>] <file> <DT><DD> <DD>load DES key from binary file <file> <DT> <B>--hmackey[</B>:<name>] <file> <DT><DD> <DD>load HMAC key from binary file <file> <DT> <B>--pwd</B> <password> <DT><DD> <DD>the password to use for reading keys and certs <DT> <B>--pkcs12[</B>:<name>] <file> <DT><DD> <DD>load load private key from pkcs12 file <file> <DT> <B>--trusted-pem</B> <file> <DT><DD> <DD>load trusted (root) certificate from PEM file <file> <DT> <B>--untrusted-pem</B> <file> <DT><DD> <DD>load untrusted certificate from PEM file <file> <DT> <B>--trusted-der</B> <file> <DT><DD> <DD>load trusted (root) certificate from DER file <file> <DT> <B>--untrusted-der</B> <file> <DT><DD> <DD>load untrusted certificate from DER file <file> <DT> <B>--verification-time</B> <time> <DT><DD> <DD>the local time in "YYYY-MM-DD HH:MM:SS" format used certificates verification <DT> <B>--depth</B> <number> <DT><DD> <DD>maximum certificates chain depth <DT> <B>--crypto-config</B> <DT><DD> <DD>path to crypto engine configuration <DT> <B>--repeat</B> <number> <DT><DD> <DD>repeat the operation <number> 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 openssl errors stack at the end <DT> <B>--help</B> <DT><DD> <DD>print help information about the command </DL> <A NAME="lbAF"> </A> <H2>AUTHOR</H2> Written by Aleksey Sanin <<A HREF="mailto:aleksey@aleksey.com">aleksey@aleksey.com</A>>. <A NAME="lbAG"> </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"> </A> <H2>COPYRIGHT</H2> Copyright © 2002-2003 Aleksey Sanin. <BR> This is free software: see the source for copying information. <A NAME="lbAI"> </A> <H2>SEE ALSO</H2> The full documentation for <B>xmlsec1</B> is maintained as a Texinfo manual. If the <B>info</B> and <B>xmlsec1</B> programs are properly installed at your site, the command <DL COMPACT> <DT><DD> <B>info xmlsec1</B> </DL> <P> should give you access to the complete manual. <P> <HR> <A NAME="index"> </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> <DT><A HREF="#lbAI">SEE ALSO</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: 04:51:56 GMT, May 26, 2003 </BODY> </HTML>
\ No newline at end of file diff --git a/examples/README b/examples/README index 55b4cd5e..98a2db39 100644 --- a/examples/README +++ b/examples/README @@ -44,13 +44,8 @@ This folder contains XML Security Library examples. ------------------------- Unixes: - The usual (assuming that xmlsec, libxml and all other required - libraries are already installed): - ./autogen.sh - ./configure - make - This will build all the examples. Please note that you MUST run - ./autogen,sh first!!! + Just run the usual 'make' command (assuming that xmlsec, libxml and + all other required libraries are already installed). Windows: - Add paths to include and library files for xmlsec, libxml2, libexslt and diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1 index 67715b89..a7c088af 100644 --- a/man/xmlsec1-config.1 +++ b/man/xmlsec1-config.1 @@ -1,18 +1,18 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH XMLSEC1-CONFIG "1" "April 2003" "xmlsec1-config 1.0.0" "User Commands" +.TH XMLSEC1-CONFIG "1" "May 2003" "xmlsec1-config 1.0.1" "User Commands" .SH NAME -xmlsec1-config \- manual page for xmlsec1-config 1.0.0 +xmlsec1-config \- manual page for xmlsec1-config 1.0.1 .SH SYNOPSIS -.B xmlsec-config +.B xmlsec1-config [\fIOPTION\fR]... .SH DESCRIPTION Known values for OPTION are: .TP \fB\-\-prefix\fR=\fIDIR\fR -change XMLSEC prefix [default /home/aleksey] +change XMLSEC prefix [default /usr/local] .TP \fB\-\-exec\-prefix\fR=\fIDIR\fR -change XMLSEC executable prefix [default /home/aleksey] +change XMLSEC executable prefix [default /usr/local] .TP \fB\-\-libs\fR print library linking information diff --git a/man/xmlsec1.1 b/man/xmlsec1.1 index 6a7f8ab3..161af7ec 100644 --- a/man/xmlsec1.1 +++ b/man/xmlsec1.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29. -.TH XMLSEC1 "1" "April 2003" "xmlsec1 1.0.0 (openssl)" "User Commands" +.TH XMLSEC1 "1" "May 2003" "xmlsec1 1.0.1 (openssl)" "User Commands" .SH NAME -xmlsec1 \- manual page for xmlsec1 1.0.0 (openssl) +xmlsec1 \- manual page for xmlsec1 1.0.1 (openssl) .SH SYNOPSIS .B xmlsec \fI<command> \fR[\fI<options>\fR] [\fI<file>\fR] .SH DESCRIPTION -xmlsec is a command line tool for singining, verifying, encrypting and +xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents. The allowed <command> values are: .TP \fB\-\-help\fR @@ -38,6 +38,12 @@ 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 @@ -133,15 +139,24 @@ a new 1024 bits RSA key and sets it's name to "mykey") .IP load keys from XML file .HP -\fB\-\-privkey[\fR:<name>] <file>[,<cafile>[,<cafile>[...]]] +\fB\-\-privkey\-pem[\fR:<name>] <file>[,<cafile>[,<cafile>[...]]] .IP load private key from PEM file and certificates that verify this key .HP -\fB\-\-pubkey[\fR:<name>] <file> +\fB\-\-privkey\-der[\fR:<name>] <file>[,<cafile>[,<cafile>[...]]] +.IP +load private key from DER file and certificates +that verify this key +.HP +\fB\-\-pubkey\-pem[\fR:<name>] <file> .IP load public key from PEM file .HP +\fB\-\-pubkey\-der[\fR:<name>] <file> +.IP +load public key from DER file +.HP \fB\-\-aeskey[\fR:<name>] <file> .IP load AES key from binary file <file> @@ -162,11 +177,11 @@ the password to use for reading keys and certs .IP load load private key from pkcs12 file <file> .HP -\fB\-\-trusted\fR <file> +\fB\-\-trusted\-pem\fR <file> .IP load trusted (root) certificate from PEM file <file> .HP -\fB\-\-untrusted\fR <file> +\fB\-\-untrusted\-pem\fR <file> .IP load untrusted certificate from PEM file <file> .HP diff --git a/tests/keys.xml b/tests/keys.xml index ad76b211..8e576fb0 100644 --- a/tests/keys.xml +++ b/tests/keys.xml @@ -3,7 +3,7 @@ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-hmac-sha1</KeyName> <KeyValue> -<HMACKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">AfjPuaonTaS8039aRYT9PJIncxd64XM5</HMACKeyValue> +<HMACKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">aHGdkflfuA1It5XjbQSzX7lc8kawL9Ug</HMACKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> @@ -11,17 +11,17 @@ <KeyValue> <RSAKeyValue> <Modulus> -xNYgsNEazlFhRzjz9HTQRxorjyD8xMACLatNxqx0Jl0pWmrPmM3r2noPU4IVZzv8 -lpmvFjApp80oNmZ5J2dWWORAghO3rZSWYu63fs5pgjV2in0u111IeJRE0Y1xjvp4 -dBdUywosQdigSYWsV2dsfje8WnTf2GmRpcdjbaNnHmc= +1dpkiqdr35ToN2tTxCRqT4RXpvBx78dI7GBwcvTtaXD6VOL4I1Q5du4XVhSqfRpo +K9tYwX0avB1xROf7iHhPbkSEXwfkplPKR82WN/q37RTmaXUPqyHkmXK57N+PeEz+ +DE9cQAlhQpyAL/bcNP/7s0hMa6leao3e7qKyWvWDPIE= </Modulus> <Exponent> Aw== </Exponent> <PrivateExponent xmlns="http://www.aleksey.com/xmlsec/2002"> -gzlrIItnNDZA2iX3+E3gL2bHtMCogyqsHnIz2chNbujGPEc1EIlH5vwKN6wORNKo -ZGZ0uXVxGojFeZmmGkTkOhZIhnwTaLAlSVocMQn5FePY0qJZqofCBYFD8G996fUo -WqtdK24hHZVXu7Emzui63DS0ISmr2qUdZB9NvrOnmFs= +jpGYXG+dP7iaz5zigsLxilg6b0r2n9ownZWgTKNI8PX8OJdQF417pJ66OWMcU2bw +HTzl1lNnKBOg2JqnsFA08vV01pll4uR3JpAzyDP6XESthx1ehClZ4ALdvdukbE9v +vO2o1zUdYsUB9UEA64lDoUnFExtb9STdqSUIYCl3pKs= </PrivateExponent> </RSAKeyValue> </KeyValue> @@ -31,25 +31,25 @@ WqtdK24hHZVXu7Emzui63DS0ISmr2qUdZB9NvrOnmFs= <KeyValue> <DSAKeyValue> <P> -xCBjXTiL8HGJ6CHtWwZYlX3HJIaA2CwLBGkjoOdRIJqwMhp6RyVmp7r+9Dd/aIHL -E0s6NFs6gb+DtuvGz95zNKeuCBdxdRWEyveU28hGvpEwwOtHa2qLfNzdqzRLIPwS -9b4FkDRmFUh3TgjGmboL4hGfjeDlCzhnJqy/iMkZvBs= ++aVjBXlFAPXNrxfRJKXTOvp8VzPgnQSmzxL89gjoxNMm1DuHEa8BhtcwwWw4hdMr +Ghx/bV3E5OE2koO4nf08jH/oJe7w9CsHvLsI0loJAv0eia1QTwKm2nThCinUXsgS +wFlr1Es8YKOqZaIjxVzQVnK8Aj1rwVv56VQvqZoC5h8= </P> <Q> -gXWLmXW5MzU96OowPtRmGZI6VIU= +u3Q+4L2rDutvONz6w6oakyLDoEc= </Q> <G> -bL66KcvJzZA7CoNuKKlQ5ipNs7YEQiZZIjKV8W8Dzj+MTkXun7oOibGm/G4k94BU -VgdnYzUqHfy2P+N6wjxLhdXYzUoUa2wq4xplKfeHlM/em7E0qZHqU1behMXC03sp -9kE4Ahu0v8h06knGBA7hq1XgkE0GAeOCvYxk9nyCMI8= +kIutpUNDix19bhsuO7yRmlCJLFXpqOJYKITAsHXAYgwlXQa5DkzU6POU22A5HbDw +rpU64e5hmP++XJ++QqzlRVpojwpLrFMa1uc3kx97SzA/QwyOCC/XdPwvWsLCO7Z/ +9XqiLr6caKdf+xdu40k6XIhcSZ1xKkGXnqIKdRYsLrs= </G> <X xmlns="http://www.aleksey.com/xmlsec/2002"> -O9SJbeYaa3q0IMNX45FQSPBm2tE= +bZ9Lewi3V8PYpY/G4WNDkLJXB6Q= </X> <Y> -FFtaw1HJygILFEt2ncpi6RvCGk94t/iquI5yLOsMG1HhER0i7ZT6z285D+61Gvbg -bzYziSKnvfivJ6s+yRMC+ASIrHSYatigsthHPkDLweddoFMRTEVQv4hxBRcD0MCS -C+F/buVhxK8VF8b7tRENpdJz11aDksZxp/3wceW0DyY= +I8gLcZSJW3FbnsgbmvqNUDAdy8ykwuevbpq+7z+19jp4/G4vEoIKCltPdQbpGnLv +bTf6p5qr7S+u/FcUepWvqaXqNVPh1+5DV/FwidY8BbFefunsZkgTtcTzVELHmi2O +GMYqRY5HHTsq/6rqaYlJPkR+QQmlal+2DCObpAznUVU= </Y> </DSAKeyValue> </KeyValue> @@ -57,25 +57,25 @@ C+F/buVhxK8VF8b7tRENpdJz11aDksZxp/3wceW0DyY= <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-des</KeyName> <KeyValue> -<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">5JshkDcTvLecQMe5SiEu7w7Jc53o1nYP</DESKeyValue> +<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">vCvC6yN8fFD1fh6pb7bNZ8WNqfi2+a3i</DESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes128</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">xox1D6R0anlISeFu/z4aeQ==</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">0jD9qoR6cH2COVuiuDDOpw==</AESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes192</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">m3gmSygEUvEBk9m8ijdi5hX4l3FJF5YX</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">FIOijJX7lhvcX8fAdj5LGHK7Atdle9UY</AESKeyValue> </KeyValue> </KeyInfo> <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> <KeyName>test-aes256</KeyName> <KeyValue> -<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">RNu1O1ZMOkScSPkIRAywuLrP9RJH5fmA0HxYnCFWSPA=</AESKeyValue> +<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">a6D0q6l3nTO6skkStbGjbSNtp4x4oDKzUJhz+10G3Wg=</AESKeyValue> </KeyValue> </KeyInfo> </Keys> |