summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Sanin <aleksey@src.gnome.org>2003-03-26 09:50:41 +0000
committerAleksey Sanin <aleksey@src.gnome.org>2003-03-26 09:50:41 +0000
commit9966dd62e62e6beefdd6d0a83cdc1680ff87682e (patch)
tree3667a03a0104953ba19ab9d32a307faef3494c0e
parentb6a238169a81001949bb9adcbff8491a5d774286 (diff)
downloadxmlsec1-9966dd62e62e6beefdd6d0a83cdc1680ff87682e.tar.gz
xmlsec1-9966dd62e62e6beefdd6d0a83cdc1680ff87682e.tar.bz2
xmlsec1-9966dd62e62e6beefdd6d0a83cdc1680ff87682e.zip
new release 0.1.1
-rw-r--r--ChangeLog4
-rw-r--r--apps/Makefile.am1
-rw-r--r--apps/xmlsec.c2
-rw-r--r--configure.in9
-rw-r--r--docs/download.html4
-rw-r--r--docs/index.html13
-rw-r--r--docs/news.html14
-rw-r--r--docs/xmlsec-man.html246
-rw-r--r--include/xmlsec/version.h8
-rw-r--r--include/xmlsec/xmldsig.h6
-rw-r--r--man/xmlsec.121
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gnutls/Makefile.am1
-rw-r--r--src/keysdata.c3
-rw-r--r--src/nss/Makefile.am1
-rw-r--r--src/openssl/Makefile.am1
-rw-r--r--tests/Makefile.am12
-rw-r--r--tests/keys.xml44
-rw-r--r--xmlsec.pc6
-rw-r--r--xmlsec.spec2
20 files changed, 82 insertions, 317 deletions
diff --git a/ChangeLog b/ChangeLog
index 7436d734..09ec83e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed 26 Mar 2003 01:43:24 AM PST Aleksey Sanin <aleksey@aleksey.com>
+
+ * docs: 0.1.1 release
+
Wed Mar 19 22:56:49 2003 Aleksey Sanin <aleksey@aleksey.com>
* configure.in include/xmlsec/version.h
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 177c88e3..80db9dac 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -5,6 +5,7 @@ bin_PROGRAMS = xmlsec
INCLUDES = \
-DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\" \
-I$(top_srcdir)/include \
+ $(XMLSEC_DEFINES) \
$(XMLSEC_CRYPTO_CFLAGS) \
$(LIBXSLT_CFLAGS) \
$(LIBXML_CFLAGS) \
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
index b60d585d..78c73ce5 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -1549,12 +1549,14 @@ xmlSecAppPrepareKeyInfoReadCtx(xmlSecKeyInfoCtxPtr keyInfoCtx) {
return(-1);
}
+#ifndef XMLSEC_NO_X509
if(xmlSecAppCmdLineParamIsSet(&verificationTimeParam)) {
keyInfoCtx->certsVerificationTime = xmlSecAppCmdLineParamGetTime(&verificationTimeParam, 0);
}
if(xmlSecAppCmdLineParamIsSet(&depthParam)) {
keyInfoCtx->certsVerificationDepth = xmlSecAppCmdLineParamGetInt(&depthParam, 0);
}
+#endif /* XMLSEC_NO_X509 */
/* read enabled key data list */
for(value = enabledKeyDataParam.value; value != NULL; value = value->next) {
diff --git a/configure.in b/configure.in
index 48b9fc61..8e092512 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@ AC_INIT(src/xmlsec.c)
PACKAGE=xmlsec
XMLSEC_VERSION_MAJOR=0
-XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=0
+XMLSEC_VERSION_MINOR=1
+XMLSEC_VERSION_SUBMINOR=1
XMLSEC_VERSION=$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR
VERSION=$XMLSEC_VERSION
XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
@@ -566,7 +566,6 @@ if test "$enable_xmldsig" = "no" ; then
XMLSEC_NO_XMLDSIG="1"
AC_MSG_RESULT(no)
else
- AM_CONDITIONAL(XMLSEC_WITH_XMLDSIG_TEST, test "1" = "1" )
XMLSEC_NO_XMLDSIG="0"
AC_MSG_RESULT(yes)
fi
@@ -579,11 +578,9 @@ AC_MSG_CHECKING(for XMLEnc support)
AC_ARG_ENABLE(xmlenc, [ --enable-xmlenc enable XMLEnc support (yes)])
if test "$enable_xmlenc" = "no" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_XMLENC=1"
- AM_CONDITIONAL(XMLSEC_WITH_XMLENC_TEST, test "1" = "0" )
XMLSEC_NO_XMLENC="1"
AC_MSG_RESULT(no)
else
- AM_CONDITIONAL(XMLSEC_WITH_XMLENC_TEST, test "1" = "1" )
XMLSEC_NO_XMLENC="0"
AC_MSG_RESULT(yes)
fi
@@ -596,10 +593,8 @@ AC_MSG_CHECKING(for Simple Keys Manager testing)
AC_ARG_ENABLE(skm, [ --enable-skm enable Simple Keys Manager testing(yes)])
if test "$enable_skm" = "no" ; then
XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_NO_SKM_TEST=1"
- AM_CONDITIONAL(XMLSEC_WITH_SKM_TEST, test "1" = "0" )
AC_MSG_RESULT(no)
else
- AM_CONDITIONAL(XMLSEC_WITH_SKM_TEST, test "1" = "1" )
AC_MSG_RESULT(yes)
fi
diff --git a/docs/download.html b/docs/download.html
index 9583c5b7..1c79768d 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -58,11 +58,11 @@
</p>
<h2>Development release.</h2>
<p>
- The latest development XML Security Library version is <b>0.1.0</b>:
+ The latest development XML Security Library version is <b>0.1.1</b>:
</p>
<ul>
<li>
-<a href="download/xmlsec-0.1.0.tar.gz">Sources</a>
+<a href="download/xmlsec-0.1.1.tar.gz">Sources</a>
(<a href="ftp://ftp.xmlsoft.org/xmlsec/releases">XMLSoft.org</a> and
<a href="ftp://ftp.rpmfind.net/pub/XML/xmlsec/releases">RPMFind.net</a> mirrors).
</li>
diff --git a/docs/index.html b/docs/index.html
index 5952155a..1cbce3a3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -53,6 +53,19 @@
see the Copyright file in the distribution for details.<br><br><b>News</b> (<a href="news.html">all news</a>)<br>
</p>
<ul>
+<li>March 26 2003<br><a href="download.html">XML Security Library 0.1.1</a>
+ release is the first release candidate for the new stable
+ version of XML Security Library. A lot of internal changes
+ including enchanced processing controls, performance improvements
+ for XML transforms, <a href="api/index.html">new documentation</a>,
+ updated <a href="api/xmlsec-examples.html">examples</a>
+ and many many other small things.<br>
+ Please try this release and report bugs. Again, it's the first
+ release candidate and it's very important for me to get your
+ feedback about it. Also if you are missing some features
+ in the library it's the best time to ask!
+ </li>
+<br>
<li>March 19 2003<br><a href="download.html">XML Security Library 0.0.14</a> release
includes several minor bugfixes in references URI
processing, binary transforms processing and xmlsec
diff --git a/docs/news.html b/docs/news.html
index 4945fe8e..05ee15e4 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -28,6 +28,20 @@
<h1>XML Security Library News</h1>
</div>
<ul>
+
+<li>March 26 2003<br><a href="download.html">XML Security Library 0.1.1</a>
+ release is the first release candidate for the new stable
+ version of XML Security Library. A lot of internal changes
+ including enchanced processing controls, performance improvements
+ for XML transforms, <a href="api/index.html">new documentation</a>,
+ updated <a href="api/xmlsec-examples.html">examples</a>
+ and many many other small things.<br>
+ Please try this release and report bugs. Again, it's the first
+ release candidate and it's very important for me to get your
+ feedback about it. Also if you are missing some features
+ in the library it's the best time to ask!
+ </li>
+<br>
<li>March 19 2003<br><a href="download.html">XML Security Library 0.0.14</a> release
includes several minor bugfixes in references URI
processing, binary transforms processing and xmlsec
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html
index 4353c55f..08495887 100644
--- a/docs/xmlsec-man.html
+++ b/docs/xmlsec-man.html
@@ -1,245 +1 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Manpage of XMLSEC</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>
-<li><a href="faq.html">FAQ</a></li>
-<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>
-<a href="http://xmlsoft.org/"><img src="images/libxml2-logo.png" alt="LibXML2" border="0"></a><br><a href="http://xmlsoft.org/XSLT"><img src="images/libxslt-logo.png" alt="LibXSLT" border="0"></a><br><a href="http://www.openssl.org/"><img src="images/openssl-logo.png" alt="OpenSSL" border="0"></a>
-</td>
-<td valign="top"><table width="100%" valign="top">
-<tr><td valign="top" align="left" id="xmlsecContent">
-<h1>XMLSEC</h1>
-<p> Section: User Commands ( 1 )<br>Updated: March 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> xmlsec - manual page for xmlsec 0.2.0-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 singining, 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: &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 </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: &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 </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, &quot;--session des-192&quot; 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>--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 &quot;--list-key-data&quot; 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: &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. </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, &quot;--gen:mykey rsa-1024&quot; generates a new 1024 bits RSA key and sets it's name to &quot;mykey&quot;) </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[</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>--pubkey[</b>:&lt;name&gt;] &lt;file&gt; <dt></dt>
-</dt>
-<dd> <dd>load public key from PEM 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>--trusted</b> &lt;file&gt; <dt></dt>
-</dt>
-<dd> <dd>load trusted (root) certificate from PEM file &lt;file&gt; </dd>
-</dd>
-<dt> <b>--untrusted</b> &lt;file&gt; <dt></dt>
-</dt>
-<dd> <dd>load untrusted certificate from PEM file &lt;file&gt; </dd>
-</dd>
-<dt> <b>--verification-time</b> &lt;time&gt; <dt></dt>
-</dt>
-<dd> <dd>the local time in &quot;YYYY-MM-DD HH:MM:SS&quot; 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>--crypto-config</b> <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 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 &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. <a name="lbAI"> </a> </p>
-<h2>SEE ALSO</h2>
-<p> The full documentation for <b>xmlsec</b> is maintained as a Texinfo manual. If the <b>info</b> and <b>xmlsec</b> programs are properly installed at your site, the command </p>
-<dl compact>
-<dt></dt>
-<dd> <b>info xmlsec</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: 08:20:36 GMT, March 26, 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 XMLSEC</TITLE> </HEAD><BODY> <H1>XMLSEC</H1> Section: User Commands ( 1 )<BR>Updated: March 2003<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> xmlsec - manual page for xmlsec 0.2.0-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 singining, 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 </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>--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>--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[</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>--pubkey[</B>:&lt;name&gt;] &lt;file&gt; <DT><DD> <DD>load public key from PEM 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>--crypto-config</B> <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 openssl 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. <A NAME="lbAI">&nbsp;</A> <H2>SEE ALSO</H2> The full documentation for <B>xmlsec</B> is maintained as a Texinfo manual. If the <B>info</B> and <B>xmlsec</B> programs are properly installed at your site, the command <DL COMPACT> <DT><DD> <B>info xmlsec</B> </DL> <P> should give you access to the complete manual. <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> <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: 09:23:06 GMT, March 26, 2003 </BODY> </HTML> \ No newline at end of file
diff --git a/include/xmlsec/version.h b/include/xmlsec/version.h
index 04c94ef0..459deb7f 100644
--- a/include/xmlsec/version.h
+++ b/include/xmlsec/version.h
@@ -21,7 +21,7 @@ extern "C" {
* The library version string in the format
* "<major-number>.<minor-number>.<sub-minor-number>".
*/
-#define XMLSEC_VERSION "0.2.0"
+#define XMLSEC_VERSION "0.1.1"
/**
* XMLSEC_VERSION_MAJOR:
@@ -35,14 +35,14 @@ extern "C" {
*
* The library minor version number.
*/
-#define XMLSEC_VERSION_MINOR 2
+#define XMLSEC_VERSION_MINOR 1
/**
* XMLSEC_VERSION_SUBMINOR:
*
* The library sub-minor version number.
*/
-#define XMLSEC_VERSION_SUBMINOR 0
+#define XMLSEC_VERSION_SUBMINOR 1
/**
* XMLSEC_VERSION_INFO:
@@ -50,7 +50,7 @@ extern "C" {
* The library version info string in the format
* "<major-number>+<minor-number>:<sub-minor-number>:<minor-number>".
*/
-#define XMLSEC_VERSION_INFO "2:0:2"
+#define XMLSEC_VERSION_INFO "1:1:1"
#ifdef __cplusplus
diff --git a/include/xmlsec/xmldsig.h b/include/xmlsec/xmldsig.h
index f28510f9..c0bf4e68 100644
--- a/include/xmlsec/xmldsig.h
+++ b/include/xmlsec/xmldsig.h
@@ -13,12 +13,16 @@
#ifndef __XMLSEC_XMLDSIG_H__
#define __XMLSEC_XMLDSIG_H__
+#ifndef XMLSEC_NO_XMLDSIG
+
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+
#include <libxml/tree.h>
#include <libxml/parser.h>
+
#include <xmlsec/xmlsec.h>
#include <xmlsec/list.h>
#include <xmlsec/keys.h>
@@ -253,5 +257,7 @@ XMLSEC_EXPORT xmlSecPtrListId xmlSecDSigReferenceCtxListGetKlass(void);
}
#endif /* __cplusplus */
+#endif /* XMLSEC_NO_XMLDSIG */
+
#endif /* __XMLSEC_XMLDSIG_H__ */
diff --git a/man/xmlsec.1 b/man/xmlsec.1
index 22a60c1b..4fcecf43 100644
--- a/man/xmlsec.1
+++ b/man/xmlsec.1
@@ -158,27 +158,6 @@ load HMAC key from binary file <file>
.IP
the password to use for reading keys and certs
.HP
-\fB\-\-pkcs12[\fR:<name>] <file>
-.IP
-load load private key from pkcs12 file <file>
-.HP
-\fB\-\-trusted\fR <file>
-.IP
-load trusted (root) certificate from PEM file <file>
-.HP
-\fB\-\-untrusted\fR <file>
-.IP
-load untrusted certificate from PEM file <file>
-.HP
-\fB\-\-verification\-time\fR <time>
-.IP
-the local time in "YYYY-MM-DD HH:MM:SS" format
-used certificates verification
-.HP
-\fB\-\-depth\fR <number>
-.IP
-maximum certificates chain depth
-.HP
\fB\-\-crypto\-config\fR
.IP
path to crypto engine configuration
diff --git a/src/Makefile.am b/src/Makefile.am
index 575ffcd3..3ce312a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = $(XMLSEC_CRYPTO_LIST)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
+$(XMLSEC_DEFINES) \
$(LIBXSLT_CFLAGS) \
$(LIBXML_CFLAGS) \
$(NULL)
diff --git a/src/gnutls/Makefile.am b/src/gnutls/Makefile.am
index 10e12d39..568b53eb 100644
--- a/src/gnutls/Makefile.am
+++ b/src/gnutls/Makefile.am
@@ -7,6 +7,7 @@ $(NULL)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
+$(XMLSEC_DEFINES) \
$(XMLSEC_NSS_DEFINES) \
$(NSS_CFLAGS) \
$(LIBXSLT_CFLAGS) \
diff --git a/src/keysdata.c b/src/keysdata.c
index d83b7a6f..a9d19b94 100644
--- a/src/keysdata.c
+++ b/src/keysdata.c
@@ -116,6 +116,7 @@ xmlSecKeyDataIdsRegisterDefault(void) {
return(-1);
}
+#ifndef XMLSEC_NO_XMLENC
if(xmlSecKeyDataIdsRegister(xmlSecKeyDataEncryptedKeyId) < 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
@@ -124,6 +125,8 @@ xmlSecKeyDataIdsRegisterDefault(void) {
"xmlSecKeyDataEncryptedKeyId");
return(-1);
}
+#endif /* XMLSEC_NO_XMLENC */
+
return(0);
}
diff --git a/src/nss/Makefile.am b/src/nss/Makefile.am
index 5821b454..dfa82604 100644
--- a/src/nss/Makefile.am
+++ b/src/nss/Makefile.am
@@ -7,6 +7,7 @@ $(NULL)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
+$(XMLSEC_DEFINES) \
$(XMLSEC_NSS_DEFINES) \
$(NSS_CFLAGS) \
$(LIBXSLT_CFLAGS) \
diff --git a/src/openssl/Makefile.am b/src/openssl/Makefile.am
index 99ae6372..93dd4173 100644
--- a/src/openssl/Makefile.am
+++ b/src/openssl/Makefile.am
@@ -7,6 +7,7 @@ $(NULL)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
+$(XMLSEC_DEFINES) \
$(XMLSEC_OPENSSL_DEFINES) \
$(OPENSSL_CFLAGS) \
$(LIBXSLT_CFLAGS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29a018c8..a70d6017 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,28 +29,16 @@ check: check-km check-dsig check-enc
@echo "-------------------------- ATTENTION -----------------------------------"
check-km: $(XMLSEC_APP)
-if XMLSEC_WITH_SKM_TEST
@$(top_srcdir)/tests/testKeys.sh $(top_srcdir)/tests $(XMLSEC_APP)
@echo
-else
- @echo "Simple Keys Manager support disabled"
-endif
check-dsig: $(XMLSEC_APP)
-if XMLSEC_WITH_XMLDSIG_TEST
@$(top_srcdir)/tests/testDSig.sh $(top_srcdir)/tests $(XMLSEC_APP)
@echo
-else
- @echo "XML DSig support disabled"
-endif
check-enc: $(XMLSEC_APP)
-if XMLSEC_WITH_XMLENC_TEST
@$(top_srcdir)/tests/testEnc.sh $(top_srcdir)/tests $(XMLSEC_APP)
@echo
-else
- @echo "XML Enc support disabled"
-endif
memcheck-res:
@grep -i lost /tmp/*.log | sed 's/==.*== *//' | sort -u
diff --git a/tests/keys.xml b/tests/keys.xml
index c69004dd..9d1dc904 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">wiOFvDz3mFjD0XwnicaqEwP/HtkzS/c8</HMACKeyValue>
+<HMACKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">PLT5vMRpNIFebXn1uXDzGEbDq9ENluPp</HMACKeyValue>
</KeyValue>
</KeyInfo>
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -11,17 +11,17 @@
<KeyValue>
<RSAKeyValue>
<Modulus>
-sB6Hq6y+VBgatb+I8zS1ijxXO/W0AWjbhvIiJP9+Wdbm8bp3Kp+9J9L98tlYme1y
-my4ZGptDdHCAitnfIHRUygx4KTpQ/XfAruijtNpkj3248paQTmDM8t6ChNgYXg3o
-pFpKC+sLs+x3cYqjXMab+JVzXfN3LFUffkw6FVpGym9=
+3zedqtsLNhmUBbW5EAk2CqvHFVEPMhullMV/4SnVi4caOl+6GUgvceMtWAZIv/SI
+PbenY/w78KJDcdjW22/02hIDiXJCGW4Fp54vgAudSds6TNy/CERfm3cAFLJyAxO9
+mLJwCWXHVhPBfsuM9MZ6FPaLwjALCRVGtUAsV8BwHVV=
</Modulus>
<Exponent>
Aw==
</Exponent>
<PrivateExponent xmlns="http://www.aleksey.com/xmlsec/2002">
-dWmvx8h+4rq8eSpbTM3OXCg6J/kiq5s9BKFsGKpUO+SZ9nxPcb/Tb+H+oeY7EUj3
-Eh67ZxIs+EsAXJE/avg4hZcHzkPahV+Nk6uPemEP8Fyk9/dn6ue6zVE+PW6Ab2MA
-mKMulvYnms30CkSyheBxgGhTLYedHp3SZAJHNExXaYt=
+lM++cedczru4A857YAYkBx0vY4tfdr0ZDdj/63E5B69m0ZUmu4V09pdzkAQwf/ha
+08/E7VLSoGws9pCPPPVN5XfMrkPiaVBNV7RNB4wNcvPxsJrIWTYv+wYWRdHgoJtb
+thHuW2UUckI4DlYpkPvTS3ckyqslekpO5SSP6SxX67N=
</PrivateExponent>
</RSAKeyValue>
</KeyValue>
@@ -31,25 +31,25 @@ mKMulvYnms30CkSyheBxgGhTLYedHp3SZAJHNExXaYt=
<KeyValue>
<DSAKeyValue>
<P>
-5tcdsZoONcI409Pxdgs76KoW1j9YMLszA+O0hjNDKfhkJKFLaGCJDlZ+QCnVPfMC
-9UIeEA1NEANT7XLQg8ZakEBYN4g0aOrBmEq+82jYH2dpd4AmAeSBuzNIvPARE9G1
-LkvhUca4RKeWol9x5XlQMCt3SOMqCMQdC0uwP1NXMI1=
+sK3L7lWBOr5UA1UaKvLgB3Vuz6aDnATg0H/MAlUUFReTUtwYrLHJIg7qqrR0hRXQ
+OtaSF7uhzRy4vmB7TMIdWyo2Osl/rQMQiXipkyRQ4Q0KQBli7zZYjrR2n2bSv8qT
+wuFXJRladG05soQFS8Ss7qTOD+e1I8H2P6mM7NyA59e=
</P>
<Q>
-mX9BElOW8lP5pFzpe5hWosdeue1=
+p6F2osCTc7tdHDlnskgQZ5/HwqH=
</Q>
<G>
-dJh2HmRr4ZpXcCfDaEUZZIUso3paDOzk54KhUtmsvdzBpgSrefaOJ+hHBiJ1HPM5
-tqnl866gKgVdqI0/CIK57Yc0PGIKNdF1MI1qPZHG1HEd2lsXi3s3EHtb4RSL4rTT
-SLWjqoqcXVvccjK0jMM3eM2AcmmdfeI20u5Z7vilYaq=
+cnHXR7B643tCsndcysvXo+35Z3j0oEa/i/t9KleAYngjb3zxGPuDs3m/c7vsxC3d
+hev070IkgOYHnFjgSWDJTw3eMlAjdOq2v9wk32FbwxzXUUNVRscRVudHoCt16K1t
+/oJa2pg+XkyBSUldY3ZPBgc6p73qHCZAYrK0RKFPQKt=
</G>
<X xmlns="http://www.aleksey.com/xmlsec/2002">
-dcFB+eB9jR2mozR2yeVGqLRCXNF=
+Ts/kxw/4e3sutFWBA14WH+cOfhw=
</X>
<Y>
-19RBmAxVCwIPC+7mhEqQlfV1Ee3J2qToMFhmadoIuB6dk0mQvl1p39LGRjdCyVb1
-rVJhqu/v9h+KzfjBQhdRPOZsK69s4Xk4vhsUM4MNyHGXp72R66PDGsRG7CU4f8kA
-PQCa2wvZ8e+jrQJpYXuJexFF8B/5JelVjNynLhm32FK=
+iaEuYUu0yjjb6Eb3lGzN+0Hfv+eNLDNg7QaJxFLDVQMXoiqip/9i2sHb8/vBlUyF
+z7MkrywN2hRVhc+6d5xYUgWd7SkanczZCHUDWUoIHr9VewJiMfFBtn8I0Do3R8V8
+ngfY5XZqDR/N+Jw2UueLwBa0Jh7djpMMFbo0z0fum3f=
</Y>
</DSAKeyValue>
</KeyValue>
@@ -57,25 +57,25 @@ PQCa2wvZ8e+jrQJpYXuJexFF8B/5JelVjNynLhm32FK=
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<KeyName>test-des</KeyName>
<KeyValue>
-<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">2CimWcNY4bG/agaksa3+K3EdhkBmj+hi</DESKeyValue>
+<DESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">6joJyC7iBNTolSA5eyFy2+D7RrTqKSxm</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">1+5gmSq598XhpU11RKvb9q==</AESKeyValue>
+<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">vNIrdl/lg+ieI2/x8LNYWr==</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">FpqpAsi1meYzzBoMMRqRikFCScx+ENLE</AESKeyValue>
+<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">dKf2bGJtNEkSl+J4FuWkHuFRbIQhsd4O</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">YRpu6pHX6FyVnDrTE5v/iInomIdmqOR4rxVNX/NHXl1=</AESKeyValue>
+<AESKeyValue xmlns="http://www.aleksey.com/xmlsec/2002">y5zmf4iV9k+0snKbQ45nvjAYk03oQcQNryrYHUiWNha=</AESKeyValue>
</KeyValue>
</KeyInfo>
</Keys>
diff --git a/xmlsec.pc b/xmlsec.pc
index cadb9491..74ec0efc 100644
--- a/xmlsec.pc
+++ b/xmlsec.pc
@@ -1,11 +1,11 @@
-prefix=/usr/local
+prefix=/home/aleksey
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: xmlsec
-Version: 0.2.0-openssl
+Version: 0.1.1-openssl
Description: XML Security Library implements XML Signature and XML Encryption standards
Requires: libxml-2.0 >= 2.4.24 libxslt >= 1.0.20
-Libs: -lxmlsec-openssl -lxmlsec -L/usr/lib -lxml2 -lz -lm -L/usr/lib -lxslt -lxml2 -lz -lm -lcrypto
+Libs: -lxmlsec-openssl -lxmlsec -L/home/aleksey/lib -lxml2 -lz -lm -L/home/aleksey/lib -lxslt -lxml2 -lz -lm -L/home/aleksey/lib -lcrypto
Cflags: -I${includedir}/xmlsec @XMLSEC_CFLAGS@ -DXMLSEC_CRYPTO=\"openssl\"
diff --git a/xmlsec.spec b/xmlsec.spec
index 4a453119..ba7b0047 100644
--- a/xmlsec.spec
+++ b/xmlsec.spec
@@ -1,6 +1,6 @@
Summary: Library providing support for "XML Signature" and "XML Encryption" standards
Name: xmlsec
-Version: 0.2.0
+Version: 0.1.1
Release: 1
License: MIT
Group: Development/Libraries