[xmlsec] prepare for new release 1.2.14



commit 267463249b51829274eae2d43c25e8d6c732c1c1
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Sat Dec 5 12:59:15 2009 -0800

    prepare for new release 1.2.14

 ChangeLog                                          |    3 +
 configure.in                                       |    2 +-
 docs/Makefile.am                                   |    2 +-
 docs/api/Makefile.am                               |    9 +
 docs/api/home.png                                  |  Bin 654 -> 654 bytes
 docs/api/index.html                                |   91 +-
 docs/api/index.sgml                                | 1279 +----------
 docs/api/left.png                                  |  Bin 459 -> 459 bytes
 docs/api/right.png                                 |  Bin 472 -> 472 bytes
 docs/api/sgml/app.sgml                             | 1400 +++++-------
 docs/api/sgml/base64.sgml                          |  228 +-
 docs/api/sgml/bn.sgml                              |  495 ++---
 docs/api/sgml/buffer.sgml                          |  404 ++--
 docs/api/sgml/dl.sgml                              |  127 +-
 docs/api/sgml/errors.sgml                          |  721 +++----
 docs/api/sgml/exports.sgml                         |   29 +-
 docs/api/sgml/gnutls/app.sgml                      |  427 ++--
 docs/api/sgml/gnutls/crypto.sgml                   |  445 ++--
 docs/api/sgml/io.sgml                              |  133 +-
 docs/api/sgml/keyinfo.sgml                         |  464 ++--
 docs/api/sgml/keys.sgml                            |  867 ++++----
 docs/api/sgml/keysdata.sgml                        | 1644 ++++++--------
 docs/api/sgml/keysmngr.sgml                        |  510 ++---
 docs/api/sgml/list.sgml                            |  420 ++--
 docs/api/sgml/membuf.sgml                          |   56 +-
 docs/api/sgml/mscrypto/app.sgml                    |  586 +++---
 docs/api/sgml/mscrypto/certkeys.sgml               |   98 +-
 docs/api/sgml/mscrypto/crypto.sgml                 |  543 ++---
 docs/api/sgml/mscrypto/keysstore.sgml              |  110 +-
 docs/api/sgml/mscrypto/x509.sgml                   |  432 ++--
 docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom  |    6 +-
 docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top     |    6 +-
 docs/api/sgml/nodeset.sgml                         |  328 ++--
 docs/api/sgml/nss/app.sgml                         |  558 +++---
 docs/api/sgml/nss/bignum.sgml                      |   69 +-
 docs/api/sgml/nss/crypto.sgml                      |  699 +++----
 docs/api/sgml/nss/keysstore.sgml                   |  108 +-
 docs/api/sgml/nss/pkikeys.sgml                     |  100 +-
 docs/api/sgml/nss/x509.sgml                        |  333 ++--
 docs/api/sgml/nss/xmlsec-nss-doc.bottom            |    6 +-
 docs/api/sgml/nss/xmlsec-nss-doc.top               |    6 +-
 docs/api/sgml/openssl/app.sgml                     |  622 +++---
 docs/api/sgml/openssl/bn.sgml                      |   63 +-
 docs/api/sgml/openssl/crypto.sgml                  | 1335 +++++------
 docs/api/sgml/openssl/evp.sgml                     |   77 +-
 docs/api/sgml/openssl/x509.sgml                    |  430 ++--
 docs/api/sgml/openssl/xmlsec-openssl-doc.bottom    |    4 +-
 docs/api/sgml/openssl/xmlsec-openssl-doc.top       |    4 +-
 docs/api/sgml/parser.sgml                          |  122 +-
 docs/api/sgml/private.sgml                         |  576 +++---
 docs/api/sgml/soap.sgml                            |  452 ++--
 docs/api/sgml/templates.sgml                       |  972 ++++-----
 docs/api/sgml/transforms.sgml                      | 2393 +++++++++-----------
 docs/api/sgml/version.sgml                         |   64 +-
 docs/api/sgml/x509.sgml                            |   98 +-
 docs/api/sgml/xmldsig.sgml                         |  555 +++---
 docs/api/sgml/xmlenc.sgml                          |  340 ++--
 docs/api/sgml/xmlsec-doc.bottom                    |   38 +-
 docs/api/sgml/xmlsec-doc.top                       |   38 +-
 docs/api/sgml/xmlsec.sgml                          |  145 +-
 docs/api/sgml/xmltree.sgml                         | 1238 +++++------
 docs/api/tmpl/app.sgml                             |    4 +
 docs/api/tmpl/base64.sgml                          |    3 +
 docs/api/tmpl/bn.sgml                              |    3 +
 docs/api/tmpl/buffer.sgml                          |    3 +
 docs/api/tmpl/crypto.sgml                          |    3 +
 docs/api/tmpl/dl.sgml                              |    3 +
 docs/api/tmpl/errors.sgml                          |    3 +
 docs/api/tmpl/exports.sgml                         |    3 +
 docs/api/tmpl/gnutls/app.sgml                      |    4 +
 docs/api/tmpl/gnutls/crypto.sgml                   |    3 +
 docs/api/tmpl/io.sgml                              |    3 +
 docs/api/tmpl/keyinfo.sgml                         |    3 +
 docs/api/tmpl/keys.sgml                            |    3 +
 docs/api/tmpl/keysdata.sgml                        |    3 +
 docs/api/tmpl/keysmngr.sgml                        |    3 +
 docs/api/tmpl/list.sgml                            |    3 +
 docs/api/tmpl/membuf.sgml                          |    3 +
 docs/api/tmpl/mscrypto/app.sgml                    |    4 +
 docs/api/tmpl/mscrypto/certkeys.sgml               |    3 +
 docs/api/tmpl/mscrypto/crypto.sgml                 |    3 +
 docs/api/tmpl/mscrypto/keysstore.sgml              |    3 +
 docs/api/tmpl/mscrypto/x509.sgml                   |    3 +
 docs/api/tmpl/nodeset.sgml                         |    3 +
 docs/api/tmpl/nss/app.sgml                         |    4 +
 docs/api/tmpl/nss/bignum.sgml                      |    3 +
 docs/api/tmpl/nss/crypto.sgml                      |    3 +
 docs/api/tmpl/nss/keysstore.sgml                   |    3 +
 docs/api/tmpl/nss/pkikeys.sgml                     |    3 +
 docs/api/tmpl/nss/x509.sgml                        |    3 +
 docs/api/tmpl/openssl/app.sgml                     |    4 +
 docs/api/tmpl/openssl/bn.sgml                      |    3 +
 docs/api/tmpl/openssl/crypto.sgml                  |    3 +
 docs/api/tmpl/openssl/evp.sgml                     |    3 +
 docs/api/tmpl/openssl/x509.sgml                    |    3 +
 docs/api/tmpl/parser.sgml                          |    3 +
 docs/api/tmpl/private.sgml                         |    3 +
 docs/api/tmpl/soap.sgml                            |    3 +
 docs/api/tmpl/strings.sgml                         |    3 +
 docs/api/tmpl/templates.sgml                       |    3 +
 docs/api/tmpl/transforms.sgml                      |    3 +
 docs/api/tmpl/version.sgml                         |    3 +
 docs/api/tmpl/x509.sgml                            |    3 +
 docs/api/tmpl/xmldsig.sgml                         |    3 +
 docs/api/tmpl/xmlenc.sgml                          |    3 +
 docs/api/tmpl/xmlsec.sgml                          |    5 +-
 docs/api/tmpl/xmltree.sgml                         |   31 +-
 docs/api/up.png                                    |  Bin 406 -> 406 bytes
 docs/api/xmlsec-app.html                           | 1248 +++++------
 docs/api/xmlsec-base64.html                        |  230 +-
 docs/api/xmlsec-bn.html                            |  545 +++---
 docs/api/xmlsec-buffer.html                        |  414 ++--
 docs/api/xmlsec-custom-keys-manager.html           |    7 +-
 docs/api/xmlsec-decrypt-with-keys-mngr.html        |    7 +-
 docs/api/xmlsec-decrypt-with-signle-key.html       |    7 +-
 docs/api/xmlsec-dl.html                            |  127 +-
 docs/api/xmlsec-encrypt-dynamic-template.html      |    7 +-
 docs/api/xmlsec-encrypt-template-file.html         |    7 +-
 docs/api/xmlsec-encrypt-with-session-key.html      |    7 +-
 docs/api/xmlsec-encryption-klasses.html            |    7 +-
 docs/api/xmlsec-errors.html                        |  515 ++---
 .../xmlsec-examples-sign-dynamimc-template.html    |    7 +-
 docs/api/xmlsec-examples-sign-template-file.html   |    7 +-
 docs/api/xmlsec-examples-sign-x509.html            |    7 +-
 docs/api/xmlsec-examples.html                      |    7 +-
 docs/api/xmlsec-gnutls-app.html                    |  447 ++--
 docs/api/xmlsec-gnutls-crypto.html                 |  421 ++--
 docs/api/xmlsec-gnutls-ref.html                    |   11 +-
 docs/api/xmlsec-index.html                         |  192 +-
 docs/api/xmlsec-index.sgml                         |    1 +
 docs/api/xmlsec-io.html                            |  127 +-
 docs/api/xmlsec-keyinfo.html                       |  416 ++--
 docs/api/xmlsec-keys.html                          |  853 ++++----
 docs/api/xmlsec-keysdata.html                      | 1536 ++++++-------
 docs/api/xmlsec-keysmngr.html                      |  494 ++---
 docs/api/xmlsec-list.html                          |  410 ++--
 docs/api/xmlsec-membuf.html                        |   52 +-
 docs/api/xmlsec-mscrypto-app.html                  |  624 +++---
 docs/api/xmlsec-mscrypto-certkeys.html             |   98 +-
 docs/api/xmlsec-mscrypto-crypto.html               |  513 ++---
 docs/api/xmlsec-mscrypto-keysstore.html            |  108 +-
 docs/api/xmlsec-mscrypto-ref.html                  |   17 +-
 docs/api/xmlsec-mscrypto-x509.html                 |  444 ++--
 docs/api/xmlsec-nodeset.html                       |  348 ++--
 docs/api/xmlsec-notes-compiling-others.html        |    7 +-
 docs/api/xmlsec-notes-compiling-unix.html          |    7 +-
 docs/api/xmlsec-notes-compiling-windows.html       |    7 +-
 docs/api/xmlsec-notes-compiling.html               |    7 +-
 docs/api/xmlsec-notes-contexts.html                |    7 +-
 docs/api/xmlsec-notes-custom-keys-store.html       |    7 +-
 docs/api/xmlsec-notes-decrypt.html                 |    7 +-
 .../xmlsec-notes-dynamic-encryption-templates.html |    7 +-
 .../xmlsec-notes-dynamic-signature-templates.html  |    7 +-
 docs/api/xmlsec-notes-encrypt.html                 |    7 +-
 docs/api/xmlsec-notes-include-files.html           |    7 +-
 docs/api/xmlsec-notes-init-shutdown.html           |    7 +-
 docs/api/xmlsec-notes-keys-manager-sign-enc.html   |    7 +-
 .../api/xmlsec-notes-keys-mngr-verify-decrypt.html |    7 +-
 docs/api/xmlsec-notes-keys.html                    |    7 +-
 docs/api/xmlsec-notes-keysmngr.html                |    7 +-
 docs/api/xmlsec-notes-new-crypto-functions.html    |    7 +-
 docs/api/xmlsec-notes-new-crypto-keys.html         |    7 +-
 docs/api/xmlsec-notes-new-crypto-klasses.html      |    7 +-
 .../xmlsec-notes-new-crypto-sharing-results.html   |    7 +-
 .../xmlsec-notes-new-crypto-simple-keys-mngr.html  |    7 +-
 docs/api/xmlsec-notes-new-crypto-skeleton.html     |    7 +-
 docs/api/xmlsec-notes-new-crypto-transforms.html   |   11 +-
 docs/api/xmlsec-notes-new-crypto.html              |    7 +-
 docs/api/xmlsec-notes-overview.html                |    7 +-
 docs/api/xmlsec-notes-sign-encrypt.html            |    7 +-
 docs/api/xmlsec-notes-sign-x509.html               |    7 +-
 docs/api/xmlsec-notes-sign.html                    |    7 +-
 docs/api/xmlsec-notes-simple-keys-store.html       |    7 +-
 docs/api/xmlsec-notes-structure.html               |    7 +-
 docs/api/xmlsec-notes-templates.html               |    7 +-
 docs/api/xmlsec-notes-transforms.html              |    7 +-
 docs/api/xmlsec-notes-verify-decrypt.html          |    7 +-
 docs/api/xmlsec-notes-verify-x509.html             |    7 +-
 docs/api/xmlsec-notes-verify.html                  |    7 +-
 docs/api/xmlsec-notes-x509.html                    |    7 +-
 docs/api/xmlsec-notes.html                         |    7 +-
 docs/api/xmlsec-nss-app.html                       |  590 +++---
 docs/api/xmlsec-nss-bignum.html                    |   71 +-
 docs/api/xmlsec-nss-crypto.html                    |  653 +++---
 docs/api/xmlsec-nss-keysstore.html                 |  106 +-
 docs/api/xmlsec-nss-pkikeys.html                   |   98 +-
 docs/api/xmlsec-nss-ref.html                       |   19 +-
 docs/api/xmlsec-nss-x509.html                      |  343 ++--
 docs/api/xmlsec-openssl-app.html                   |  650 +++---
 docs/api/xmlsec-openssl-bn.html                    |   65 +-
 docs/api/xmlsec-openssl-crypto.html                | 1229 +++++------
 docs/api/xmlsec-openssl-evp.html                   |   77 +-
 docs/api/xmlsec-openssl-ref.html                   |   17 +-
 docs/api/xmlsec-openssl-x509.html                  |  440 ++--
 docs/api/xmlsec-parser.html                        |  126 +-
 docs/api/xmlsec-ref.html                           |   53 +-
 docs/api/xmlsec-reference.html                     |    7 +-
 docs/api/xmlsec-signature-klasses.html             |    7 +-
 docs/api/xmlsec-templates.html                     | 1046 ++++-----
 docs/api/xmlsec-transforms.html                    | 2377 +++++++++-----------
 docs/api/xmlsec-verify-with-key.html               |    7 +-
 docs/api/xmlsec-verify-with-keys-mngr.html         |    7 +-
 docs/api/xmlsec-verify-with-restrictions.html      |    7 +-
 docs/api/xmlsec-verify-with-x509.html              |    7 +-
 docs/api/xmlsec-version.html                       |   42 +-
 docs/api/xmlsec-x509.html                          |   74 +-
 docs/api/xmlsec-xmldsig.html                       |  523 ++---
 docs/api/xmlsec-xmlenc.html                        |  342 ++--
 docs/api/xmlsec-xmlsec.html                        |  121 +-
 docs/api/xmlsec-xmltree.html                       | 1312 ++++++------
 docs/download.html                                 |    4 +-
 docs/index.html                                    |   41 +-
 docs/news.html                                     |   15 +-
 docs/xmlsec-man.html                               |   35 +-
 docs/xmlsec.xsl                                    |    6 +-
 man/xmlsec1-config.1                               |    6 +-
 man/xmlsec1.1                                      |   40 +-
 217 files changed, 20035 insertions(+), 24542 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0b08a39..b63503c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-09-05  Aleksey Sanin  <aleksey aleksey com>
+	* preparation for 1.2.14 release
+
 2009-11-05 Aleksey Sanin  <aleksey aleksey com>
 	* Use installed ltdl on *nix and native code on Windows
 
diff --git a/configure.in b/configure.in
index 581e2ca..a3ff5db 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT([xmlsec1],[1.2.13],[http://www.aleksey.com/xmlsec])
 XMLSEC_PACKAGE=xmlsec1
 XMLSEC_VERSION_MAJOR=1
 XMLSEC_VERSION_MINOR=2
-XMLSEC_VERSION_SUBMINOR=13
+XMLSEC_VERSION_SUBMINOR=14
 XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBMINOR"
 XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
 XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 50a2542..65a0f8a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,9 +28,9 @@ docs-format:
 	@(echo "Formatting html documents"; \
 	for i in `find . -name "*.html" -print`; \
 	do \
-	    echo "Processing $$i"; \
 	    top_folder=`echo $$i | sed 's#/[^/]*$$#/#' | sed 's#\./##' | \
 			sed 's#[^/]*/#../#g'`; \
+	    echo "Processing $$i ($$top_folder)"; \
 	    xsltproc --html --stringparam topfolder "$$top_folder" \
 		     --output $$i.tmp ./xmlsec.xsl $$i; \
 	    if [ $$? != 0 ]; \
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index 66d3869..e674138 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -1,3 +1,12 @@
+#
+# To remove "bad" chars, run the following command
+#
+# for i in `grep -l $'\xA0' *` ; do \
+#	echo $i ;  \
+#	sed 's/\xA0/ /g' $i > $i.tmp ; \
+#	mv $i.tmp $i ; \
+# done
+#
 NULL=
 TOP=../..
 MODULE=xmlsec
diff --git a/docs/api/home.png b/docs/api/home.png
index 1700361..4cb8729 100644
Binary files a/docs/api/home.png and b/docs/api/home.png differ
diff --git a/docs/api/index.html b/docs/api/index.html
index 1a2397c..d0e95a0 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -2,9 +2,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library Reference Manual</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="NEXT" title="XML Security Library Tutorial" href="xmlsec-notes.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -80,8 +79,8 @@
 <table class="navigation" width="100%" cellpadding="2" cellspacing="0"><tr><th align="center" valign="MIDDLE"><p class="TITLE">XML Security Library Reference Manual<a name="AEN2"></a></p></th></tr></table>
 <h3 class="AUTHOR">
 <a name="AEN5"></a>Aleksey Sanin</h3>
-<div class="AFFILIATION"><div class="ADDRESS"><p class="ADDRESS">	<code class="EMAIL">&lt;<a href="mailto:aleksey aleksey com">aleksey aleksey com</a>&gt;</code><br>
-	</p></div></div>
+<div class="AFFILIATION"><div class="ADDRESS"><p class="ADDRESS">	    <code class="EMAIL">&lt;<a href="mailto:aleksey aleksey com">aleksey aleksey com</a>&gt;</code><br>
+	  </p></div></div>
 <p class="COPYRIGHT">Copyright © 2002-2003 Aleksey Sanin</p>
 <div><div class="ABSTRACT">
 <p></p>
@@ -194,99 +193,99 @@
 <dt><a href="xmlsec-ref.html">XML Security Core Library API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-app.html">app</a>--Crypto-engine independent application support function.</dt>
+<a href="xmlsec-app.html">app</a> -- Crypto-engine independent application support function.</dt>
 <dt>
-<a href="xmlsec-base64.html">base64</a>--Base64 encoding/decoding functions.</dt>
+<a href="xmlsec-base64.html">base64</a> -- Base64 encoding/decoding functions.</dt>
 <dt>
-<a href="xmlsec-bn.html">bn</a>--Big numbers support functions.</dt>
+<a href="xmlsec-bn.html">bn</a> -- Big numbers support functions.</dt>
 <dt>
-<a href="xmlsec-buffer.html">buffer</a>--Binary buffer implementation.</dt>
+<a href="xmlsec-buffer.html">buffer</a> -- Binary buffer implementation.</dt>
 <dt>
-<a href="xmlsec-dl.html">dl</a>--Dynamic crypto-engine library loading support.</dt>
+<a href="xmlsec-dl.html">dl</a> -- Dynamic crypto-engine library loading support.</dt>
 <dt>
-<a href="xmlsec-errors.html">errors</a>--Error/log messages support.</dt>
+<a href="xmlsec-errors.html">errors</a> -- Error/log messages support.</dt>
 <dt>
-<a href="xmlsec-io.html">io</a>--Input/output support.</dt>
+<a href="xmlsec-io.html">io</a> -- Input/output support.</dt>
 <dt>
-<a href="xmlsec-keyinfo.html">keyinfo</a>--<a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</dt>
+<a href="xmlsec-keyinfo.html">keyinfo</a> -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</dt>
 <dt>
-<a href="xmlsec-keysdata.html">keysdata</a>--Crypto key data object definition.</dt>
+<a href="xmlsec-keysdata.html">keysdata</a> -- Crypto key data object definition.</dt>
 <dt>
-<a href="xmlsec-keys.html">keys</a>--Crypto key object definition.</dt>
+<a href="xmlsec-keys.html">keys</a> -- Crypto key object definition.</dt>
 <dt>
-<a href="xmlsec-keysmngr.html">keysmngr</a>--Keys manager object support.</dt>
+<a href="xmlsec-keysmngr.html">keysmngr</a> -- Keys manager object support.</dt>
 <dt>
-<a href="xmlsec-list.html">list</a>--Generic list structure implementation.</dt>
+<a href="xmlsec-list.html">list</a> -- Generic list structure implementation.</dt>
 <dt>
-<a href="xmlsec-membuf.html">membuf</a>--Memory buffer transform implementation.</dt>
+<a href="xmlsec-membuf.html">membuf</a> -- Memory buffer transform implementation.</dt>
 <dt>
-<a href="xmlsec-nodeset.html">nodeset</a>--Nodeset object implementation.</dt>
+<a href="xmlsec-nodeset.html">nodeset</a> -- Nodeset object implementation.</dt>
 <dt>
-<a href="xmlsec-parser.html">parser</a>--Parser transform implementation.</dt>
+<a href="xmlsec-parser.html">parser</a> -- Parser transform implementation.</dt>
 <dt>
-<a href="xmlsec-templates.html">templates</a>--Dynamic templates creation functions.</dt>
+<a href="xmlsec-templates.html">templates</a> -- Dynamic templates creation functions.</dt>
 <dt>
-<a href="xmlsec-transforms.html">transforms</a>--Transform object definition.</dt>
+<a href="xmlsec-transforms.html">transforms</a> -- Transform object definition.</dt>
 <dt>
-<a href="xmlsec-version.html">version</a>--Version macros.</dt>
+<a href="xmlsec-version.html">version</a> -- Version macros.</dt>
 <dt>
-<a href="xmlsec-xmldsig.html">xmldsig</a>--XML Digital Signature support.</dt>
+<a href="xmlsec-xmldsig.html">xmldsig</a> -- XML Digital Signature support.</dt>
 <dt>
-<a href="xmlsec-xmlenc.html">xmlenc</a>--XML Encryption support.</dt>
+<a href="xmlsec-xmlenc.html">xmlenc</a> -- XML Encryption support.</dt>
 <dt>
-<a href="xmlsec-xmlsec.html">xmlsec</a>--Utility functions.</dt>
+<a href="xmlsec-xmlsec.html">xmlsec</a> -- Utility functions.</dt>
 <dt>
-<a href="xmlsec-xmltree.html">xmltree</a>--XML tree operations.</dt>
+<a href="xmlsec-xmltree.html">xmltree</a> -- XML tree operations.</dt>
 <dt>
-<a href="xmlsec-x509.html">x509</a>--<a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</dt>
+<a href="xmlsec-x509.html">x509</a> -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</dt>
 </dl></dd>
 <dt><a href="xmlsec-openssl-ref.html">XML Security Library for OpenSLL API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-openssl-app.html">app</a>--Application functions implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-app.html">app</a> -- Application functions implementation for OpenSSL.</dt>
 <dt>
-<a href="xmlsec-openssl-bn.html">bn</a>--Big numbers helper functions.</dt>
+<a href="xmlsec-openssl-bn.html">bn</a> -- Big numbers helper functions.</dt>
 <dt>
-<a href="xmlsec-openssl-crypto.html">crypto</a>--Crypto transforms implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-crypto.html">crypto</a> -- Crypto transforms implementation for OpenSSL.</dt>
 <dt>
-<a href="xmlsec-openssl-evp.html">evp</a>--EVP keys data implementation.</dt>
+<a href="xmlsec-openssl-evp.html">evp</a> -- EVP keys data implementation.</dt>
 <dt>
-<a href="xmlsec-openssl-x509.html">x509</a>--X509 certificates support implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-x509.html">x509</a> -- X509 certificates support implementation for OpenSSL.</dt>
 </dl></dd>
 <dt><a href="xmlsec-gnutls-ref.html">XML Security Library for GnuTLS API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-gnutls-app.html">app</a>--Application functions implementation for GnuTLS.</dt>
+<a href="xmlsec-gnutls-app.html">app</a> -- Application functions implementation for GnuTLS.</dt>
 <dt>
-<a href="xmlsec-gnutls-crypto.html">crypto</a>--Crypto transforms implementation for GnuTLS.</dt>
+<a href="xmlsec-gnutls-crypto.html">crypto</a> -- Crypto transforms implementation for GnuTLS.</dt>
 </dl></dd>
 <dt><a href="xmlsec-nss-ref.html">XML Security Library for NSS API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-nss-app.html">app</a>--Application functions implementation for NSS.</dt>
+<a href="xmlsec-nss-app.html">app</a> -- Application functions implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-bignum.html">bignum</a>--Big numbers helper functions.</dt>
+<a href="xmlsec-nss-bignum.html">bignum</a> -- Big numbers helper functions.</dt>
 <dt>
-<a href="xmlsec-nss-crypto.html">crypto</a>--Crypto transforms implementation for NSS.</dt>
+<a href="xmlsec-nss-crypto.html">crypto</a> -- Crypto transforms implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-keysstore.html">keysstore</a>--Keys store implementation for NSS.</dt>
+<a href="xmlsec-nss-keysstore.html">keysstore</a> -- Keys store implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-pkikeys.html">pkikeys</a>--PKI keys data implementation.</dt>
+<a href="xmlsec-nss-pkikeys.html">pkikeys</a> -- PKI keys data implementation.</dt>
 <dt>
-<a href="xmlsec-nss-x509.html">x509</a>--X509 certificates support implementation for NSS.</dt>
+<a href="xmlsec-nss-x509.html">x509</a> -- X509 certificates support implementation for NSS.</dt>
 </dl></dd>
 <dt><a href="xmlsec-mscrypto-ref.html">XML Security Library for MSCrypto API Reference.</a></dt>
 <dd><dl>
 <dt>
-<a href="xmlsec-mscrypto-app.html">app</a>--Application functions implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-app.html">app</a> -- Application functions implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>--MS Crypto certificates helper functions.</dt>
+<a href="xmlsec-mscrypto-certkeys.html">certkeys</a> -- MS Crypto certificates helper functions.</dt>
 <dt>
-<a href="xmlsec-mscrypto-crypto.html">crypto</a>--Crypto transforms implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-crypto.html">crypto</a> -- Crypto transforms implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>--Keys store implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-keysstore.html">keysstore</a> -- Keys store implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-x509.html">x509</a>--X509 certificates support implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-x509.html">x509</a> -- X509 certificates support implementation for MS Crypto.</dt>
 </dl></dd>
 <dt><a href="xmlsec-index.html">XML Security Library Reference Index</a></dt>
 </dl></dd>
@@ -294,7 +293,7 @@
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
 <td align="left"></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes.html"><b>XML Security Library Tutorial&gt;&gt;&gt;</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes.html"><b>XML Security Library Tutorial &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/index.sgml b/docs/api/index.sgml
index 966d429..cccfd3f 100644
--- a/docs/api/index.sgml
+++ b/docs/api/index.sgml
@@ -1,1238 +1,41 @@
-<ANCHOR id ="XMLSEC-APP" href="xmlsec/xmlsec-app.html">
-<ANCHOR id ="XMLSECCRYPTOINIT" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOINIT">
-<ANCHOR id ="XMLSECCRYPTOSHUTDOWN" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOSHUTDOWN">
-<ANCHOR id ="XMLSECCRYPTOKEYSMNGRINIT" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOKEYSMNGRINIT">
-<ANCHOR id ="XMLSECKEYDATAAESID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAAESID">
-<ANCHOR id ="XMLSECKEYDATAAESGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAAESGETKLASS">
-<ANCHOR id ="XMLSECKEYDATADESID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATADESID">
-<ANCHOR id ="XMLSECKEYDATADESGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATADESGETKLASS">
-<ANCHOR id ="XMLSECKEYDATADSAID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATADSAID">
-<ANCHOR id ="XMLSECKEYDATADSAGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATADSAGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAGOST2001ID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAGOST2001ID">
-<ANCHOR id ="XMLSECKEYDATAGOST2001GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAGOST2001GETKLASS">
-<ANCHOR id ="XMLSECKEYDATAHMACID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAHMACID">
-<ANCHOR id ="XMLSECKEYDATAHMACGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAHMACGETKLASS">
-<ANCHOR id ="XMLSECKEYDATARSAID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATARSAID">
-<ANCHOR id ="XMLSECKEYDATARSAGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATARSAGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAX509ID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAX509ID">
-<ANCHOR id ="XMLSECKEYDATAX509GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATAX509GETKLASS">
-<ANCHOR id ="XMLSECKEYDATARAWX509CERTID" href="xmlsec/xmlsec-app.html#XMLSECKEYDATARAWX509CERTID">
-<ANCHOR id ="XMLSECKEYDATARAWX509CERTGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECKEYDATARAWX509CERTGETKLASS">
-<ANCHOR id ="XMLSECX509STOREID" href="xmlsec/xmlsec-app.html#XMLSECX509STOREID">
-<ANCHOR id ="XMLSECX509STOREGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECX509STOREGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMAES128CBCID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES128CBCID">
-<ANCHOR id ="XMLSECTRANSFORMAES128CBCGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES128CBCGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMAES192CBCID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES192CBCID">
-<ANCHOR id ="XMLSECTRANSFORMAES192CBCGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES192CBCGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMAES256CBCID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES256CBCID">
-<ANCHOR id ="XMLSECTRANSFORMAES256CBCGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMAES256CBCGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMKWAES128ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES128ID">
-<ANCHOR id ="XMLSECTRANSFORMKWAES128GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES128GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMKWAES192ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES192ID">
-<ANCHOR id ="XMLSECTRANSFORMKWAES192GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES192GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMKWAES256ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES256ID">
-<ANCHOR id ="XMLSECTRANSFORMKWAES256GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWAES256GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMDES3CBCID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMDES3CBCID">
-<ANCHOR id ="XMLSECTRANSFORMDES3CBCGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMDES3CBCGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMKWDES3ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWDES3ID">
-<ANCHOR id ="XMLSECTRANSFORMKWDES3GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMKWDES3GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMDSASHA1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMDSASHA1ID">
-<ANCHOR id ="XMLSECTRANSFORMDSASHA1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMDSASHA1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMGOST2001GOSTR3411-94ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94ID">
-<ANCHOR id ="XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACMD5ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACMD5ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACMD5GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACMD5GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA224ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA224ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA224GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA224GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA256ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA256ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA256GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA256GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA384ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA384ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA384GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA384GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA512ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA512ID">
-<ANCHOR id ="XMLSECTRANSFORMHMACSHA512GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMHMACSHA512GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMMD5ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMMD5ID">
-<ANCHOR id ="XMLSECTRANSFORMMD5GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMMD5GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRIPEMD160ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRIPEMD160ID">
-<ANCHOR id ="XMLSECTRANSFORMRIPEMD160GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSAMD5ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAMD5ID">
-<ANCHOR id ="XMLSECTRANSFORMRSAMD5GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAMD5GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSARIPEMD160ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160ID">
-<ANCHOR id ="XMLSECTRANSFORMRSARIPEMD160GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA1ID">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA224ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA224ID">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA224GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA224GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA256ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA256ID">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA256GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA256GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA384ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA384ID">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA384GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA384GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA512ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA512ID">
-<ANCHOR id ="XMLSECTRANSFORMRSASHA512GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSASHA512GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSAPKCS1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1ID">
-<ANCHOR id ="XMLSECTRANSFORMRSAPKCS1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMRSAOAEPID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAOAEPID">
-<ANCHOR id ="XMLSECTRANSFORMRSAOAEPGETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMRSAOAEPGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMGOSTR3411-94ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94ID">
-<ANCHOR id ="XMLSECTRANSFORMGOSTR3411-94GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMSHA1ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA1ID">
-<ANCHOR id ="XMLSECTRANSFORMSHA1GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA1GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMSHA224ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA224ID">
-<ANCHOR id ="XMLSECTRANSFORMSHA224GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA224GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMSHA256ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA256ID">
-<ANCHOR id ="XMLSECTRANSFORMSHA256GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA256GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMSHA384ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA384ID">
-<ANCHOR id ="XMLSECTRANSFORMSHA384GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA384GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMSHA512ID" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA512ID">
-<ANCHOR id ="XMLSECTRANSFORMSHA512GETKLASS" href="xmlsec/xmlsec-app.html#XMLSECTRANSFORMSHA512GETKLASS">
-<ANCHOR id ="XMLSECCRYPTOAPPINIT" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPINIT">
-<ANCHOR id ="XMLSECCRYPTOAPPSHUTDOWN" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPSHUTDOWN">
-<ANCHOR id ="XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT">
-<ANCHOR id ="XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">
-<ANCHOR id ="XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD">
-<ANCHOR id ="XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYSMNGRCERTLOAD" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOAD">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYLOAD" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYLOAD">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYLOADMEMORY" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYLOADMEMORY">
-<ANCHOR id ="XMLSECCRYPTOAPPPKCS12LOAD" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOAD">
-<ANCHOR id ="XMLSECCRYPTOAPPPKCS12LOADMEMORY" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOADMEMORY">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYCERTLOAD" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOAD">
-<ANCHOR id ="XMLSECCRYPTOAPPKEYCERTLOADMEMORY" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOADMEMORY">
-<ANCHOR id ="XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK" href="xmlsec/xmlsec-app.html#XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK">
-<ANCHOR id ="XMLSEC-BASE64" href="xmlsec/xmlsec-base64.html">
-<ANCHOR id ="XMLSEC-BASE64-LINESIZE-CAPS" href="xmlsec/xmlsec-base64.html#XMLSEC-BASE64-LINESIZE-CAPS">
-<ANCHOR id ="XMLSECBASE64GETDEFAULTLINESIZE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">
-<ANCHOR id ="XMLSECBASE64SETDEFAULTLINESIZE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">
-<ANCHOR id ="XMLSECBASE64CTXCREATE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXCREATE">
-<ANCHOR id ="XMLSECBASE64CTXDESTROY" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXDESTROY">
-<ANCHOR id ="XMLSECBASE64CTXINITIALIZE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXINITIALIZE">
-<ANCHOR id ="XMLSECBASE64CTXFINALIZE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXFINALIZE">
-<ANCHOR id ="XMLSECBASE64CTXUPDATE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXUPDATE">
-<ANCHOR id ="XMLSECBASE64CTXFINAL" href="xmlsec/xmlsec-base64.html#XMLSECBASE64CTXFINAL">
-<ANCHOR id ="XMLSECBASE64ENCODE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64ENCODE">
-<ANCHOR id ="XMLSECBASE64DECODE" href="xmlsec/xmlsec-base64.html#XMLSECBASE64DECODE">
-<ANCHOR id ="XMLSEC-BN" href="xmlsec/xmlsec-bn.html">
-<ANCHOR id ="XMLSECBNFORMAT" href="xmlsec/xmlsec-bn.html#XMLSECBNFORMAT">
-<ANCHOR id ="XMLSECBNCREATE" href="xmlsec/xmlsec-bn.html#XMLSECBNCREATE">
-<ANCHOR id ="XMLSECBNDESTROY" href="xmlsec/xmlsec-bn.html#XMLSECBNDESTROY">
-<ANCHOR id ="XMLSECBNINITIALIZE" href="xmlsec/xmlsec-bn.html#XMLSECBNINITIALIZE">
-<ANCHOR id ="XMLSECBNFINALIZE" href="xmlsec/xmlsec-bn.html#XMLSECBNFINALIZE">
-<ANCHOR id ="XMLSECBNGETDATA" href="xmlsec/xmlsec-bn.html#XMLSECBNGETDATA">
-<ANCHOR id ="XMLSECBNSETDATA" href="xmlsec/xmlsec-bn.html#XMLSECBNSETDATA">
-<ANCHOR id ="XMLSECBNGETSIZE" href="xmlsec/xmlsec-bn.html#XMLSECBNGETSIZE">
-<ANCHOR id ="XMLSECBNZERO" href="xmlsec/xmlsec-bn.html#XMLSECBNZERO">
-<ANCHOR id ="XMLSECBNFROMSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNFROMSTRING">
-<ANCHOR id ="XMLSECBNTOSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNTOSTRING">
-<ANCHOR id ="XMLSECBNFROMHEXSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNFROMHEXSTRING">
-<ANCHOR id ="XMLSECBNTOHEXSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNTOHEXSTRING">
-<ANCHOR id ="XMLSECBNFROMDECSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNFROMDECSTRING">
-<ANCHOR id ="XMLSECBNTODECSTRING" href="xmlsec/xmlsec-bn.html#XMLSECBNTODECSTRING">
-<ANCHOR id ="XMLSECBNMUL" href="xmlsec/xmlsec-bn.html#XMLSECBNMUL">
-<ANCHOR id ="XMLSECBNDIV" href="xmlsec/xmlsec-bn.html#XMLSECBNDIV">
-<ANCHOR id ="XMLSECBNADD" href="xmlsec/xmlsec-bn.html#XMLSECBNADD">
-<ANCHOR id ="XMLSECBNREVERSE" href="xmlsec/xmlsec-bn.html#XMLSECBNREVERSE">
-<ANCHOR id ="XMLSECBNCOMPARE" href="xmlsec/xmlsec-bn.html#XMLSECBNCOMPARE">
-<ANCHOR id ="XMLSECBNCOMPAREREVERSE" href="xmlsec/xmlsec-bn.html#XMLSECBNCOMPAREREVERSE">
-<ANCHOR id ="XMLSECBNGETNODEVALUE" href="xmlsec/xmlsec-bn.html#XMLSECBNGETNODEVALUE">
-<ANCHOR id ="XMLSECBNSETNODEVALUE" href="xmlsec/xmlsec-bn.html#XMLSECBNSETNODEVALUE">
-<ANCHOR id ="XMLSECBNBLOBSETNODEVALUE" href="xmlsec/xmlsec-bn.html#XMLSECBNBLOBSETNODEVALUE">
-<ANCHOR id ="XMLSEC-BUFFER" href="xmlsec/xmlsec-buffer.html">
-<ANCHOR id ="XMLSECALLOCMODE" href="xmlsec/xmlsec-buffer.html#XMLSECALLOCMODE">
-<ANCHOR id ="XMLSECBUFFER" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFER">
-<ANCHOR id ="XMLSECBUFFERSETDEFAULTALLOCMODE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERSETDEFAULTALLOCMODE">
-<ANCHOR id ="XMLSECBUFFERCREATE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERCREATE">
-<ANCHOR id ="XMLSECBUFFERDESTROY" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERDESTROY">
-<ANCHOR id ="XMLSECBUFFERINITIALIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERINITIALIZE">
-<ANCHOR id ="XMLSECBUFFERFINALIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERFINALIZE">
-<ANCHOR id ="XMLSECBUFFERGETDATA" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERGETDATA">
-<ANCHOR id ="XMLSECBUFFERSETDATA" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERSETDATA">
-<ANCHOR id ="XMLSECBUFFERGETSIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERGETSIZE">
-<ANCHOR id ="XMLSECBUFFERSETSIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERSETSIZE">
-<ANCHOR id ="XMLSECBUFFERGETMAXSIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERGETMAXSIZE">
-<ANCHOR id ="XMLSECBUFFERSETMAXSIZE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERSETMAXSIZE">
-<ANCHOR id ="XMLSECBUFFEREMPTY" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFEREMPTY">
-<ANCHOR id ="XMLSECBUFFERAPPEND" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERAPPEND">
-<ANCHOR id ="XMLSECBUFFERPREPEND" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERPREPEND">
-<ANCHOR id ="XMLSECBUFFERREMOVEHEAD" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERREMOVEHEAD">
-<ANCHOR id ="XMLSECBUFFERREMOVETAIL" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERREMOVETAIL">
-<ANCHOR id ="XMLSECBUFFERREADFILE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERREADFILE">
-<ANCHOR id ="XMLSECBUFFERBASE64NODECONTENTREAD" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTREAD">
-<ANCHOR id ="XMLSECBUFFERBASE64NODECONTENTWRITE" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTWRITE">
-<ANCHOR id ="XMLSECBUFFERCREATEOUTPUTBUFFER" href="xmlsec/xmlsec-buffer.html#XMLSECBUFFERCREATEOUTPUTBUFFER">
-<ANCHOR id ="XMLSEC-DL" href="xmlsec/xmlsec-dl.html">
-<ANCHOR id ="XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">
-<ANCHOR id ="XMLSECCRYPTODLINIT" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLINIT">
-<ANCHOR id ="XMLSECCRYPTODLSHUTDOWN" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">
-<ANCHOR id ="XMLSECCRYPTODLLOADLIBRARY" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY">
-<ANCHOR id ="XMLSECCRYPTODLGETLIBRARYFUNCTIONS" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS">
-<ANCHOR id ="XMLSECCRYPTODLUNLOADLIBRARY" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">
-<ANCHOR id ="XMLSECCRYPTODLSETFUNCTIONS" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">
-<ANCHOR id ="XMLSECCRYPTODLGETFUNCTIONS" href="xmlsec/xmlsec-dl.html#XMLSECCRYPTODLGETFUNCTIONS">
-<ANCHOR id ="XMLSEC-ERRORS" href="xmlsec/xmlsec-errors.html">
-<ANCHOR id ="XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-XML-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-XSLT-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-IO-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-DISABLED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-SIZE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-DATA-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-RESULT-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-TYPE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-STATUS-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-NODE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-REVOKED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-R-ASSERTION-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION-CAPS">
-<ANCHOR id ="XMLSEC-ERRORS-MAX-NUMBER-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER-CAPS">
-<ANCHOR id ="XMLSECERRORSCALLBACK" href="xmlsec/xmlsec-errors.html#XMLSECERRORSCALLBACK">
-<ANCHOR id ="XMLSECERRORSINIT" href="xmlsec/xmlsec-errors.html#XMLSECERRORSINIT">
-<ANCHOR id ="XMLSECERRORSSHUTDOWN" href="xmlsec/xmlsec-errors.html#XMLSECERRORSSHUTDOWN">
-<ANCHOR id ="XMLSECERRORSSETCALLBACK" href="xmlsec/xmlsec-errors.html#XMLSECERRORSSETCALLBACK">
-<ANCHOR id ="XMLSECERRORSDEFAULTCALLBACK" href="xmlsec/xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">
-<ANCHOR id ="XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT" href="xmlsec/xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">
-<ANCHOR id ="XMLSECERRORSGETCODE" href="xmlsec/xmlsec-errors.html#XMLSECERRORSGETCODE">
-<ANCHOR id ="XMLSECERRORSGETMSG" href="xmlsec/xmlsec-errors.html#XMLSECERRORSGETMSG">
-<ANCHOR id ="XMLSEC-ERRORS-HERE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-HERE-CAPS">
-<ANCHOR id ="XMLSECERRORSSAFESTRING" href="xmlsec/xmlsec-errors.html#XMLSECERRORSSAFESTRING">
-<ANCHOR id ="XMLSEC-ERRORS-NO-MESSAGE-CAPS" href="xmlsec/xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE-CAPS">
-<ANCHOR id ="XMLSECERROR" href="xmlsec/xmlsec-errors.html#XMLSECERROR">
-<ANCHOR id ="XMLSECASSERT" href="xmlsec/xmlsec-errors.html#XMLSECASSERT">
-<ANCHOR id ="XMLSECASSERT2" href="xmlsec/xmlsec-errors.html#XMLSECASSERT2">
-<ANCHOR id ="XMLSEC-IO" href="xmlsec/xmlsec-io.html">
-<ANCHOR id ="XMLSECIOINIT" href="xmlsec/xmlsec-io.html#XMLSECIOINIT">
-<ANCHOR id ="XMLSECIOSHUTDOWN" href="xmlsec/xmlsec-io.html#XMLSECIOSHUTDOWN">
-<ANCHOR id ="XMLSECIOCLEANUPCALLBACKS" href="xmlsec/xmlsec-io.html#XMLSECIOCLEANUPCALLBACKS">
-<ANCHOR id ="XMLSECIOREGISTERDEFAULTCALLBACKS" href="xmlsec/xmlsec-io.html#XMLSECIOREGISTERDEFAULTCALLBACKS">
-<ANCHOR id ="XMLSECIOREGISTERCALLBACKS" href="xmlsec/xmlsec-io.html#XMLSECIOREGISTERCALLBACKS">
-<ANCHOR id ="XMLSECTRANSFORMINPUTURIID" href="xmlsec/xmlsec-io.html#XMLSECTRANSFORMINPUTURIID">
-<ANCHOR id ="XMLSECTRANSFORMINPUTURIGETKLASS" href="xmlsec/xmlsec-io.html#XMLSECTRANSFORMINPUTURIGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMINPUTURIOPEN" href="xmlsec/xmlsec-io.html#XMLSECTRANSFORMINPUTURIOPEN">
-<ANCHOR id ="XMLSEC-KEYINFO" href="xmlsec/xmlsec-keyinfo.html">
-<ANCHOR id ="XMLSECKEYINFONODEREAD" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">
-<ANCHOR id ="XMLSECKEYINFONODEWRITE" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">
-<ANCHOR id ="XMLSECKEYINFOMODE" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOMODE">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">
-<ANCHOR id ="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS" href="xmlsec/xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">
-<ANCHOR id ="XMLSECKEYINFOCTX" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTX">
-<ANCHOR id ="XMLSECKEYINFOCTXCREATE" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE">
-<ANCHOR id ="XMLSECKEYINFOCTXDESTROY" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY">
-<ANCHOR id ="XMLSECKEYINFOCTXINITIALIZE" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">
-<ANCHOR id ="XMLSECKEYINFOCTXFINALIZE" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE">
-<ANCHOR id ="XMLSECKEYINFOCTXRESET" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">
-<ANCHOR id ="XMLSECKEYINFOCTXCOPYUSERPREF" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXCOPYUSERPREF">
-<ANCHOR id ="XMLSECKEYINFOCTXCREATEENCCTX" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATEENCCTX">
-<ANCHOR id ="XMLSECKEYINFOCTXDEBUGDUMP" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYINFOCTXDEBUGXMLDUMP" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYDATANAMEID" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATANAMEID">
-<ANCHOR id ="XMLSECKEYDATANAMEGETKLASS" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATANAMEGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAVALUEID" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATAVALUEID">
-<ANCHOR id ="XMLSECKEYDATAVALUEGETKLASS" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATAVALUEGETKLASS">
-<ANCHOR id ="XMLSECKEYDATARETRIEVALMETHODID" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODID">
-<ANCHOR id ="XMLSECKEYDATARETRIEVALMETHODGETKLASS" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAENCRYPTEDKEYID" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYID">
-<ANCHOR id ="XMLSECKEYDATAENCRYPTEDKEYGETKLASS" href="xmlsec/xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYGETKLASS">
-<ANCHOR id ="XMLSEC-KEYSDATA" href="xmlsec/xmlsec-keysdata.html">
-<ANCHOR id ="XMLSECKEYDATAUSAGE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">
-<ANCHOR id ="XMLSECKEYDATAUSAGEUNKNOWN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEUNKNOWN">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYINFONODEREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEREAD">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYINFONODEWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEWRITE">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYVALUENODEREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEREAD">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYVALUENODEWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEWRITE">
-<ANCHOR id ="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML">
-<ANCHOR id ="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN">
-<ANCHOR id ="XMLSECKEYDATAUSAGEANY" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEANY">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYINFONODE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODE">
-<ANCHOR id ="XMLSECKEYDATAUSAGEKEYVALUENODE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODE">
-<ANCHOR id ="XMLSECKEYDATAUSAGERETRIEVALMETHODNODE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODE">
-<ANCHOR id ="XMLSECKEYDATATYPE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPE">
-<ANCHOR id ="XMLSECKEYDATATYPEUNKNOWN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPEUNKNOWN">
-<ANCHOR id ="XMLSECKEYDATATYPENONE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPENONE">
-<ANCHOR id ="XMLSECKEYDATATYPEPUBLIC" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPEPUBLIC">
-<ANCHOR id ="XMLSECKEYDATATYPEPRIVATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPEPRIVATE">
-<ANCHOR id ="XMLSECKEYDATATYPESYMMETRIC" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPESYMMETRIC">
-<ANCHOR id ="XMLSECKEYDATATYPESESSION" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPESESSION">
-<ANCHOR id ="XMLSECKEYDATATYPEPERMANENT" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPEPERMANENT">
-<ANCHOR id ="XMLSECKEYDATATYPETRUSTED" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPETRUSTED">
-<ANCHOR id ="XMLSECKEYDATATYPEANY" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATATYPEANY">
-<ANCHOR id ="XMLSECKEYDATAFORMAT" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">
-<ANCHOR id ="XMLSECKEYDATAIDSGET" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDSGET">
-<ANCHOR id ="XMLSECKEYDATAIDSINIT" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDSINIT">
-<ANCHOR id ="XMLSECKEYDATAIDSSHUTDOWN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDSSHUTDOWN">
-<ANCHOR id ="XMLSECKEYDATAIDSREGISTERDEFAULT" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTERDEFAULT">
-<ANCHOR id ="XMLSECKEYDATAIDSREGISTER" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTER">
-<ANCHOR id ="XMLSECKEYDATA" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATA">
-<ANCHOR id ="XMLSECKEYDATACREATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATACREATE">
-<ANCHOR id ="XMLSECKEYDATADUPLICATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADUPLICATE">
-<ANCHOR id ="XMLSECKEYDATADESTROY" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADESTROY">
-<ANCHOR id ="XMLSECKEYDATAGENERATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGENERATE">
-<ANCHOR id ="XMLSECKEYDATAGETTYPE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETTYPE">
-<ANCHOR id ="XMLSECKEYDATAGETSIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETSIZE">
-<ANCHOR id ="XMLSECKEYDATAGETIDENTIFIER" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIER">
-<ANCHOR id ="XMLSECKEYDATADEBUGDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMP">
-<ANCHOR id ="XMLSECKEYDATADEBUGXMLDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYDATAXMLREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAXMLREAD">
-<ANCHOR id ="XMLSECKEYDATAXMLWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITE">
-<ANCHOR id ="XMLSECKEYDATABINREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINREAD">
-<ANCHOR id ="XMLSECKEYDATABINWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINWRITE">
-<ANCHOR id ="XMLSECKEYDATAGETNAME" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETNAME">
-<ANCHOR id ="XMLSECKEYDATAISVALID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAISVALID">
-<ANCHOR id ="XMLSECKEYDATACHECKID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATACHECKID">
-<ANCHOR id ="XMLSECKEYDATACHECKUSAGE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATACHECKUSAGE">
-<ANCHOR id ="XMLSECKEYDATACHECKSIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATACHECKSIZE">
-<ANCHOR id ="XMLSECKEYDATAIDUNKNOWN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDUNKNOWN">
-<ANCHOR id ="XMLSECKEYDATAINITMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">
-<ANCHOR id ="XMLSECKEYDATADUPLICATEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAFINALIZEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAXMLREADMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">
-<ANCHOR id ="XMLSECKEYDATAXMLWRITEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">
-<ANCHOR id ="XMLSECKEYDATABINREADMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">
-<ANCHOR id ="XMLSECKEYDATABINWRITEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAGENERATEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAGETTYPEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAGETSIZEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">
-<ANCHOR id ="XMLSECKEYDATAGETIDENTIFIERMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">
-<ANCHOR id ="XMLSECKEYDATADEBUGDUMPMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">
-<ANCHOR id ="XMLSECKEYDATAKLASS" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAKLASS">
-<ANCHOR id ="XMLSECKEYDATAKLASSGETNAME" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAKLASSGETNAME">
-<ANCHOR id ="XMLSECKEYDATALISTID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATALISTID">
-<ANCHOR id ="XMLSECKEYDATALISTGETKLASS" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATALISTGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAIDLISTID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTID">
-<ANCHOR id ="XMLSECKEYDATAIDLISTGETKLASS" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTGETKLASS">
-<ANCHOR id ="XMLSECKEYDATAIDLISTFIND" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFIND">
-<ANCHOR id ="XMLSECKEYDATAIDLISTFINDBYNODE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNODE">
-<ANCHOR id ="XMLSECKEYDATAIDLISTFINDBYHREF" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYHREF">
-<ANCHOR id ="XMLSECKEYDATAIDLISTFINDBYNAME" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNAME">
-<ANCHOR id ="XMLSECKEYDATAIDLISTDEBUGDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYDATAIDLISTDEBUGXMLDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYDATABINARYSIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYSIZE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEINITIALIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEINITIALIZE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEDUPLICATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDUPLICATE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEFINALIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEFINALIZE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEXMLREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLREAD">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEXMLWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLWRITE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEBINREAD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINREAD">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEBINWRITE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINWRITE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEDEBUGDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEGETSIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETSIZE">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUEGETBUFFER" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETBUFFER">
-<ANCHOR id ="XMLSECKEYDATABINARYVALUESETBUFFER" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUESETBUFFER">
-<ANCHOR id ="XMLSECKEYDATASTORE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTORE">
-<ANCHOR id ="XMLSECKEYDATASTORECREATE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE">
-<ANCHOR id ="XMLSECKEYDATASTOREDESTROY" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY">
-<ANCHOR id ="XMLSECKEYDATASTOREGETNAME" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREGETNAME">
-<ANCHOR id ="XMLSECKEYDATASTOREISVALID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREISVALID">
-<ANCHOR id ="XMLSECKEYDATASTORECHECKID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKID">
-<ANCHOR id ="XMLSECKEYDATASTORECHECKSIZE" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKSIZE">
-<ANCHOR id ="XMLSECKEYDATASTOREIDUNKNOWN" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREIDUNKNOWN">
-<ANCHOR id ="XMLSECKEYDATASTOREINITIALIZEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">
-<ANCHOR id ="XMLSECKEYDATASTOREFINALIZEMETHOD" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">
-<ANCHOR id ="XMLSECKEYDATASTOREKLASS" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">
-<ANCHOR id ="XMLSECKEYDATASTOREKLASSGETNAME" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASSGETNAME">
-<ANCHOR id ="XMLSECKEYDATASTOREPTRLISTID" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTID">
-<ANCHOR id ="XMLSECKEYDATASTOREPTRLISTGETKLASS" href="xmlsec/xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTGETKLASS">
-<ANCHOR id ="XMLSEC-KEYS" href="xmlsec/xmlsec-keys.html">
-<ANCHOR id ="XMLSECKEYUSAGE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGE">
-<ANCHOR id ="XMLSECKEYUSAGESIGN" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGESIGN">
-<ANCHOR id ="XMLSECKEYUSAGEVERIFY" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGEVERIFY">
-<ANCHOR id ="XMLSECKEYUSAGEENCRYPT" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGEENCRYPT">
-<ANCHOR id ="XMLSECKEYUSAGEDECRYPT" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGEDECRYPT">
-<ANCHOR id ="XMLSECKEYUSAGEKEYEXCHANGE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGEKEYEXCHANGE">
-<ANCHOR id ="XMLSECKEYUSAGEANY" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSAGEANY">
-<ANCHOR id ="XMLSECKEYUSEWITHINITIALIZE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHINITIALIZE">
-<ANCHOR id ="XMLSECKEYUSEWITHFINALIZE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHFINALIZE">
-<ANCHOR id ="XMLSECKEYUSEWITHRESET" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHRESET">
-<ANCHOR id ="XMLSECKEYUSEWITHCOPY" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHCOPY">
-<ANCHOR id ="XMLSECKEYUSEWITHCREATE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHCREATE">
-<ANCHOR id ="XMLSECKEYUSEWITHDUPLICATE" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHDUPLICATE">
-<ANCHOR id ="XMLSECKEYUSEWITHDESTROY" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHDESTROY">
-<ANCHOR id ="XMLSECKEYUSEWITHSET" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHSET">
-<ANCHOR id ="XMLSECKEYUSEWITHDEBUGDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYUSEWITHDEBUGXMLDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYUSEWITH" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITH">
-<ANCHOR id ="XMLSECKEYUSEWITHPTRLISTID" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTID">
-<ANCHOR id ="XMLSECKEYUSEWITHPTRLISTGETKLASS" href="xmlsec/xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTGETKLASS">
-<ANCHOR id ="XMLSECKEYREQ" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQ">
-<ANCHOR id ="XMLSECKEYREQINITIALIZE" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQINITIALIZE">
-<ANCHOR id ="XMLSECKEYREQFINALIZE" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQFINALIZE">
-<ANCHOR id ="XMLSECKEYREQRESET" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQRESET">
-<ANCHOR id ="XMLSECKEYREQCOPY" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQCOPY">
-<ANCHOR id ="XMLSECKEYREQMATCHKEY" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQMATCHKEY">
-<ANCHOR id ="XMLSECKEYREQMATCHKEYVALUE" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQMATCHKEYVALUE">
-<ANCHOR id ="XMLSECKEYREQDEBUGDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYREQDEBUGXMLDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYREQDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEY" href="xmlsec/xmlsec-keys.html#XMLSECKEY">
-<ANCHOR id ="XMLSECKEYCREATE" href="xmlsec/xmlsec-keys.html#XMLSECKEYCREATE">
-<ANCHOR id ="XMLSECKEYDESTROY" href="xmlsec/xmlsec-keys.html#XMLSECKEYDESTROY">
-<ANCHOR id ="XMLSECKEYEMPTY" href="xmlsec/xmlsec-keys.html#XMLSECKEYEMPTY">
-<ANCHOR id ="XMLSECKEYDUPLICATE" href="xmlsec/xmlsec-keys.html#XMLSECKEYDUPLICATE">
-<ANCHOR id ="XMLSECKEYCOPY" href="xmlsec/xmlsec-keys.html#XMLSECKEYCOPY">
-<ANCHOR id ="XMLSECKEYGETNAME" href="xmlsec/xmlsec-keys.html#XMLSECKEYGETNAME">
-<ANCHOR id ="XMLSECKEYSETNAME" href="xmlsec/xmlsec-keys.html#XMLSECKEYSETNAME">
-<ANCHOR id ="XMLSECKEYGETTYPE" href="xmlsec/xmlsec-keys.html#XMLSECKEYGETTYPE">
-<ANCHOR id ="XMLSECKEYGETVALUE" href="xmlsec/xmlsec-keys.html#XMLSECKEYGETVALUE">
-<ANCHOR id ="XMLSECKEYSETVALUE" href="xmlsec/xmlsec-keys.html#XMLSECKEYSETVALUE">
-<ANCHOR id ="XMLSECKEYGETDATA" href="xmlsec/xmlsec-keys.html#XMLSECKEYGETDATA">
-<ANCHOR id ="XMLSECKEYENSUREDATA" href="xmlsec/xmlsec-keys.html#XMLSECKEYENSUREDATA">
-<ANCHOR id ="XMLSECKEYADOPTDATA" href="xmlsec/xmlsec-keys.html#XMLSECKEYADOPTDATA">
-<ANCHOR id ="XMLSECKEYDEBUGDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYDEBUGDUMP">
-<ANCHOR id ="XMLSECKEYDEBUGXMLDUMP" href="xmlsec/xmlsec-keys.html#XMLSECKEYDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECKEYGENERATE" href="xmlsec/xmlsec-keys.html#XMLSECKEYGENERATE">
-<ANCHOR id ="XMLSECKEYGENERATEBYNAME" href="xmlsec/xmlsec-keys.html#XMLSECKEYGENERATEBYNAME">
-<ANCHOR id ="XMLSECKEYMATCH" href="xmlsec/xmlsec-keys.html#XMLSECKEYMATCH">
-<ANCHOR id ="XMLSECKEYREADBUFFER" href="xmlsec/xmlsec-keys.html#XMLSECKEYREADBUFFER">
-<ANCHOR id ="XMLSECKEYREADBINARYFILE" href="xmlsec/xmlsec-keys.html#XMLSECKEYREADBINARYFILE">
-<ANCHOR id ="XMLSECKEYREADMEMORY" href="xmlsec/xmlsec-keys.html#XMLSECKEYREADMEMORY">
-<ANCHOR id ="XMLSECKEYISVALID" href="xmlsec/xmlsec-keys.html#XMLSECKEYISVALID">
-<ANCHOR id ="XMLSECKEYCHECKID" href="xmlsec/xmlsec-keys.html#XMLSECKEYCHECKID">
-<ANCHOR id ="XMLSECKEYPTRLISTID" href="xmlsec/xmlsec-keys.html#XMLSECKEYPTRLISTID">
-<ANCHOR id ="XMLSECKEYPTRLISTGETKLASS" href="xmlsec/xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">
-<ANCHOR id ="XMLSEC-KEYSMNGR" href="xmlsec/xmlsec-keysmngr.html">
-<ANCHOR id ="XMLSECKEYSMNGRCREATE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE">
-<ANCHOR id ="XMLSECKEYSMNGRDESTROY" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY">
-<ANCHOR id ="XMLSECKEYSMNGRFINDKEY" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRFINDKEY">
-<ANCHOR id ="XMLSECKEYSMNGRADOPTKEYSSTORE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTKEYSSTORE">
-<ANCHOR id ="XMLSECKEYSMNGRGETKEYSSTORE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEYSSTORE">
-<ANCHOR id ="XMLSECKEYSMNGRADOPTDATASTORE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTDATASTORE">
-<ANCHOR id ="XMLSECKEYSMNGRGETDATASTORE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRGETDATASTORE">
-<ANCHOR id ="XMLSECGETKEYCALLBACK" href="xmlsec/xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">
-<ANCHOR id ="XMLSECKEYSMNGR" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGR">
-<ANCHOR id ="XMLSECKEYSMNGRGETKEY" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEY">
-<ANCHOR id ="XMLSECKEYSTORE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTORE">
-<ANCHOR id ="XMLSECKEYSTORECREATE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTORECREATE">
-<ANCHOR id ="XMLSECKEYSTOREDESTROY" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY">
-<ANCHOR id ="XMLSECKEYSTOREFINDKEY" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEY">
-<ANCHOR id ="XMLSECKEYSTOREGETNAME" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREGETNAME">
-<ANCHOR id ="XMLSECKEYSTOREISVALID" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREISVALID">
-<ANCHOR id ="XMLSECKEYSTORECHECKID" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTORECHECKID">
-<ANCHOR id ="XMLSECKEYSTORECHECKSIZE" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTORECHECKSIZE">
-<ANCHOR id ="XMLSECKEYSTOREIDUNKNOWN" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREIDUNKNOWN">
-<ANCHOR id ="XMLSECKEYSTOREINITIALIZEMETHOD" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">
-<ANCHOR id ="XMLSECKEYSTOREFINALIZEMETHOD" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">
-<ANCHOR id ="XMLSECKEYSTOREFINDKEYMETHOD" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">
-<ANCHOR id ="XMLSECKEYSTOREKLASS" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREKLASS">
-<ANCHOR id ="XMLSECKEYSTOREKLASSGETNAME" href="xmlsec/xmlsec-keysmngr.html#XMLSECKEYSTOREKLASSGETNAME">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTOREID" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTOREGETKLASS" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKLASS">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTOREADOPTKEY" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREADOPTKEY">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTORELOAD" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORELOAD">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTORESAVE" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORESAVE">
-<ANCHOR id ="XMLSECSIMPLEKEYSSTOREGETKEYS" href="xmlsec/xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKEYS">
-<ANCHOR id ="XMLSEC-LIST" href="xmlsec/xmlsec-list.html">
-<ANCHOR id ="XMLSECPTRLIST" href="xmlsec/xmlsec-list.html#XMLSECPTRLIST">
-<ANCHOR id ="XMLSECPTRLISTSETDEFAULTALLOCMODE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">
-<ANCHOR id ="XMLSECPTRLISTINITIALIZE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTINITIALIZE">
-<ANCHOR id ="XMLSECPTRLISTFINALIZE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTFINALIZE">
-<ANCHOR id ="XMLSECPTRLISTCREATE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTCREATE">
-<ANCHOR id ="XMLSECPTRLISTDESTROY" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTDESTROY">
-<ANCHOR id ="XMLSECPTRLISTEMPTY" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTEMPTY">
-<ANCHOR id ="XMLSECPTRLISTCOPY" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTCOPY">
-<ANCHOR id ="XMLSECPTRLISTDUPLICATE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTDUPLICATE">
-<ANCHOR id ="XMLSECPTRLISTGETSIZE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTGETSIZE">
-<ANCHOR id ="XMLSECPTRLISTGETITEM" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTGETITEM">
-<ANCHOR id ="XMLSECPTRLISTADD" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTADD">
-<ANCHOR id ="XMLSECPTRLISTSET" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTSET">
-<ANCHOR id ="XMLSECPTRLISTREMOVE" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTREMOVE">
-<ANCHOR id ="XMLSECPTRLISTDEBUGDUMP" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTDEBUGDUMP">
-<ANCHOR id ="XMLSECPTRLISTDEBUGXMLDUMP" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECPTRLISTGETNAME" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTGETNAME">
-<ANCHOR id ="XMLSECPTRLISTISVALID" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTISVALID">
-<ANCHOR id ="XMLSECPTRLISTCHECKID" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTCHECKID">
-<ANCHOR id ="XMLSECPTRLISTIDUNKNOWN" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTIDUNKNOWN">
-<ANCHOR id ="XMLSECPTRDUPLICATEITEMMETHOD" href="xmlsec/xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">
-<ANCHOR id ="XMLSECPTRDESTROYITEMMETHOD" href="xmlsec/xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">
-<ANCHOR id ="XMLSECPTRDEBUGDUMPITEMMETHOD" href="xmlsec/xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">
-<ANCHOR id ="XMLSECPTRLISTKLASS" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTKLASS">
-<ANCHOR id ="XMLSECPTRLISTKLASSGETNAME" href="xmlsec/xmlsec-list.html#XMLSECPTRLISTKLASSGETNAME">
-<ANCHOR id ="XMLSECSTRINGLISTID" href="xmlsec/xmlsec-list.html#XMLSECSTRINGLISTID">
-<ANCHOR id ="XMLSECSTRINGLISTGETKLASS" href="xmlsec/xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">
-<ANCHOR id ="XMLSEC-MEMBUF" href="xmlsec/xmlsec-membuf.html">
-<ANCHOR id ="XMLSECTRANSFORMMEMBUFID" href="xmlsec/xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFID">
-<ANCHOR id ="XMLSECTRANSFORMMEMBUFGETKLASS" href="xmlsec/xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMMEMBUFGETBUFFER" href="xmlsec/xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETBUFFER">
-<ANCHOR id ="XMLSEC-NODESET" href="xmlsec/xmlsec-nodeset.html">
-<ANCHOR id ="XMLSECNODESETTYPE" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETTYPE">
-<ANCHOR id ="XMLSECNODESETOP" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETOP">
-<ANCHOR id ="XMLSECNODESET" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESET">
-<ANCHOR id ="XMLSECNODESETWALKCALLBACK" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">
-<ANCHOR id ="XMLSECNODESETCREATE" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETCREATE">
-<ANCHOR id ="XMLSECNODESETDESTROY" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETDESTROY">
-<ANCHOR id ="XMLSECNODESETDOCDESTROY" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETDOCDESTROY">
-<ANCHOR id ="XMLSECNODESETCONTAINS" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETCONTAINS">
-<ANCHOR id ="XMLSECNODESETADD" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETADD">
-<ANCHOR id ="XMLSECNODESETADDLIST" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETADDLIST">
-<ANCHOR id ="XMLSECNODESETGETCHILDREN" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETGETCHILDREN">
-<ANCHOR id ="XMLSECNODESETWALK" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETWALK">
-<ANCHOR id ="XMLSECNODESETDUMPTEXTNODES" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETDUMPTEXTNODES">
-<ANCHOR id ="XMLSECNODESETDEBUGDUMP" href="xmlsec/xmlsec-nodeset.html#XMLSECNODESETDEBUGDUMP">
-<ANCHOR id ="XMLSEC-PARSER" href="xmlsec/xmlsec-parser.html">
-<ANCHOR id ="XMLSECPARSEFILE" href="xmlsec/xmlsec-parser.html#XMLSECPARSEFILE">
-<ANCHOR id ="XMLSECPARSEMEMORY" href="xmlsec/xmlsec-parser.html#XMLSECPARSEMEMORY">
-<ANCHOR id ="XMLSECPARSEMEMORYEXT" href="xmlsec/xmlsec-parser.html#XMLSECPARSEMEMORYEXT">
-<ANCHOR id ="XMLSECTRANSFORMXMLPARSERID" href="xmlsec/xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERID">
-<ANCHOR id ="XMLSECTRANSFORMXMLPARSERGETKLASS" href="xmlsec/xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERGETKLASS">
-<ANCHOR id ="XMLSEC-TEMPLATES" href="xmlsec/xmlsec-templates.html">
-<ANCHOR id ="XMLSECTMPLSIGNATURECREATE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">
-<ANCHOR id ="XMLSECTMPLSIGNATURECREATENSPREF" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATURECREATENSPREF">
-<ANCHOR id ="XMLSECTMPLSIGNATUREENSUREKEYINFO" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATUREENSUREKEYINFO">
-<ANCHOR id ="XMLSECTMPLSIGNATUREADDREFERENCE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATUREADDREFERENCE">
-<ANCHOR id ="XMLSECTMPLSIGNATUREADDOBJECT" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATUREADDOBJECT">
-<ANCHOR id ="XMLSECTMPLSIGNATUREGETSIGNMETHODNODE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATUREGETSIGNMETHODNODE">
-<ANCHOR id ="XMLSECTMPLSIGNATUREGETC14NMETHODNODE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLSIGNATUREGETC14NMETHODNODE">
-<ANCHOR id ="XMLSECTMPLREFERENCEADDTRANSFORM" href="xmlsec/xmlsec-templates.html#XMLSECTMPLREFERENCEADDTRANSFORM">
-<ANCHOR id ="XMLSECTMPLOBJECTADDSIGNPROPERTIES" href="xmlsec/xmlsec-templates.html#XMLSECTMPLOBJECTADDSIGNPROPERTIES">
-<ANCHOR id ="XMLSECTMPLOBJECTADDMANIFEST" href="xmlsec/xmlsec-templates.html#XMLSECTMPLOBJECTADDMANIFEST">
-<ANCHOR id ="XMLSECTMPLMANIFESTADDREFERENCE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLMANIFESTADDREFERENCE">
-<ANCHOR id ="XMLSECTMPLENCDATACREATE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATACREATE">
-<ANCHOR id ="XMLSECTMPLENCDATAENSUREKEYINFO" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAENSUREKEYINFO">
-<ANCHOR id ="XMLSECTMPLENCDATAENSUREENCPROPERTIES" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAENSUREENCPROPERTIES">
-<ANCHOR id ="XMLSECTMPLENCDATAADDENCPROPERTY" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAADDENCPROPERTY">
-<ANCHOR id ="XMLSECTMPLENCDATAENSURECIPHERVALUE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERVALUE">
-<ANCHOR id ="XMLSECTMPLENCDATAENSURECIPHERREFERENCE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERREFERENCE">
-<ANCHOR id ="XMLSECTMPLENCDATAGETENCMETHODNODE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLENCDATAGETENCMETHODNODE">
-<ANCHOR id ="XMLSECTMPLCIPHERREFERENCEADDTRANSFORM" href="xmlsec/xmlsec-templates.html#XMLSECTMPLCIPHERREFERENCEADDTRANSFORM">
-<ANCHOR id ="XMLSECTMPLREFERENCELISTADDDATAREFERENCE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDDATAREFERENCE">
-<ANCHOR id ="XMLSECTMPLREFERENCELISTADDKEYREFERENCE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDKEYREFERENCE">
-<ANCHOR id ="XMLSECTMPLKEYINFOADDKEYNAME" href="xmlsec/xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYNAME">
-<ANCHOR id ="XMLSECTMPLKEYINFOADDKEYVALUE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYVALUE">
-<ANCHOR id ="XMLSECTMPLKEYINFOADDX509DATA" href="xmlsec/xmlsec-templates.html#XMLSECTMPLKEYINFOADDX509DATA">
-<ANCHOR id ="XMLSECTMPLKEYINFOADDRETRIEVALMETHOD" href="xmlsec/xmlsec-templates.html#XMLSECTMPLKEYINFOADDRETRIEVALMETHOD">
-<ANCHOR id ="XMLSECTMPLRETRIEVALMETHODADDTRANSFORM" href="xmlsec/xmlsec-templates.html#XMLSECTMPLRETRIEVALMETHODADDTRANSFORM">
-<ANCHOR id ="XMLSECTMPLKEYINFOADDENCRYPTEDKEY" href="xmlsec/xmlsec-templates.html#XMLSECTMPLKEYINFOADDENCRYPTEDKEY">
-<ANCHOR id ="XMLSECTMPLX509DATAADDISSUERSERIAL" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509DATAADDISSUERSERIAL">
-<ANCHOR id ="XMLSECTMPLX509ISSUERSERIALADDISSUERNAME" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDISSUERNAME">
-<ANCHOR id ="XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER">
-<ANCHOR id ="XMLSECTMPLX509DATAADDSUBJECTNAME" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509DATAADDSUBJECTNAME">
-<ANCHOR id ="XMLSECTMPLX509DATAADDSKI" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509DATAADDSKI">
-<ANCHOR id ="XMLSECTMPLX509DATAADDCERTIFICATE" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509DATAADDCERTIFICATE">
-<ANCHOR id ="XMLSECTMPLX509DATAADDCRL" href="xmlsec/xmlsec-templates.html#XMLSECTMPLX509DATAADDCRL">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDRSAOAEPPARAM" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDRSAOAEPPARAM">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDXPATH" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDXPATH2" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH2">
-<ANCHOR id ="XMLSECTMPLTRANSFORMADDXPOINTER" href="xmlsec/xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPOINTER">
-<ANCHOR id ="XMLSEC-TRANSFORMS" href="xmlsec/xmlsec-transforms.html">
-<ANCHOR id ="XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS" href="xmlsec/xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">
-<ANCHOR id ="XMLSECTRANSFORMIDSGET" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDSGET">
-<ANCHOR id ="XMLSECTRANSFORMIDSINIT" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDSINIT">
-<ANCHOR id ="XMLSECTRANSFORMIDSSHUTDOWN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDSSHUTDOWN">
-<ANCHOR id ="XMLSECTRANSFORMIDSREGISTERDEFAULT" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTERDEFAULT">
-<ANCHOR id ="XMLSECTRANSFORMIDSREGISTER" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTER">
-<ANCHOR id ="XMLSECTRANSFORMSTATUS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">
-<ANCHOR id ="XMLSECTRANSFORMMODE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMMODE">
-<ANCHOR id ="XMLSECTRANSFORMOPERATION" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">
-<ANCHOR id ="XMLSECTRANSFORMURITYPE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">
-<ANCHOR id ="XMLSECTRANSFORMURITYPENONE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPENONE">
-<ANCHOR id ="XMLSECTRANSFORMURITYPEEMPTY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPEEMPTY">
-<ANCHOR id ="XMLSECTRANSFORMURITYPESAMEDOCUMENT" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPESAMEDOCUMENT">
-<ANCHOR id ="XMLSECTRANSFORMURITYPELOCAL" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPELOCAL">
-<ANCHOR id ="XMLSECTRANSFORMURITYPEREMOTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPEREMOTE">
-<ANCHOR id ="XMLSECTRANSFORMURITYPEANY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPEANY">
-<ANCHOR id ="XMLSECTRANSFORMURITYPECHECK" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMURITYPECHECK">
-<ANCHOR id ="XMLSECTRANSFORMDATATYPE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">
-<ANCHOR id ="XMLSECTRANSFORMDATATYPEUNKNOWN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEUNKNOWN">
-<ANCHOR id ="XMLSECTRANSFORMDATATYPEBIN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEBIN">
-<ANCHOR id ="XMLSECTRANSFORMDATATYPEXML" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEXML">
-<ANCHOR id ="XMLSECTRANSFORMUSAGE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEUNKNOWN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEUNKNOWN">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEDSIGTRANSFORM" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDSIGTRANSFORM">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEC14NMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEC14NMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEDIGESTMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDIGESTMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMUSAGESIGNATUREMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGESIGNATUREMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMUSAGEANY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMUSAGEANY">
-<ANCHOR id ="XMLSECTRANSFORMCTXPREEXECUTECALLBACK" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">
-<ANCHOR id ="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS" href="xmlsec/xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">
-<ANCHOR id ="XMLSECTRANSFORMCTX" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTX">
-<ANCHOR id ="XMLSECTRANSFORMCTXCREATE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE">
-<ANCHOR id ="XMLSECTRANSFORMCTXDESTROY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">
-<ANCHOR id ="XMLSECTRANSFORMCTXINITIALIZE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">
-<ANCHOR id ="XMLSECTRANSFORMCTXFINALIZE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">
-<ANCHOR id ="XMLSECTRANSFORMCTXRESET" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXRESET">
-<ANCHOR id ="XMLSECTRANSFORMCTXCOPYUSERPREF" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXCOPYUSERPREF">
-<ANCHOR id ="XMLSECTRANSFORMCTXSETURI" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXSETURI">
-<ANCHOR id ="XMLSECTRANSFORMCTXAPPEND" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXAPPEND">
-<ANCHOR id ="XMLSECTRANSFORMCTXPREPEND" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPEND">
-<ANCHOR id ="XMLSECTRANSFORMCTXCREATEANDAPPEND" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDAPPEND">
-<ANCHOR id ="XMLSECTRANSFORMCTXCREATEANDPREPEND" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDPREPEND">
-<ANCHOR id ="XMLSECTRANSFORMCTXNODEREAD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">
-<ANCHOR id ="XMLSECTRANSFORMCTXNODESLISTREAD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXNODESLISTREAD">
-<ANCHOR id ="XMLSECTRANSFORMCTXPREPARE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPARE">
-<ANCHOR id ="XMLSECTRANSFORMCTXBINARYEXECUTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXBINARYEXECUTE">
-<ANCHOR id ="XMLSECTRANSFORMCTXURIEXECUTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXURIEXECUTE">
-<ANCHOR id ="XMLSECTRANSFORMCTXXMLEXECUTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXXMLEXECUTE">
-<ANCHOR id ="XMLSECTRANSFORMCTXEXECUTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">
-<ANCHOR id ="XMLSECTRANSFORMCTXDEBUGDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGDUMP">
-<ANCHOR id ="XMLSECTRANSFORMCTXDEBUGXMLDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECTRANSFORM" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORM">
-<ANCHOR id ="XMLSECTRANSFORMCREATE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCREATE">
-<ANCHOR id ="XMLSECTRANSFORMDESTROY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDESTROY">
-<ANCHOR id ="XMLSECTRANSFORMNODEREAD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMNODEREAD">
-<ANCHOR id ="XMLSECTRANSFORMPUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPUMP">
-<ANCHOR id ="XMLSECTRANSFORMSETKEY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMSETKEY">
-<ANCHOR id ="XMLSECTRANSFORMSETKEYREQ" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQ">
-<ANCHOR id ="XMLSECTRANSFORMVERIFY" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVERIFY">
-<ANCHOR id ="XMLSECTRANSFORMVERIFYNODECONTENT" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVERIFYNODECONTENT">
-<ANCHOR id ="XMLSECTRANSFORMGETDATATYPE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPE">
-<ANCHOR id ="XMLSECTRANSFORMPUSHBIN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPUSHBIN">
-<ANCHOR id ="XMLSECTRANSFORMPOPBIN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPOPBIN">
-<ANCHOR id ="XMLSECTRANSFORMPUSHXML" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPUSHXML">
-<ANCHOR id ="XMLSECTRANSFORMPOPXML" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPOPXML">
-<ANCHOR id ="XMLSECTRANSFORMEXECUTE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXECUTE">
-<ANCHOR id ="XMLSECTRANSFORMDEBUGDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEBUGDUMP">
-<ANCHOR id ="XMLSECTRANSFORMDEBUGXMLDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECTRANSFORMGETNAME" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMGETNAME">
-<ANCHOR id ="XMLSECTRANSFORMISVALID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMISVALID">
-<ANCHOR id ="XMLSECTRANSFORMCHECKTYPE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">
-<ANCHOR id ="XMLSECTRANSFORMCHECKID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">
-<ANCHOR id ="XMLSECTRANSFORMCHECKSIZE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">
-<ANCHOR id ="XMLSECTRANSFORMCONNECT" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCONNECT">
-<ANCHOR id ="XMLSECTRANSFORMREMOVE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMREMOVE">
-<ANCHOR id ="XMLSECTRANSFORMDEFAULTGETDATATYPE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTGETDATATYPE">
-<ANCHOR id ="XMLSECTRANSFORMDEFAULTPUSHBIN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHBIN">
-<ANCHOR id ="XMLSECTRANSFORMDEFAULTPOPBIN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPBIN">
-<ANCHOR id ="XMLSECTRANSFORMDEFAULTPUSHXML" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHXML">
-<ANCHOR id ="XMLSECTRANSFORMDEFAULTPOPXML" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPXML">
-<ANCHOR id ="XMLSECTRANSFORMCREATEOUTPUTBUFFER" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCREATEOUTPUTBUFFER">
-<ANCHOR id ="XMLSECTRANSFORMCREATEINPUTBUFFER" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMCREATEINPUTBUFFER">
-<ANCHOR id ="XMLSECTRANSFORMINITIALIZEMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMFINALIZEMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMGETDATATYPEMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMNODEREADMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMNODEWRITEMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMSETKEYMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMVERIFYMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMPUSHBINMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMPOPBINMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMPUSHXMLMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMPOPXMLMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMEXECUTEMETHOD" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">
-<ANCHOR id ="XMLSECTRANSFORMKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMKLASS">
-<ANCHOR id ="XMLSECTRANSFORMKLASSGETNAME" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMKLASSGETNAME">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTID">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTFIND" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFIND">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTFINDBYHREF" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYHREF">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTFINDBYNAME" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYNAME">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTDEBUGDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGDUMP">
-<ANCHOR id ="XMLSECTRANSFORMIDLISTDEBUGXMLDUMP" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECTRANSFORMIDUNKNOWN" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMIDUNKNOWN">
-<ANCHOR id ="XMLSECTRANSFORMBASE64ID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMBASE64ID">
-<ANCHOR id ="XMLSECTRANSFORMBASE64GETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMBASE64SETLINESIZE" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14NID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NID">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14NGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14NWITHCOMMENTSID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSID">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14N11ID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11ID">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14N11GETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID">
-<ANCHOR id ="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMEXCLC14NID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NID">
-<ANCHOR id ="XMLSECTRANSFORMEXCLC14NGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID">
-<ANCHOR id ="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMENVELOPEDID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDID">
-<ANCHOR id ="XMLSECTRANSFORMENVELOPEDGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMXPATHID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPATHID">
-<ANCHOR id ="XMLSECTRANSFORMXPATHGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPATHGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMXPATH2ID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPATH2ID">
-<ANCHOR id ="XMLSECTRANSFORMXPATH2GETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPATH2GETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMXPOINTERID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERID">
-<ANCHOR id ="XMLSECTRANSFORMXPOINTERGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMXPOINTERSETEXPR" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">
-<ANCHOR id ="XMLSECTRANSFORMXSLTID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXSLTID">
-<ANCHOR id ="XMLSECTRANSFORMXSLTGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMREMOVEXMLTAGSC14NID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NID">
-<ANCHOR id ="XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMVISA3DHACKID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKID">
-<ANCHOR id ="XMLSECTRANSFORMVISA3DHACKGETKLASS" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKGETKLASS">
-<ANCHOR id ="XMLSECTRANSFORMVISA3DHACKSETID" href="xmlsec/xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKSETID">
-<ANCHOR id ="XMLSEC-VERSION" href="xmlsec/xmlsec-version.html">
-<ANCHOR id ="XMLSEC-VERSION-CAPS" href="xmlsec/xmlsec-version.html#XMLSEC-VERSION-CAPS">
-<ANCHOR id ="XMLSEC-VERSION-MAJOR-CAPS" href="xmlsec/xmlsec-version.html#XMLSEC-VERSION-MAJOR-CAPS">
-<ANCHOR id ="XMLSEC-VERSION-MINOR-CAPS" href="xmlsec/xmlsec-version.html#XMLSEC-VERSION-MINOR-CAPS">
-<ANCHOR id ="XMLSEC-VERSION-SUBMINOR-CAPS" href="xmlsec/xmlsec-version.html#XMLSEC-VERSION-SUBMINOR-CAPS">
-<ANCHOR id ="XMLSEC-VERSION-INFO-CAPS" href="xmlsec/xmlsec-version.html#XMLSEC-VERSION-INFO-CAPS">
-<ANCHOR id ="XMLSEC-XMLDSIG" href="xmlsec/xmlsec-xmldsig.html">
-<ANCHOR id ="XMLSECDSIGSTATUS" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGSTATUS">
-<ANCHOR id ="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS" href="xmlsec/xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">
-<ANCHOR id ="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS" href="xmlsec/xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">
-<ANCHOR id ="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS" href="xmlsec/xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">
-<ANCHOR id ="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS" href="xmlsec/xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">
-<ANCHOR id ="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS" href="xmlsec/xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">
-<ANCHOR id ="XMLSECDSIGCTX" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTX">
-<ANCHOR id ="XMLSECDSIGCTXCREATE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE">
-<ANCHOR id ="XMLSECDSIGCTXDESTROY" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY">
-<ANCHOR id ="XMLSECDSIGCTXINITIALIZE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE">
-<ANCHOR id ="XMLSECDSIGCTXFINALIZE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE">
-<ANCHOR id ="XMLSECDSIGCTXSIGN" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">
-<ANCHOR id ="XMLSECDSIGCTXVERIFY" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">
-<ANCHOR id ="XMLSECDSIGCTXENABLEREFERENCETRANSFORM" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXENABLEREFERENCETRANSFORM">
-<ANCHOR id ="XMLSECDSIGCTXENABLESIGNATURETRANSFORM" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXENABLESIGNATURETRANSFORM">
-<ANCHOR id ="XMLSECDSIGCTXGETPRESIGNBUFFER" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXGETPRESIGNBUFFER">
-<ANCHOR id ="XMLSECDSIGCTXDEBUGDUMP" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGDUMP">
-<ANCHOR id ="XMLSECDSIGCTXDEBUGXMLDUMP" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECDSIGREFERENCEORIGIN" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">
-<ANCHOR id ="XMLSECDSIGREFERENCECTX" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXCREATE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXDESTROY" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXINITIALIZE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXFINALIZE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXPROCESSNODE" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXPROCESSNODE">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXDEBUGDUMP" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXDEBUGXMLDUMP" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXLISTID" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTID">
-<ANCHOR id ="XMLSECDSIGREFERENCECTXLISTGETKLASS" href="xmlsec/xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTGETKLASS">
-<ANCHOR id ="XMLSEC-XMLENC" href="xmlsec/xmlsec-xmlenc.html">
-<ANCHOR id ="XMLENCCTXMODE" href="xmlsec/xmlsec-xmlenc.html#XMLENCCTXMODE">
-<ANCHOR id ="XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS" href="xmlsec/xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS">
-<ANCHOR id ="XMLSECENCCTX" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTX">
-<ANCHOR id ="XMLSECENCCTXCREATE" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXCREATE">
-<ANCHOR id ="XMLSECENCCTXDESTROY" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXDESTROY">
-<ANCHOR id ="XMLSECENCCTXINITIALIZE" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXINITIALIZE">
-<ANCHOR id ="XMLSECENCCTXFINALIZE" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE">
-<ANCHOR id ="XMLSECENCCTXCOPYUSERPREF" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXCOPYUSERPREF">
-<ANCHOR id ="XMLSECENCCTXRESET" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXRESET">
-<ANCHOR id ="XMLSECENCCTXBINARYENCRYPT" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXBINARYENCRYPT">
-<ANCHOR id ="XMLSECENCCTXXMLENCRYPT" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">
-<ANCHOR id ="XMLSECENCCTXURIENCRYPT" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">
-<ANCHOR id ="XMLSECENCCTXDECRYPT" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXDECRYPT">
-<ANCHOR id ="XMLSECENCCTXDECRYPTTOBUFFER" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXDECRYPTTOBUFFER">
-<ANCHOR id ="XMLSECENCCTXDEBUGDUMP" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXDEBUGDUMP">
-<ANCHOR id ="XMLSECENCCTXDEBUGXMLDUMP" href="xmlsec/xmlsec-xmlenc.html#XMLSECENCCTXDEBUGXMLDUMP">
-<ANCHOR id ="XMLSEC-XMLSEC" href="xmlsec/xmlsec-xmlsec.html">
-<ANCHOR id ="XMLSECPTR" href="xmlsec/xmlsec-xmlsec.html#XMLSECPTR">
-<ANCHOR id ="XMLSECSIZE" href="xmlsec/xmlsec-xmlsec.html#XMLSECSIZE">
-<ANCHOR id ="XMLSECBYTE" href="xmlsec/xmlsec-xmlsec.html#XMLSECBYTE">
-<ANCHOR id ="XMLSECINIT" href="xmlsec/xmlsec-xmlsec.html#XMLSECINIT">
-<ANCHOR id ="XMLSECSHUTDOWN" href="xmlsec/xmlsec-xmlsec.html#XMLSECSHUTDOWN">
-<ANCHOR id ="XMLSECCHECKVERSIONEXACT" href="xmlsec/xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXACT">
-<ANCHOR id ="XMLSECCHECKVERSION" href="xmlsec/xmlsec-xmlsec.html#XMLSECCHECKVERSION">
-<ANCHOR id ="XMLSECCHECKVERSIONMODE" href="xmlsec/xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">
-<ANCHOR id ="XMLSECCHECKVERSIONEXT" href="xmlsec/xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXT">
-<ANCHOR id ="ATTRIBUTE-UNUSED-CAPS" href="xmlsec/xmlsec-xmlsec.html#ATTRIBUTE-UNUSED-CAPS">
-<ANCHOR id ="XMLSEC-XMLTREE" href="xmlsec/xmlsec-xmltree.html">
-<ANCHOR id ="XMLSECNODEGETNAME" href="xmlsec/xmlsec-xmltree.html#XMLSECNODEGETNAME">
-<ANCHOR id ="XMLSECGETNODENSHREF" href="xmlsec/xmlsec-xmltree.html#XMLSECGETNODENSHREF">
-<ANCHOR id ="XMLSECCHECKNODENAME" href="xmlsec/xmlsec-xmltree.html#XMLSECCHECKNODENAME">
-<ANCHOR id ="XMLSECGETNEXTELEMENTNODE" href="xmlsec/xmlsec-xmltree.html#XMLSECGETNEXTELEMENTNODE">
-<ANCHOR id ="XMLSECFINDCHILD" href="xmlsec/xmlsec-xmltree.html#XMLSECFINDCHILD">
-<ANCHOR id ="XMLSECFINDPARENT" href="xmlsec/xmlsec-xmltree.html#XMLSECFINDPARENT">
-<ANCHOR id ="XMLSECFINDNODE" href="xmlsec/xmlsec-xmltree.html#XMLSECFINDNODE">
-<ANCHOR id ="XMLSECADDCHILD" href="xmlsec/xmlsec-xmltree.html#XMLSECADDCHILD">
-<ANCHOR id ="XMLSECADDCHILDNODE" href="xmlsec/xmlsec-xmltree.html#XMLSECADDCHILDNODE">
-<ANCHOR id ="XMLSECADDNEXTSIBLING" href="xmlsec/xmlsec-xmltree.html#XMLSECADDNEXTSIBLING">
-<ANCHOR id ="XMLSECADDPREVSIBLING" href="xmlsec/xmlsec-xmltree.html#XMLSECADDPREVSIBLING">
-<ANCHOR id ="XMLSECREPLACENODE" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACENODE">
-<ANCHOR id ="XMLSECREPLACENODEANDRETURN" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACENODEANDRETURN">
-<ANCHOR id ="XMLSECREPLACECONTENT" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACECONTENT">
-<ANCHOR id ="XMLSECREPLACECONTENTANDRETURN" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACECONTENTANDRETURN">
-<ANCHOR id ="XMLSECREPLACENODEBUFFER" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACENODEBUFFER">
-<ANCHOR id ="XMLSECREPLACENODEBUFFERANDRETURN" href="xmlsec/xmlsec-xmltree.html#XMLSECREPLACENODEBUFFERANDRETURN">
-<ANCHOR id ="XMLSECNODEENCODEANDSETCONTENT" href="xmlsec/xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">
-<ANCHOR id ="XMLSECADDIDS" href="xmlsec/xmlsec-xmltree.html#XMLSECADDIDS">
-<ANCHOR id ="XMLSECGENERATEANDADDID" href="xmlsec/xmlsec-xmltree.html#XMLSECGENERATEANDADDID">
-<ANCHOR id ="XMLSECGENERATEID" href="xmlsec/xmlsec-xmltree.html#XMLSECGENERATEID">
-<ANCHOR id ="XMLSECCREATETREE" href="xmlsec/xmlsec-xmltree.html#XMLSECCREATETREE">
-<ANCHOR id ="XMLSECISEMPTYNODE" href="xmlsec/xmlsec-xmltree.html#XMLSECISEMPTYNODE">
-<ANCHOR id ="XMLSECISEMPTYSTRING" href="xmlsec/xmlsec-xmltree.html#XMLSECISEMPTYSTRING">
-<ANCHOR id ="XMLSECGETQNAME" href="xmlsec/xmlsec-xmltree.html#XMLSECGETQNAME">
-<ANCHOR id ="XMLSECISHEX" href="xmlsec/xmlsec-xmltree.html#XMLSECISHEX">
-<ANCHOR id ="XMLSECGETHEX" href="xmlsec/xmlsec-xmltree.html#XMLSECGETHEX">
-<ANCHOR id ="XMLSECQNAME2INTEGERINFOCONSTPTR" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERINFOCONSTPTR">
-<ANCHOR id ="XMLSECQNAME2INTEGERINFO" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERINFO">
-<ANCHOR id ="XMLSECQNAME2INTEGERGETINFO" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINFO">
-<ANCHOR id ="XMLSECQNAME2INTEGERGETINTEGER" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGER">
-<ANCHOR id ="XMLSECQNAME2INTEGERGETINTEGERFROMSTRING" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGERFROMSTRING">
-<ANCHOR id ="XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER">
-<ANCHOR id ="XMLSECQNAME2INTEGERNODEREAD" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEREAD">
-<ANCHOR id ="XMLSECQNAME2INTEGERNODEWRITE" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEWRITE">
-<ANCHOR id ="XMLSECQNAME2INTEGERATTRIBUTEREAD" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEREAD">
-<ANCHOR id ="XMLSECQNAME2INTEGERATTRIBUTEWRITE" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEWRITE">
-<ANCHOR id ="XMLSECQNAME2INTEGERDEBUGDUMP" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGDUMP">
-<ANCHOR id ="XMLSECQNAME2INTEGERDEBUGXMLDUMP" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGXMLDUMP">
-<ANCHOR id ="XMLSECBITMASK" href="xmlsec/xmlsec-xmltree.html#XMLSECBITMASK">
-<ANCHOR id ="XMLSECQNAME2BITMASKINFOCONSTPTR" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFOCONSTPTR">
-<ANCHOR id ="XMLSECQNAME2BITMASKINFO" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">
-<ANCHOR id ="XMLSECQNAME2BITMASKGETINFO" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETINFO">
-<ANCHOR id ="XMLSECQNAME2BITMASKGETBITMASK" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASK">
-<ANCHOR id ="XMLSECQNAME2BITMASKNODESREAD" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESREAD">
-<ANCHOR id ="XMLSECQNAME2BITMASKGETBITMASKFROMSTRING" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">
-<ANCHOR id ="XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK">
-<ANCHOR id ="XMLSECQNAME2BITMASKNODESWRITE" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESWRITE">
-<ANCHOR id ="XMLSECQNAME2BITMASKDEBUGDUMP" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">
-<ANCHOR id ="XMLSECQNAME2BITMASKDEBUGXMLDUMP" href="xmlsec/xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">
-<ANCHOR id ="XMLSEC-X509" href="xmlsec/xmlsec-x509.html">
-<ANCHOR id ="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">
-<ANCHOR id ="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">
-<ANCHOR id ="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">
-<ANCHOR id ="XMLSEC-X509DATA-SKI-NODE-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE-CAPS">
-<ANCHOR id ="XMLSEC-X509DATA-CRL-NODE-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE-CAPS">
-<ANCHOR id ="XMLSEC-X509DATA-DEFAULT-CAPS" href="xmlsec/xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT-CAPS">
-<ANCHOR id ="XMLSECX509DATAGETNODECONTENT" href="xmlsec/xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">
-<ANCHOR id ="XMLSEC-OPENSSL-APP" href="xmlsec/xmlsec-openssl-app.html">
-<ANCHOR id ="XMLSECOPENSSLAPPINIT" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">
-<ANCHOR id ="XMLSECOPENSSLAPPSHUTDOWN" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">
-<ANCHOR id ="XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT">
-<ANCHOR id ="XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY">
-<ANCHOR id ="XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">
-<ANCHOR id ="XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYSMNGRCERTLOAD" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYLOAD" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYLOADMEMORY" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADMEMORY">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYLOADBIO" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADBIO">
-<ANCHOR id ="XMLSECOPENSSLAPPPKCS12LOAD" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">
-<ANCHOR id ="XMLSECOPENSSLAPPPKCS12LOADMEMORY" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADMEMORY">
-<ANCHOR id ="XMLSECOPENSSLAPPPKCS12LOADBIO" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADBIO">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYCERTLOAD" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYCERTLOADMEMORY" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADMEMORY">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYCERTLOADBIO" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADBIO">
-<ANCHOR id ="XMLSECOPENSSLAPPKEYFROMCERTLOADBIO" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYFROMCERTLOADBIO">
-<ANCHOR id ="XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK" href="xmlsec/xmlsec-openssl-app.html#XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK">
-<ANCHOR id ="XMLSEC-OPENSSL-BN" href="xmlsec/xmlsec-openssl-bn.html">
-<ANCHOR id ="XMLSECOPENSSLNODEGETBNVALUE" href="xmlsec/xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">
-<ANCHOR id ="XMLSECOPENSSLNODESETBNVALUE" href="xmlsec/xmlsec-openssl-bn.html#XMLSECOPENSSLNODESETBNVALUE">
-<ANCHOR id ="XMLSEC-OPENSSL-CRYPTO" href="xmlsec/xmlsec-openssl-crypto.html">
-<ANCHOR id ="XMLSEC-NO-SHA224-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-NO-SHA224-CAPS">
-<ANCHOR id ="XMLSEC-NO-SHA256-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-NO-SHA256-CAPS">
-<ANCHOR id ="XMLSEC-NO-SHA384-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-NO-SHA384-CAPS">
-<ANCHOR id ="XMLSEC-NO-SHA512-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-NO-SHA512-CAPS">
-<ANCHOR id ="XMLSEC-NO-AES-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-NO-AES-CAPS">
-<ANCHOR id ="XMLSECCRYPTOGETFUNCTIONS-OPENSSL" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">
-<ANCHOR id ="XMLSECOPENSSLINIT" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLINIT">
-<ANCHOR id ="XMLSECOPENSSLSHUTDOWN" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLSHUTDOWN">
-<ANCHOR id ="XMLSECOPENSSLKEYSMNGRINIT" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYSMNGRINIT">
-<ANCHOR id ="XMLSECOPENSSLGENERATERANDOM" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLGENERATERANDOM">
-<ANCHOR id ="XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER">
-<ANCHOR id ="XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAAESID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAAESGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAAESSET" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESSET">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES128CBCID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES192CBCID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES256CBCID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES128ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES128GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES192ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES192GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES256ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWAES256GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADESID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADESGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADESSET" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESSET">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMDES3CBCID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWDES3ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMKWDES3GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAADOPTDSA" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTDSA">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAGETDSA" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETDSA">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAADOPTEVP" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTEVP">
-<ANCHOR id ="XMLSECOPENSSLKEYDATADSAGETEVP" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETEVP">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMDSASHA1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLHMACGETMINOUTPUTLENGTH" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACGETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECOPENSSLHMACSETMINOUTPUTLENGTH" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACSETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAHMACID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAHMACGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAHMACSET" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACSET">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACMD5ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA224ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA256ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA384ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA512ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMMD5ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMMD5GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRIPEMD160ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAADOPTRSA" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTRSA">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAGETRSA" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETRSA">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAADOPTEVP" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTEVP">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARSAGETEVP" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETEVP">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAMD5ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSARIPEMD160ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA224ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA256ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA384ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA512ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAPKCS1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAOAEPID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA1ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA1GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA224ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA224GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA256ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA256GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA384ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA384GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA512ID" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512ID">
-<ANCHOR id ="XMLSECOPENSSLTRANSFORMSHA512GETKLASS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512GETKLASS">
-<ANCHOR id ="XMLSEC-OPENSSL-ERRORS-LIB-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB-CAPS">
-<ANCHOR id ="XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS" href="xmlsec/xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">
-<ANCHOR id ="XMLSECOPENSSLERRORSDEFAULTCALLBACK" href="xmlsec/xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">
-<ANCHOR id ="XMLSEC-OPENSSL-EVP" href="xmlsec/xmlsec-openssl-evp.html">
-<ANCHOR id ="XMLSECOPENSSLEVPKEYDATAADOPTEVP" href="xmlsec/xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">
-<ANCHOR id ="XMLSECOPENSSLEVPKEYDATAGETEVP" href="xmlsec/xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">
-<ANCHOR id ="XMLSECOPENSSLEVPKEYDUP" href="xmlsec/xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDUP">
-<ANCHOR id ="XMLSECOPENSSLEVPKEYADOPT" href="xmlsec/xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">
-<ANCHOR id ="XMLSEC-OPENSSL-X509" href="xmlsec/xmlsec-openssl-x509.html">
-<ANCHOR id ="XMLSEC-STACK-OF-X509-CAPS" href="xmlsec/xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CAPS">
-<ANCHOR id ="XMLSEC-STACK-OF-X509-CRL-CAPS" href="xmlsec/xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL-CAPS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509ID" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETKLASS" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKLASS">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETKEYCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKEYCERT">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509ADOPTCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCERT">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERT">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETCERTSSIZE" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERTSSIZE">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509ADOPTCRL" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCRL">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETCRL" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRL">
-<ANCHOR id ="XMLSECOPENSSLKEYDATAX509GETCRLSSIZE" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRLSSIZE">
-<ANCHOR id ="XMLSECOPENSSLX509CERTGETKEY" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509CERTGETKEY">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARAWX509CERTID" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTID">
-<ANCHOR id ="XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLX509STOREID" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREID">
-<ANCHOR id ="XMLSECOPENSSLX509STOREGETKLASS" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREGETKLASS">
-<ANCHOR id ="XMLSECOPENSSLX509STOREFINDCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREFINDCERT">
-<ANCHOR id ="XMLSECOPENSSLX509STOREVERIFY" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREVERIFY">
-<ANCHOR id ="XMLSECOPENSSLX509STOREADOPTCERT" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCERT">
-<ANCHOR id ="XMLSECOPENSSLX509STOREADOPTCRL" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCRL">
-<ANCHOR id ="XMLSECOPENSSLX509STOREADDCERTSPATH" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSPATH">
-<ANCHOR id ="XMLSECOPENSSLX509STOREADDCERTSFILE" href="xmlsec/xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSFILE">
-<ANCHOR id ="XMLSEC-GNUTLS-APP" href="xmlsec/xmlsec-gnutls-app.html">
-<ANCHOR id ="XMLSECGNUTLSAPPINIT" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPINIT">
-<ANCHOR id ="XMLSECGNUTLSAPPSHUTDOWN" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPSHUTDOWN">
-<ANCHOR id ="XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT">
-<ANCHOR id ="XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY">
-<ANCHOR id ="XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD">
-<ANCHOR id ="XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYSMNGRCERTLOAD" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOAD">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYLOAD" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOAD">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYLOADMEMORY" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOADMEMORY">
-<ANCHOR id ="XMLSECGNUTLSAPPPKCS12LOAD" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOAD">
-<ANCHOR id ="XMLSECGNUTLSAPPPKCS12LOADMEMORY" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOADMEMORY">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYCERTLOAD" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOAD">
-<ANCHOR id ="XMLSECGNUTLSAPPKEYCERTLOADMEMORY" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOADMEMORY">
-<ANCHOR id ="XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK" href="xmlsec/xmlsec-gnutls-app.html#XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK">
-<ANCHOR id ="XMLSEC-GNUTLS-CRYPTO" href="xmlsec/xmlsec-gnutls-crypto.html">
-<ANCHOR id ="XMLSECCRYPTOGETFUNCTIONS-GNUTLS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">
-<ANCHOR id ="XMLSECGNUTLSINIT" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSINIT">
-<ANCHOR id ="XMLSECGNUTLSSHUTDOWN" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">
-<ANCHOR id ="XMLSECGNUTLSKEYSMNGRINIT" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">
-<ANCHOR id ="XMLSECGNUTLSGENERATERANDOM" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSGENERATERANDOM">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAAESID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESID">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAAESGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAAESSET" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESSET">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES128CBCID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES192CBCID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES256CBCID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSKEYDATADESID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESID">
-<ANCHOR id ="XMLSECGNUTLSKEYDATADESGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSKEYDATADESSET" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMDES3CBCID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSHMACGETMINOUTPUTLENGTH" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACGETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECGNUTLSHMACSETMINOUTPUTLENGTH" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACSETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAHMACID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACID">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAHMACGETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">
-<ANCHOR id ="XMLSECGNUTLSKEYDATAHMACSET" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACMD5ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMSHA1ID" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1ID">
-<ANCHOR id ="XMLSECGNUTLSTRANSFORMSHA1GETKLASS" href="xmlsec/xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">
-<ANCHOR id ="XMLSEC-NSS-APP" href="xmlsec/xmlsec-nss-app.html">
-<ANCHOR id ="XMLSECNSSAPPINIT" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPINIT">
-<ANCHOR id ="XMLSECNSSAPPSHUTDOWN" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPSHUTDOWN">
-<ANCHOR id ="XMLSECNSSAPPDEFAULTKEYSMNGRINIT" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">
-<ANCHOR id ="XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">
-<ANCHOR id ="XMLSECNSSAPPDEFAULTKEYSMNGRLOAD" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">
-<ANCHOR id ="XMLSECNSSAPPDEFAULTKEYSMNGRSAVE" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRSAVE">
-<ANCHOR id ="XMLSECNSSAPPKEYSMNGRCERTLOAD" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOAD">
-<ANCHOR id ="XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY">
-<ANCHOR id ="XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM">
-<ANCHOR id ="XMLSECNSSAPPKEYLOAD" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYLOAD">
-<ANCHOR id ="XMLSECNSSAPPKEYLOADMEMORY" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADMEMORY">
-<ANCHOR id ="XMLSECNSSAPPKEYLOADSECITEM" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADSECITEM">
-<ANCHOR id ="XMLSECNSSAPPPKCS12LOAD" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOAD">
-<ANCHOR id ="XMLSECNSSAPPPKCS12LOADMEMORY" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADMEMORY">
-<ANCHOR id ="XMLSECNSSAPPPKCS12LOADSECITEM" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADSECITEM">
-<ANCHOR id ="XMLSECNSSAPPKEYCERTLOAD" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOAD">
-<ANCHOR id ="XMLSECNSSAPPKEYCERTLOADMEMORY" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADMEMORY">
-<ANCHOR id ="XMLSECNSSAPPKEYCERTLOADSECITEM" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADSECITEM">
-<ANCHOR id ="XMLSECNSSAPPKEYFROMCERTLOADSECITEM" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPKEYFROMCERTLOADSECITEM">
-<ANCHOR id ="XMLSECNSSAPPGETDEFAULTPWDCALLBACK" href="xmlsec/xmlsec-nss-app.html#XMLSECNSSAPPGETDEFAULTPWDCALLBACK">
-<ANCHOR id ="XMLSEC-NSS-BIGNUM" href="xmlsec/xmlsec-nss-bignum.html">
-<ANCHOR id ="XMLSECNSSNODEGETBIGNUMVALUE" href="xmlsec/xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">
-<ANCHOR id ="XMLSECNSSNODESETBIGNUMVALUE" href="xmlsec/xmlsec-nss-bignum.html#XMLSECNSSNODESETBIGNUMVALUE">
-<ANCHOR id ="XMLSEC-NSS-CRYPTO" href="xmlsec/xmlsec-nss-crypto.html">
-<ANCHOR id ="XMLSECCRYPTOGETFUNCTIONS-NSS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">
-<ANCHOR id ="XMLSECNSSINIT" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSINIT">
-<ANCHOR id ="XMLSECNSSSHUTDOWN" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSSHUTDOWN">
-<ANCHOR id ="XMLSECNSSKEYSMNGRINIT" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYSMNGRINIT">
-<ANCHOR id ="XMLSECNSSGENERATERANDOM" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSGENERATERANDOM">
-<ANCHOR id ="XMLSECNSSERRORSDEFAULTCALLBACK" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSERRORSDEFAULTCALLBACK">
-<ANCHOR id ="XMLSECNSSGETINTERNALKEYSLOT" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSGETINTERNALKEYSLOT">
-<ANCHOR id ="XMLSECNSSKEYDATAAESID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESID">
-<ANCHOR id ="XMLSECNSSKEYDATAAESGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESGETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATAAESSET" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESSET">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES128CBCID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCID">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES128CBCGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES192CBCID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCID">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES192CBCGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES256CBCID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCID">
-<ANCHOR id ="XMLSECNSSTRANSFORMAES256CBCGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES128ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES128GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES192ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES192GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES256ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWAES256GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256GETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATADESID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESID">
-<ANCHOR id ="XMLSECNSSKEYDATADESGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESGETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATADESSET" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESSET">
-<ANCHOR id ="XMLSECNSSTRANSFORMDES3CBCID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCID">
-<ANCHOR id ="XMLSECNSSTRANSFORMDES3CBCGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWDES3ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMKWDES3GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3GETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATADSAID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAID">
-<ANCHOR id ="XMLSECNSSKEYDATADSAGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMDSASHA1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMDSASHA1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1GETKLASS">
-<ANCHOR id ="XMLSECNSSHMACGETMINOUTPUTLENGTH" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSHMACGETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECNSSHMACSETMINOUTPUTLENGTH" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSHMACSETMINOUTPUTLENGTH">
-<ANCHOR id ="XMLSECNSSKEYDATAHMACID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACID">
-<ANCHOR id ="XMLSECNSSKEYDATAHMACGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACGETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATAHMACSET" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACSET">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACMD5ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACMD5GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACRIPEMD160ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACSHA1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMHMACSHA1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATARSAID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAID">
-<ANCHOR id ="XMLSECNSSKEYDATARSAGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSASHA1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSASHA1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSAPKCS1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSAPKCS1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1GETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSAOAEPID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPID">
-<ANCHOR id ="XMLSECNSSTRANSFORMRSAOAEPGETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPGETKLASS">
-<ANCHOR id ="XMLSECNSSTRANSFORMSHA1ID" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1ID">
-<ANCHOR id ="XMLSECNSSTRANSFORMSHA1GETKLASS" href="xmlsec/xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1GETKLASS">
-<ANCHOR id ="XMLSEC-NSS-KEYSSTORE" href="xmlsec/xmlsec-nss-keysstore.html">
-<ANCHOR id ="XMLSECNSSKEYSSTOREID" href="xmlsec/xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID">
-<ANCHOR id ="XMLSECNSSKEYSSTOREGETKLASS" href="xmlsec/xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREGETKLASS">
-<ANCHOR id ="XMLSECNSSKEYSSTOREADOPTKEY" href="xmlsec/xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREADOPTKEY">
-<ANCHOR id ="XMLSECNSSKEYSSTORELOAD" href="xmlsec/xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORELOAD">
-<ANCHOR id ="XMLSECNSSKEYSSTORESAVE" href="xmlsec/xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORESAVE">
-<ANCHOR id ="XMLSEC-NSS-PKIKEYS" href="xmlsec/xmlsec-nss-pkikeys.html">
-<ANCHOR id ="XMLSECNSSPKIADOPTKEY" href="xmlsec/xmlsec-nss-pkikeys.html#XMLSECNSSPKIADOPTKEY">
-<ANCHOR id ="XMLSECNSSPKIKEYDATAGETPUBKEY" href="xmlsec/xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPUBKEY">
-<ANCHOR id ="XMLSECNSSPKIKEYDATAGETPRIVKEY" href="xmlsec/xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPRIVKEY">
-<ANCHOR id ="XMLSECNSSPKIKEYDATAGETKEYTYPE" href="xmlsec/xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETKEYTYPE">
-<ANCHOR id ="XMLSECNSSPKIKEYDATADUPLICATE" href="xmlsec/xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATADUPLICATE">
-<ANCHOR id ="XMLSEC-NSS-X509" href="xmlsec/xmlsec-nss-x509.html">
-<ANCHOR id ="XMLSECNSSKEYDATAX509ID" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ID">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETKLASS" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKLASS">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETKEYCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKEYCERT">
-<ANCHOR id ="XMLSECNSSKEYDATAX509ADOPTKEYCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTKEYCERT">
-<ANCHOR id ="XMLSECNSSKEYDATAX509ADOPTCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCERT">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERT">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETCERTSSIZE" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERTSSIZE">
-<ANCHOR id ="XMLSECNSSKEYDATAX509ADOPTCRL" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCRL">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETCRL" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRL">
-<ANCHOR id ="XMLSECNSSKEYDATAX509GETCRLSSIZE" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRLSSIZE">
-<ANCHOR id ="XMLSECNSSX509CERTGETKEY" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509CERTGETKEY">
-<ANCHOR id ="XMLSECNSSKEYDATARAWX509CERTID" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTID">
-<ANCHOR id ="XMLSECNSSKEYDATARAWX509CERTGETKLASS" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTGETKLASS">
-<ANCHOR id ="XMLSECNSSX509STOREID" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509STOREID">
-<ANCHOR id ="XMLSECNSSX509STOREGETKLASS" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509STOREGETKLASS">
-<ANCHOR id ="XMLSECNSSX509STOREFINDCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509STOREFINDCERT">
-<ANCHOR id ="XMLSECNSSX509STOREVERIFY" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509STOREVERIFY">
-<ANCHOR id ="XMLSECNSSX509STOREADOPTCERT" href="xmlsec/xmlsec-nss-x509.html#XMLSECNSSX509STOREADOPTCERT">
-<ANCHOR id ="XMLSEC-MSCRYPTO-APP" href="xmlsec/xmlsec-mscrypto-app.html">
-<ANCHOR id ="XMLSECMSCRYPTOAPPINIT" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPINIT">
-<ANCHOR id ="XMLSECMSCRYPTOAPPSHUTDOWN" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPSHUTDOWN">
-<ANCHOR id ="XMLSECMSCRYPTOAPPGETCERTSTORENAME" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETCERTSTORENAME">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYLOADMEMORY" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOADMEMORY">
-<ANCHOR id ="XMLSECMSCRYPTOAPPPKCS12LOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPPKCS12LOADMEMORY" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOADMEMORY">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYCERTLOAD" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOAD">
-<ANCHOR id ="XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY">
-<ANCHOR id ="XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK" href="xmlsec/xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK">
-<ANCHOR id ="XMLSEC-MSCRYPTO-CERTKEYS" href="xmlsec/xmlsec-mscrypto-certkeys.html">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAGETCERT" href="xmlsec/xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETCERT">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAGETKEY" href="xmlsec/xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETKEY">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY" href="xmlsec/xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY">
-<ANCHOR id ="XMLSECMSCRYPTOCERTDUP" href="xmlsec/xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTDUP">
-<ANCHOR id ="XMLSECMSCRYPTOCERTADOPT" href="xmlsec/xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTADOPT">
-<ANCHOR id ="XMLSEC-MSCRYPTO-CRYPTO" href="xmlsec/xmlsec-mscrypto-crypto.html">
-<ANCHOR id ="XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">
-<ANCHOR id ="XMLSECMSCRYPTOINIT" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOINIT">
-<ANCHOR id ="XMLSECMSCRYPTOSHUTDOWN" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOSHUTDOWN">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSMNGRINIT" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYSMNGRINIT">
-<ANCHOR id ="XMLSECMSCRYPTOGENERATERANDOM" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOGENERATERANDOM">
-<ANCHOR id ="XMLSECMSCRYPTOERRORSDEFAULTCALLBACK" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOERRORSDEFAULTCALLBACK">
-<ANCHOR id ="XMLSECMSCRYPTOCERTSTRTONAME" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCERTSTRTONAME">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATADSAID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATADSAGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMDSASHA1ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAGOST2001ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001ID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATARSAID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATARSAGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMRSASHA1ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMSHA1ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAAESID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAAESGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAAESSET" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESSET">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES128CBCID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES192CBCID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES256CBCID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATADESID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATADESGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMDES3CBCID" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCID">
-<ANCHOR id ="XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS" href="xmlsec/xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS">
-<ANCHOR id ="XMLSEC-MSCRYPTO-KEYSSTORE" href="xmlsec/xmlsec-mscrypto-keysstore.html">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSSTOREID" href="xmlsec/xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSSTOREGETKLASS" href="xmlsec/xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSSTOREADOPTKEY" href="xmlsec/xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREADOPTKEY">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSSTORELOAD" href="xmlsec/xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORELOAD">
-<ANCHOR id ="XMLSECMSCRYPTOKEYSSTORESAVE" href="xmlsec/xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORESAVE">
-<ANCHOR id ="XMLSEC-MSCRYPTO-X509" href="xmlsec/xmlsec-mscrypto-x509.html">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509ID" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETKLASS" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETKEYCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKEYCERT">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509ADOPTCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCERT">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERT">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509ADOPTCRL" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCRL">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETCRL" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRL">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATARAWX509CERTID" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTID">
-<ANCHOR id ="XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREID" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREID">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREGETKLASS" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREFINDCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREFINDCERT">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREVERIFY" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREVERIFY">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREADOPTCERT" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTCERT">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREADOPTKEYSTORE" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTKEYSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE">
-<ANCHOR id ="XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS" href="xmlsec/xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS">
+<ANCHOR id ="XMLSEC-APP" href="xmlsec-app.html">
+<ANCHOR id ="XMLSEC-BASE64" href="xmlsec-base64.html">
+<ANCHOR id ="XMLSEC-BN" href="xmlsec-bn.html">
+<ANCHOR id ="XMLSEC-BUFFER" href="xmlsec-buffer.html">
+<ANCHOR id ="XMLSEC-DL" href="xmlsec-dl.html">
+<ANCHOR id ="XMLSEC-ERRORS" href="xmlsec-errors.html">
+<ANCHOR id ="XMLSEC-IO" href="xmlsec-io.html">
+<ANCHOR id ="XMLSEC-KEYINFO" href="xmlsec-keyinfo.html">
+<ANCHOR id ="XMLSEC-KEYSDATA" href="xmlsec-keysdata.html">
+<ANCHOR id ="XMLSEC-KEYS" href="xmlsec-keys.html">
+<ANCHOR id ="XMLSEC-KEYSMNGR" href="xmlsec-keysmngr.html">
+<ANCHOR id ="XMLSEC-LIST" href="xmlsec-list.html">
+<ANCHOR id ="XMLSEC-MEMBUF" href="xmlsec-membuf.html">
+<ANCHOR id ="XMLSEC-NODESET" href="xmlsec-nodeset.html">
+<ANCHOR id ="XMLSEC-PARSER" href="xmlsec-parser.html">
+<ANCHOR id ="XMLSEC-TEMPLATES" href="xmlsec-templates.html">
+<ANCHOR id ="XMLSEC-TRANSFORMS" href="xmlsec-transforms.html">
+<ANCHOR id ="XMLSEC-VERSION" href="xmlsec-version.html">
+<ANCHOR id ="XMLSEC-XMLDSIG" href="xmlsec-xmldsig.html">
+<ANCHOR id ="XMLSEC-XMLENC" href="xmlsec-xmlenc.html">
+<ANCHOR id ="XMLSEC-XMLSEC" href="xmlsec-xmlsec.html">
+<ANCHOR id ="XMLSEC-XMLTREE" href="xmlsec-xmltree.html">
+<ANCHOR id ="XMLSEC-X509" href="xmlsec-x509.html">
+<ANCHOR id ="XMLSEC-OPENSSL-APP" href="xmlsec-openssl-app.html">
+<ANCHOR id ="XMLSEC-OPENSSL-BN" href="xmlsec-openssl-bn.html">
+<ANCHOR id ="XMLSEC-OPENSSL-CRYPTO" href="xmlsec-openssl-crypto.html">
+<ANCHOR id ="XMLSEC-OPENSSL-EVP" href="xmlsec-openssl-evp.html">
+<ANCHOR id ="XMLSEC-OPENSSL-X509" href="xmlsec-openssl-x509.html">
+<ANCHOR id ="XMLSEC-GNUTLS-APP" href="xmlsec-gnutls-app.html">
+<ANCHOR id ="XMLSEC-GNUTLS-CRYPTO" href="xmlsec-gnutls-crypto.html">
+<ANCHOR id ="XMLSEC-NSS-APP" href="xmlsec-nss-app.html">
+<ANCHOR id ="XMLSEC-NSS-BIGNUM" href="xmlsec-nss-bignum.html">
+<ANCHOR id ="XMLSEC-NSS-CRYPTO" href="xmlsec-nss-crypto.html">
+<ANCHOR id ="XMLSEC-NSS-KEYSSTORE" href="xmlsec-nss-keysstore.html">
+<ANCHOR id ="XMLSEC-NSS-PKIKEYS" href="xmlsec-nss-pkikeys.html">
+<ANCHOR id ="XMLSEC-NSS-X509" href="xmlsec-nss-x509.html">
+<ANCHOR id ="XMLSEC-MSCRYPTO-APP" href="xmlsec-mscrypto-app.html">
+<ANCHOR id ="XMLSEC-MSCRYPTO-CERTKEYS" href="xmlsec-mscrypto-certkeys.html">
+<ANCHOR id ="XMLSEC-MSCRYPTO-CRYPTO" href="xmlsec-mscrypto-crypto.html">
+<ANCHOR id ="XMLSEC-MSCRYPTO-KEYSSTORE" href="xmlsec-mscrypto-keysstore.html">
+<ANCHOR id ="XMLSEC-MSCRYPTO-X509" href="xmlsec-mscrypto-x509.html">
diff --git a/docs/api/left.png b/docs/api/left.png
index 2d05b3d..b3b7b56 100644
Binary files a/docs/api/left.png and b/docs/api/left.png differ
diff --git a/docs/api/right.png b/docs/api/right.png
index 92832e3..52df444 100644
Binary files a/docs/api/right.png and b/docs/api/right.png differ
diff --git a/docs/api/sgml/app.sgml b/docs/api/sgml/app.sgml
index 9dbb1fa..2003141 100644
--- a/docs/api/sgml/app.sgml
+++ b/docs/api/sgml/app.sgml
@@ -1,201 +1,160 @@
 <refentry id="xmlsec-app">
 <refmeta>
-<refentrytitle>app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>app</refname><refpurpose>Crypto-engine independent application support function.</refpurpose>
+<refname>app</refname>
+<refpurpose>Crypto-engine independent application support function.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-app.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoInit">xmlSecCryptoInit</link>                (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoShutdown">xmlSecCryptoShutdown</link>            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-#define     <link linkend="xmlSecKeyDataAesId">xmlSecKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</link>    (void);
-#define     <link linkend="xmlSecKeyDataDesId">xmlSecKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</link>    (void);
-#define     <link linkend="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</link>    (void);
-#define     <link linkend="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</link>   (void);
-#define     <link linkend="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</link>    (void);
-#define     <link linkend="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</link>   (void);
-#define     <link linkend="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecX509StoreId">xmlSecX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> <link linkend="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformGost2001GostR3411-94Id">xmlSecTransformGost2001GostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformMd5Id">xmlSecTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformGostR3411-94Id">xmlSecTransformGostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformGostR3411-94GetKlass">xmlSecTransformGostR3411_94GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformSha1Id">xmlSecTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformSha224Id">xmlSecTransformSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformSha256Id">xmlSecTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformSha384Id">xmlSecTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformSha512Id">xmlSecTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppInit">xmlSecCryptoAppInit</link>             (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</link>         (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</link>         (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</link>   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</link>      (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</link>
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</link>
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*       <link linkend="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoInit">xmlSecCryptoInit</link>                    (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoShutdown">xmlSecCryptoShutdown</link>                (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</link>            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+#define             <link linkend="xmlSecKeyDataAesId">xmlSecKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</link>            (void);
+#define             <link linkend="xmlSecKeyDataDesId">xmlSecKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</link>            (void);
+#define             <link linkend="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</link>            (void);
+#define             <link linkend="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</link>       (void);
+#define             <link linkend="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</link>           (void);
+#define             <link linkend="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</link>            (void);
+#define             <link linkend="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</link>           (void);
+#define             <link linkend="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</link>    (void);
+#define             <link linkend="xmlSecX509StoreId">xmlSecX509StoreId</link>
+<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</link>           (void);
+#define             <link linkend="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</link>      (void);
+#define             <link linkend="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</link>      (void);
+#define             <link linkend="xmlSecTransformGost2001GostR3411-94Id">xmlSecTransformGost2001GostR3411_94Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</link>      (void);
+#define             <link linkend="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</link>   (void);
+#define             <link linkend="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</link>   (void);
+#define             <link linkend="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</link>   (void);
+#define             <link linkend="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</link>   (void);
+#define             <link linkend="xmlSecTransformMd5Id">xmlSecTransformMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</link>          (void);
+#define             <link linkend="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</link> (void);
+#define             <link linkend="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</link>      (void);
+#define             <link linkend="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</link>      (void);
+#define             <link linkend="xmlSecTransformGostR3411-94Id">xmlSecTransformGostR3411_94Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformGostR3411-94GetKlass">xmlSecTransformGostR3411_94GetKlass</link> (void);
+#define             <link linkend="xmlSecTransformSha1Id">xmlSecTransformSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</link>         (void);
+#define             <link linkend="xmlSecTransformSha224Id">xmlSecTransformSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformSha256Id">xmlSecTransformSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformSha384Id">xmlSecTransformSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformSha512Id">xmlSecTransformSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</link>       (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppInit">xmlSecCryptoAppInit</link>                 (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</link>             (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</link>              (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</link>           (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</link>     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="void">void</link>*               <link linkend="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</link>
+                                                        (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -207,1385 +166,1244 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-app.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto-engine application support function used by xmlsec command line utility.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoInit">xmlSecCryptoInit ()</title>
-<indexterm><primary>xmlSecCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoInit                (void);</programlisting>
+<refsect1 id="xmlsec-app.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoInit" role="function">
+<title>xmlSecCryptoInit ()</title>
+<indexterm zone="xmlSecCryptoInit"><primary sortas="xmlSecCryptoInit">xmlSecCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoInit                    (void);</programlisting>
 <para>
 XMLSec library specific crypto engine initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoShutdown">xmlSecCryptoShutdown ()</title>
-<indexterm><primary>xmlSecCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoShutdown            (void);</programlisting>
+<refsect2 id="xmlSecCryptoShutdown" role="function">
+<title>xmlSecCryptoShutdown ()</title>
+<indexterm zone="xmlSecCryptoShutdown"><primary sortas="xmlSecCryptoShutdown">xmlSecCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoShutdown                (void);</programlisting>
 <para>
 XMLSec library specific crypto engine shutdown.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit ()</title>
-<indexterm><primary>xmlSecCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoKeysMngrInit        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecCryptoKeysMngrInit" role="function">
+<title>xmlSecCryptoKeysMngrInit ()</title>
+<indexterm zone="xmlSecCryptoKeysMngrInit"><primary sortas="xmlSecCryptoKeysMngrInit">xmlSecCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoKeysMngrInit            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Adds crypto specific key data stores in keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataAesId">xmlSecKeyDataAesId</title>
-<indexterm><primary>xmlSecKeyDataAesId</primary></indexterm><programlisting>#define xmlSecKeyDataAesId			xmlSecKeyDataAesGetKlass()
+<refsect2 id="xmlSecKeyDataAesId" role="macro">
+<title>xmlSecKeyDataAesId</title>
+<indexterm zone="xmlSecKeyDataAesId"><primary sortas="xmlSecKeyDataAesId">xmlSecKeyDataAesId</primary></indexterm><programlisting>#define xmlSecKeyDataAesId			xmlSecKeyDataAesGetKlass()
 </programlisting>
 <para>
 The AES key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataAesGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecKeyDataAesGetKlass" role="function">
+<title>xmlSecKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataAesGetKlass"><primary sortas="xmlSecKeyDataAesGetKlass">xmlSecKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataAesGetKlass            (void);</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the AES key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDesId">xmlSecKeyDataDesId</title>
-<indexterm><primary>xmlSecKeyDataDesId</primary></indexterm><programlisting>#define xmlSecKeyDataDesId			xmlSecKeyDataDesGetKlass()
+<refsect2 id="xmlSecKeyDataDesId" role="macro">
+<title>xmlSecKeyDataDesId</title>
+<indexterm zone="xmlSecKeyDataDesId"><primary sortas="xmlSecKeyDataDesId">xmlSecKeyDataDesId</primary></indexterm><programlisting>#define xmlSecKeyDataDesId			xmlSecKeyDataDesGetKlass()
 </programlisting>
 <para>
 The DES key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataDesGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecKeyDataDesGetKlass" role="function">
+<title>xmlSecKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataDesGetKlass"><primary sortas="xmlSecKeyDataDesGetKlass">xmlSecKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataDesGetKlass            (void);</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DES key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DES key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</title>
-<indexterm><primary>xmlSecKeyDataDsaId</primary></indexterm><programlisting>#define xmlSecKeyDataDsaId			xmlSecKeyDataDsaGetKlass()
+<refsect2 id="xmlSecKeyDataDsaId" role="macro">
+<title>xmlSecKeyDataDsaId</title>
+<indexterm zone="xmlSecKeyDataDsaId"><primary sortas="xmlSecKeyDataDsaId">xmlSecKeyDataDsaId</primary></indexterm><programlisting>#define xmlSecKeyDataDsaId			xmlSecKeyDataDsaGetKlass()
 </programlisting>
 <para>
 The DSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataDsaGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecKeyDataDsaGetKlass" role="function">
+<title>xmlSecKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataDsaGetKlass"><primary sortas="xmlSecKeyDataDsaGetKlass">xmlSecKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataDsaGetKlass            (void);</programlisting>
 <para>
 The DSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DSA key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DSA key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</title>
-<indexterm><primary>xmlSecKeyDataGost2001Id</primary></indexterm><programlisting>#define xmlSecKeyDataGost2001Id			xmlSecKeyDataGost2001GetKlass()
+<refsect2 id="xmlSecKeyDataGost2001Id" role="macro">
+<title>xmlSecKeyDataGost2001Id</title>
+<indexterm zone="xmlSecKeyDataGost2001Id"><primary sortas="xmlSecKeyDataGost2001Id">xmlSecKeyDataGost2001Id</primary></indexterm><programlisting>#define xmlSecKeyDataGost2001Id			xmlSecKeyDataGost2001GetKlass()
 </programlisting>
 <para>
 The GOST2001 key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataGost2001GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataGost2001GetKlass" role="function">
+<title>xmlSecKeyDataGost2001GetKlass ()</title>
+<indexterm zone="xmlSecKeyDataGost2001GetKlass"><primary sortas="xmlSecKeyDataGost2001GetKlass">xmlSecKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataGost2001GetKlass       (void);</programlisting>
 <para>
 The GOST2001 key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>GOST2001 key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the GOST2001 key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</title>
-<indexterm><primary>xmlSecKeyDataHmacId</primary></indexterm><programlisting>#define xmlSecKeyDataHmacId			xmlSecKeyDataHmacGetKlass()
+<refsect2 id="xmlSecKeyDataHmacId" role="macro">
+<title>xmlSecKeyDataHmacId</title>
+<indexterm zone="xmlSecKeyDataHmacId"><primary sortas="xmlSecKeyDataHmacId">xmlSecKeyDataHmacId</primary></indexterm><programlisting>#define xmlSecKeyDataHmacId			xmlSecKeyDataHmacGetKlass()
 </programlisting>
 <para>
 The DHMAC key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataHmacGetKlass   (void);</programlisting>
+<refsect2 id="xmlSecKeyDataHmacGetKlass" role="function">
+<title>xmlSecKeyDataHmacGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataHmacGetKlass"><primary sortas="xmlSecKeyDataHmacGetKlass">xmlSecKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataHmacGetKlass           (void);</programlisting>
 <para>
 The HMAC key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HMAC key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the HMAC key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</title>
-<indexterm><primary>xmlSecKeyDataRsaId</primary></indexterm><programlisting>#define xmlSecKeyDataRsaId			xmlSecKeyDataRsaGetKlass()
+<refsect2 id="xmlSecKeyDataRsaId" role="macro">
+<title>xmlSecKeyDataRsaId</title>
+<indexterm zone="xmlSecKeyDataRsaId"><primary sortas="xmlSecKeyDataRsaId">xmlSecKeyDataRsaId</primary></indexterm><programlisting>#define xmlSecKeyDataRsaId			xmlSecKeyDataRsaGetKlass()
 </programlisting>
 <para>
 The RSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataRsaGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecKeyDataRsaGetKlass" role="function">
+<title>xmlSecKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataRsaGetKlass"><primary sortas="xmlSecKeyDataRsaGetKlass">xmlSecKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRsaGetKlass            (void);</programlisting>
 <para>
 The RSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the RSA key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</title>
-<indexterm><primary>xmlSecKeyDataX509Id</primary></indexterm><programlisting>#define xmlSecKeyDataX509Id			xmlSecKeyDataX509GetKlass()
+<refsect2 id="xmlSecKeyDataX509Id" role="macro">
+<title>xmlSecKeyDataX509Id</title>
+<indexterm zone="xmlSecKeyDataX509Id"><primary sortas="xmlSecKeyDataX509Id">xmlSecKeyDataX509Id</primary></indexterm><programlisting>#define xmlSecKeyDataX509Id			xmlSecKeyDataX509GetKlass()
 </programlisting>
 <para>
 The X509 data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataX509GetKlass   (void);</programlisting>
+<refsect2 id="xmlSecKeyDataX509GetKlass" role="function">
+<title>xmlSecKeyDataX509GetKlass ()</title>
+<indexterm zone="xmlSecKeyDataX509GetKlass"><primary sortas="xmlSecKeyDataX509GetKlass">xmlSecKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataX509GetKlass           (void);</programlisting>
 <para>
 The X509 key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>X509 key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> X509 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the X509 key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</title>
-<indexterm><primary>xmlSecKeyDataRawX509CertId</primary></indexterm><programlisting>#define xmlSecKeyDataRawX509CertId		xmlSecKeyDataRawX509CertGetKlass()
+<refsect2 id="xmlSecKeyDataRawX509CertId" role="macro">
+<title>xmlSecKeyDataRawX509CertId</title>
+<indexterm zone="xmlSecKeyDataRawX509CertId"><primary sortas="xmlSecKeyDataRawX509CertId">xmlSecKeyDataRawX509CertId</primary></indexterm><programlisting>#define xmlSecKeyDataRawX509CertId		xmlSecKeyDataRawX509CertGetKlass()
 </programlisting>
 <para>
 The  raw X509 certificate klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataRawX509CertGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataRawX509CertGetKlass" role="function">
+<title>xmlSecKeyDataRawX509CertGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataRawX509CertGetKlass"><primary sortas="xmlSecKeyDataRawX509CertGetKlass">xmlSecKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRawX509CertGetKlass    (void);</programlisting>
 <para>
 The raw X509 cert key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>raw x509 cert key data klass or NULL if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw x509 cert key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the raw X509 cert key data
 klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecX509StoreId">xmlSecX509StoreId</title>
-<indexterm><primary>xmlSecX509StoreId</primary></indexterm><programlisting>#define xmlSecX509StoreId			xmlSecX509StoreGetKlass()
+<refsect2 id="xmlSecX509StoreId" role="macro">
+<title>xmlSecX509StoreId</title>
+<indexterm zone="xmlSecX509StoreId"><primary sortas="xmlSecX509StoreId">xmlSecX509StoreId</primary></indexterm><programlisting>#define xmlSecX509StoreId			xmlSecX509StoreGetKlass()
 </programlisting>
 <para>
 The  X509 store klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass ()</title>
-<indexterm><primary>xmlSecX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> xmlSecX509StoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecX509StoreGetKlass" role="function">
+<title>xmlSecX509StoreGetKlass ()</title>
+<indexterm zone="xmlSecX509StoreGetKlass"><primary sortas="xmlSecX509StoreGetKlass">xmlSecX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecX509StoreGetKlass           (void);</programlisting>
 <para>
 The X509 certificates key data store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to X509 certificates key data store klass or NULL if 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to X509 certificates key data store klass or NULL if 
 an error occurs (xmlsec-crypto library is not loaded or the raw X509 
 cert key data klass is not implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</title>
-<indexterm><primary>xmlSecTransformAes128CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes128CbcId		xmlSecTransformAes128CbcGetKlass()
+<refsect2 id="xmlSecTransformAes128CbcId" role="macro">
+<title>xmlSecTransformAes128CbcId</title>
+<indexterm zone="xmlSecTransformAes128CbcId"><primary sortas="xmlSecTransformAes128CbcId">xmlSecTransformAes128CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes128CbcId		xmlSecTransformAes128CbcGetKlass()
 </programlisting>
 <para>
 The AES128 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass ()</title>
-<indexterm><primary>xmlSecTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformAes128CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformAes128CbcGetKlass" role="function">
+<title>xmlSecTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecTransformAes128CbcGetKlass"><primary sortas="xmlSecTransformAes128CbcGetKlass">xmlSecTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes128CbcGetKlass    (void);</programlisting>
 <para>
 AES 128 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 128 CBC encryption transform or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</title>
-<indexterm><primary>xmlSecTransformAes192CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes192CbcId		xmlSecTransformAes192CbcGetKlass()
+<refsect2 id="xmlSecTransformAes192CbcId" role="macro">
+<title>xmlSecTransformAes192CbcId</title>
+<indexterm zone="xmlSecTransformAes192CbcId"><primary sortas="xmlSecTransformAes192CbcId">xmlSecTransformAes192CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes192CbcId		xmlSecTransformAes192CbcGetKlass()
 </programlisting>
 <para>
 The AES192 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass ()</title>
-<indexterm><primary>xmlSecTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformAes192CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformAes192CbcGetKlass" role="function">
+<title>xmlSecTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecTransformAes192CbcGetKlass"><primary sortas="xmlSecTransformAes192CbcGetKlass">xmlSecTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes192CbcGetKlass    (void);</programlisting>
 <para>
 AES 192 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 192 CBC encryption transform or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</title>
-<indexterm><primary>xmlSecTransformAes256CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes256CbcId		xmlSecTransformAes256CbcGetKlass()
+<refsect2 id="xmlSecTransformAes256CbcId" role="macro">
+<title>xmlSecTransformAes256CbcId</title>
+<indexterm zone="xmlSecTransformAes256CbcId"><primary sortas="xmlSecTransformAes256CbcId">xmlSecTransformAes256CbcId</primary></indexterm><programlisting>#define xmlSecTransformAes256CbcId		xmlSecTransformAes256CbcGetKlass()
 </programlisting>
 <para>
 The AES256 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass ()</title>
-<indexterm><primary>xmlSecTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformAes256CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformAes256CbcGetKlass" role="function">
+<title>xmlSecTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecTransformAes256CbcGetKlass"><primary sortas="xmlSecTransformAes256CbcGetKlass">xmlSecTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformAes256CbcGetKlass    (void);</programlisting>
 <para>
 AES 256 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 256 CBC encryption transform or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</title>
-<indexterm><primary>xmlSecTransformKWAes128Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes128Id		xmlSecTransformKWAes128GetKlass()
+<refsect2 id="xmlSecTransformKWAes128Id" role="macro">
+<title>xmlSecTransformKWAes128Id</title>
+<indexterm zone="xmlSecTransformKWAes128Id"><primary sortas="xmlSecTransformKWAes128Id">xmlSecTransformKWAes128Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes128Id		xmlSecTransformKWAes128GetKlass()
 </programlisting>
 <para>
 The AES 128 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass ()</title>
-<indexterm><primary>xmlSecTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformKWAes128GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformKWAes128GetKlass" role="function">
+<title>xmlSecTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecTransformKWAes128GetKlass"><primary sortas="xmlSecTransformKWAes128GetKlass">xmlSecTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes128GetKlass     (void);</programlisting>
 <para>
 The AES-128 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-128 kew wrapper transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</title>
-<indexterm><primary>xmlSecTransformKWAes192Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes192Id		xmlSecTransformKWAes192GetKlass()
+<refsect2 id="xmlSecTransformKWAes192Id" role="macro">
+<title>xmlSecTransformKWAes192Id</title>
+<indexterm zone="xmlSecTransformKWAes192Id"><primary sortas="xmlSecTransformKWAes192Id">xmlSecTransformKWAes192Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes192Id		xmlSecTransformKWAes192GetKlass()
 </programlisting>
 <para>
 The AES 192 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass ()</title>
-<indexterm><primary>xmlSecTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformKWAes192GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformKWAes192GetKlass" role="function">
+<title>xmlSecTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecTransformKWAes192GetKlass"><primary sortas="xmlSecTransformKWAes192GetKlass">xmlSecTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes192GetKlass     (void);</programlisting>
 <para>
 The AES-192 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-192 kew wrapper transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</title>
-<indexterm><primary>xmlSecTransformKWAes256Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes256Id		xmlSecTransformKWAes256GetKlass()
+<refsect2 id="xmlSecTransformKWAes256Id" role="macro">
+<title>xmlSecTransformKWAes256Id</title>
+<indexterm zone="xmlSecTransformKWAes256Id"><primary sortas="xmlSecTransformKWAes256Id">xmlSecTransformKWAes256Id</primary></indexterm><programlisting>#define xmlSecTransformKWAes256Id		xmlSecTransformKWAes256GetKlass()
 </programlisting>
 <para>
 The AES 256 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass ()</title>
-<indexterm><primary>xmlSecTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformKWAes256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformKWAes256GetKlass" role="function">
+<title>xmlSecTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecTransformKWAes256GetKlass"><primary sortas="xmlSecTransformKWAes256GetKlass">xmlSecTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWAes256GetKlass     (void);</programlisting>
 <para>
 The AES-256 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-256 kew wrapper transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</title>
-<indexterm><primary>xmlSecTransformDes3CbcId</primary></indexterm><programlisting>#define xmlSecTransformDes3CbcId		xmlSecTransformDes3CbcGetKlass()
+<refsect2 id="xmlSecTransformDes3CbcId" role="macro">
+<title>xmlSecTransformDes3CbcId</title>
+<indexterm zone="xmlSecTransformDes3CbcId"><primary sortas="xmlSecTransformDes3CbcId">xmlSecTransformDes3CbcId</primary></indexterm><programlisting>#define xmlSecTransformDes3CbcId		xmlSecTransformDes3CbcGetKlass()
 </programlisting>
 <para>
 The Triple DES encryption transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass ()</title>
-<indexterm><primary>xmlSecTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformDes3CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformDes3CbcGetKlass" role="function">
+<title>xmlSecTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecTransformDes3CbcGetKlass"><primary sortas="xmlSecTransformDes3CbcGetKlass">xmlSecTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformDes3CbcGetKlass      (void);</programlisting>
 <para>
 Triple DES CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Triple DES encryption transform or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</title>
-<indexterm><primary>xmlSecTransformKWDes3Id</primary></indexterm><programlisting>#define xmlSecTransformKWDes3Id			xmlSecTransformKWDes3GetKlass()
+<refsect2 id="xmlSecTransformKWDes3Id" role="macro">
+<title>xmlSecTransformKWDes3Id</title>
+<indexterm zone="xmlSecTransformKWDes3Id"><primary sortas="xmlSecTransformKWDes3Id">xmlSecTransformKWDes3Id</primary></indexterm><programlisting>#define xmlSecTransformKWDes3Id			xmlSecTransformKWDes3GetKlass()
 </programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass ()</title>
-<indexterm><primary>xmlSecTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformKWDes3GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformKWDes3GetKlass" role="function">
+<title>xmlSecTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecTransformKWDes3GetKlass"><primary sortas="xmlSecTransformKWDes3GetKlass">xmlSecTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformKWDes3GetKlass       (void);</programlisting>
 <para>
 The Triple DES key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Triple DES key wrapper transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</title>
-<indexterm><primary>xmlSecTransformDsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformDsaSha1Id		xmlSecTransformDsaSha1GetKlass()
+<refsect2 id="xmlSecTransformDsaSha1Id" role="macro">
+<title>xmlSecTransformDsaSha1Id</title>
+<indexterm zone="xmlSecTransformDsaSha1Id"><primary sortas="xmlSecTransformDsaSha1Id">xmlSecTransformDsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformDsaSha1Id		xmlSecTransformDsaSha1GetKlass()
 </programlisting>
 <para>
 The DSA-SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformDsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformDsaSha1GetKlass" role="function">
+<title>xmlSecTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecTransformDsaSha1GetKlass"><primary sortas="xmlSecTransformDsaSha1GetKlass">xmlSecTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformDsaSha1GetKlass      (void);</programlisting>
 <para>
 The DSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DSA-SHA1 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGost2001GostR3411-94Id">xmlSecTransformGost2001GostR3411_94Id</title>
-<indexterm><primary>xmlSecTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGost2001GostR3411_94Id		xmlSecTransformGost2001GostR3411_94GetKlass()
+<refsect2 id="xmlSecTransformGost2001GostR3411-94Id" role="macro">
+<title>xmlSecTransformGost2001GostR3411_94Id</title>
+<indexterm zone="xmlSecTransformGost2001GostR3411-94Id"><primary sortas="xmlSecTransformGost2001GostR3411_94Id">xmlSecTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGost2001GostR3411_94Id		xmlSecTransformGost2001GostR3411_94GetKlass()
 </programlisting>
 <para>
 The GOST2001-GOSTR3411_94 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGost2001GostR3411-94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass ()</title>
-<indexterm><primary>xmlSecTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformGost2001GostR3411_94GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformGost2001GostR3411-94GetKlass" role="function">
+<title>xmlSecTransformGost2001GostR3411_94GetKlass ()</title>
+<indexterm zone="xmlSecTransformGost2001GostR3411-94GetKlass"><primary sortas="xmlSecTransformGost2001GostR3411_94GetKlass">xmlSecTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformGost2001GostR3411_94GetKlass
+                                                        (void);</programlisting>
 <para>
 The GOST2001-GOSTR3411_94 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecTransformHmacMd5Id</primary></indexterm><programlisting>#define xmlSecTransformHmacMd5Id		xmlSecTransformHmacMd5GetKlass()
+<refsect2 id="xmlSecTransformHmacMd5Id" role="macro">
+<title>xmlSecTransformHmacMd5Id</title>
+<indexterm zone="xmlSecTransformHmacMd5Id"><primary sortas="xmlSecTransformHmacMd5Id">xmlSecTransformHmacMd5Id</primary></indexterm><programlisting>#define xmlSecTransformHmacMd5Id		xmlSecTransformHmacMd5GetKlass()
 </programlisting>
 <para>
 The HMAC with MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacMd5GetKlass" role="function">
+<title>xmlSecTransformHmacMd5GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacMd5GetKlass"><primary sortas="xmlSecTransformHmacMd5GetKlass">xmlSecTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacMd5GetKlass      (void);</programlisting>
 <para>
 The HMAC-MD5 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-MD5 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</title>
-<indexterm><primary>xmlSecTransformHmacRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformHmacRipemd160Id		xmlSecTransformHmacRipemd160GetKlass()
+<refsect2 id="xmlSecTransformHmacRipemd160Id" role="macro">
+<title>xmlSecTransformHmacRipemd160Id</title>
+<indexterm zone="xmlSecTransformHmacRipemd160Id"><primary sortas="xmlSecTransformHmacRipemd160Id">xmlSecTransformHmacRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformHmacRipemd160Id		xmlSecTransformHmacRipemd160GetKlass()
 </programlisting>
 <para>
 The HMAC with RipeMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacRipemd160GetKlass" role="function">
+<title>xmlSecTransformHmacRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacRipemd160GetKlass"><primary sortas="xmlSecTransformHmacRipemd160GetKlass">xmlSecTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-RIPEMD160 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-RIPEMD160 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecTransformHmacSha1Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha1Id		xmlSecTransformHmacSha1GetKlass()
+<refsect2 id="xmlSecTransformHmacSha1Id" role="macro">
+<title>xmlSecTransformHmacSha1Id</title>
+<indexterm zone="xmlSecTransformHmacSha1Id"><primary sortas="xmlSecTransformHmacSha1Id">xmlSecTransformHmacSha1Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha1Id		xmlSecTransformHmacSha1GetKlass()
 </programlisting>
 <para>
 The HMAC with SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacSha1GetKlass" role="function">
+<title>xmlSecTransformHmacSha1GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacSha1GetKlass"><primary sortas="xmlSecTransformHmacSha1GetKlass">xmlSecTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha1GetKlass     (void);</programlisting>
 <para>
 The HMAC-SHA1 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA1 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</title>
-<indexterm><primary>xmlSecTransformHmacSha224Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha224Id		xmlSecTransformHmacSha224GetKlass()
+<refsect2 id="xmlSecTransformHmacSha224Id" role="macro">
+<title>xmlSecTransformHmacSha224Id</title>
+<indexterm zone="xmlSecTransformHmacSha224Id"><primary sortas="xmlSecTransformHmacSha224Id">xmlSecTransformHmacSha224Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha224Id		xmlSecTransformHmacSha224GetKlass()
 </programlisting>
 <para>
 The HMAC with SHA224 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacSha224GetKlass" role="function">
+<title>xmlSecTransformHmacSha224GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacSha224GetKlass"><primary sortas="xmlSecTransformHmacSha224GetKlass">xmlSecTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha224GetKlass   (void);</programlisting>
 <para>
 The HMAC-SHA224 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA224 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA224 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</title>
-<indexterm><primary>xmlSecTransformHmacSha256Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha256Id		xmlSecTransformHmacSha256GetKlass()
+<refsect2 id="xmlSecTransformHmacSha256Id" role="macro">
+<title>xmlSecTransformHmacSha256Id</title>
+<indexterm zone="xmlSecTransformHmacSha256Id"><primary sortas="xmlSecTransformHmacSha256Id">xmlSecTransformHmacSha256Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha256Id		xmlSecTransformHmacSha256GetKlass()
 </programlisting>
 <para>
 The HMAC with SHA256 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacSha256GetKlass" role="function">
+<title>xmlSecTransformHmacSha256GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacSha256GetKlass"><primary sortas="xmlSecTransformHmacSha256GetKlass">xmlSecTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha256GetKlass   (void);</programlisting>
 <para>
 The HMAC-SHA256 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA256 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</title>
-<indexterm><primary>xmlSecTransformHmacSha384Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha384Id		xmlSecTransformHmacSha384GetKlass()
+<refsect2 id="xmlSecTransformHmacSha384Id" role="macro">
+<title>xmlSecTransformHmacSha384Id</title>
+<indexterm zone="xmlSecTransformHmacSha384Id"><primary sortas="xmlSecTransformHmacSha384Id">xmlSecTransformHmacSha384Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha384Id		xmlSecTransformHmacSha384GetKlass()
 </programlisting>
 <para>
 The HMAC with SHA384 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacSha384GetKlass" role="function">
+<title>xmlSecTransformHmacSha384GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacSha384GetKlass"><primary sortas="xmlSecTransformHmacSha384GetKlass">xmlSecTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha384GetKlass   (void);</programlisting>
 <para>
 The HMAC-SHA384 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA384 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</title>
-<indexterm><primary>xmlSecTransformHmacSha512Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha512Id		xmlSecTransformHmacSha512GetKlass()
+<refsect2 id="xmlSecTransformHmacSha512Id" role="macro">
+<title>xmlSecTransformHmacSha512Id</title>
+<indexterm zone="xmlSecTransformHmacSha512Id"><primary sortas="xmlSecTransformHmacSha512Id">xmlSecTransformHmacSha512Id</primary></indexterm><programlisting>#define xmlSecTransformHmacSha512Id		xmlSecTransformHmacSha512GetKlass()
 </programlisting>
 <para>
 The HMAC with SHA512 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass ()</title>
-<indexterm><primary>xmlSecTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformHmacSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformHmacSha512GetKlass" role="function">
+<title>xmlSecTransformHmacSha512GetKlass ()</title>
+<indexterm zone="xmlSecTransformHmacSha512GetKlass"><primary sortas="xmlSecTransformHmacSha512GetKlass">xmlSecTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformHmacSha512GetKlass   (void);</programlisting>
 <para>
 The HMAC-SHA512 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA512 transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformMd5Id">xmlSecTransformMd5Id</title>
-<indexterm><primary>xmlSecTransformMd5Id</primary></indexterm><programlisting>#define xmlSecTransformMd5Id			xmlSecTransformMd5GetKlass()
+<refsect2 id="xmlSecTransformMd5Id" role="macro">
+<title>xmlSecTransformMd5Id</title>
+<indexterm zone="xmlSecTransformMd5Id"><primary sortas="xmlSecTransformMd5Id">xmlSecTransformMd5Id</primary></indexterm><programlisting>#define xmlSecTransformMd5Id			xmlSecTransformMd5GetKlass()
 </programlisting>
 <para>
 The MD5 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass ()</title>
-<indexterm><primary>xmlSecTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformMd5GetKlass" role="function">
+<title>xmlSecTransformMd5GetKlass ()</title>
+<indexterm zone="xmlSecTransformMd5GetKlass"><primary sortas="xmlSecTransformMd5GetKlass">xmlSecTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformMd5GetKlass          (void);</programlisting>
 <para>
 MD5 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to MD5 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</title>
-<indexterm><primary>xmlSecTransformRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRipemd160Id		xmlSecTransformRipemd160GetKlass()
+<refsect2 id="xmlSecTransformRipemd160Id" role="macro">
+<title>xmlSecTransformRipemd160Id</title>
+<indexterm zone="xmlSecTransformRipemd160Id"><primary sortas="xmlSecTransformRipemd160Id">xmlSecTransformRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRipemd160Id		xmlSecTransformRipemd160GetKlass()
 </programlisting>
 <para>
 The RIPEMD160 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRipemd160GetKlass" role="function">
+<title>xmlSecTransformRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecTransformRipemd160GetKlass"><primary sortas="xmlSecTransformRipemd160GetKlass">xmlSecTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRipemd160GetKlass    (void);</programlisting>
 <para>
 RIPEMD-160 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to RIPEMD-160 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD-160 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</title>
-<indexterm><primary>xmlSecTransformRsaMd5Id</primary></indexterm><programlisting>#define xmlSecTransformRsaMd5Id			xmlSecTransformRsaMd5GetKlass()
+<refsect2 id="xmlSecTransformRsaMd5Id" role="macro">
+<title>xmlSecTransformRsaMd5Id</title>
+<indexterm zone="xmlSecTransformRsaMd5Id"><primary sortas="xmlSecTransformRsaMd5Id">xmlSecTransformRsaMd5Id</primary></indexterm><programlisting>#define xmlSecTransformRsaMd5Id			xmlSecTransformRsaMd5GetKlass()
 </programlisting>
 <para>
 The RSA-MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaMd5GetKlass" role="function">
+<title>xmlSecTransformRsaMd5GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaMd5GetKlass"><primary sortas="xmlSecTransformRsaMd5GetKlass">xmlSecTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaMd5GetKlass       (void);</programlisting>
 <para>
 The RSA-MD5 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-MD5 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</title>
-<indexterm><primary>xmlSecTransformRsaRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRsaRipemd160Id		xmlSecTransformRsaRipemd160GetKlass()
+<refsect2 id="xmlSecTransformRsaRipemd160Id" role="macro">
+<title>xmlSecTransformRsaRipemd160Id</title>
+<indexterm zone="xmlSecTransformRsaRipemd160Id"><primary sortas="xmlSecTransformRsaRipemd160Id">xmlSecTransformRsaRipemd160Id</primary></indexterm><programlisting>#define xmlSecTransformRsaRipemd160Id		xmlSecTransformRsaRipemd160GetKlass()
 </programlisting>
 <para>
 The RSA-RIPEMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaRipemd160GetKlass" role="function">
+<title>xmlSecTransformRsaRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaRipemd160GetKlass"><primary sortas="xmlSecTransformRsaRipemd160GetKlass">xmlSecTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaRipemd160GetKlass (void);</programlisting>
 <para>
 The RSA-RIPEMD160 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-RIPEMD160 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-RIPEMD160 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</title>
-<indexterm><primary>xmlSecTransformRsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha1Id		xmlSecTransformRsaSha1GetKlass()
+<refsect2 id="xmlSecTransformRsaSha1Id" role="macro">
+<title>xmlSecTransformRsaSha1Id</title>
+<indexterm zone="xmlSecTransformRsaSha1Id"><primary sortas="xmlSecTransformRsaSha1Id">xmlSecTransformRsaSha1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha1Id		xmlSecTransformRsaSha1GetKlass()
 </programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaSha1GetKlass" role="function">
+<title>xmlSecTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaSha1GetKlass"><primary sortas="xmlSecTransformRsaSha1GetKlass">xmlSecTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha1GetKlass      (void);</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA1 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</title>
-<indexterm><primary>xmlSecTransformRsaSha224Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha224Id		xmlSecTransformRsaSha224GetKlass()
+<refsect2 id="xmlSecTransformRsaSha224Id" role="macro">
+<title>xmlSecTransformRsaSha224Id</title>
+<indexterm zone="xmlSecTransformRsaSha224Id"><primary sortas="xmlSecTransformRsaSha224Id">xmlSecTransformRsaSha224Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha224Id		xmlSecTransformRsaSha224GetKlass()
 </programlisting>
 <para>
 The RSA-SHA224 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaSha224GetKlass" role="function">
+<title>xmlSecTransformRsaSha224GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaSha224GetKlass"><primary sortas="xmlSecTransformRsaSha224GetKlass">xmlSecTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha224GetKlass    (void);</programlisting>
 <para>
 The RSA-SHA224 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA224 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA224 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</title>
-<indexterm><primary>xmlSecTransformRsaSha256Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha256Id		xmlSecTransformRsaSha256GetKlass()
+<refsect2 id="xmlSecTransformRsaSha256Id" role="macro">
+<title>xmlSecTransformRsaSha256Id</title>
+<indexterm zone="xmlSecTransformRsaSha256Id"><primary sortas="xmlSecTransformRsaSha256Id">xmlSecTransformRsaSha256Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha256Id		xmlSecTransformRsaSha256GetKlass()
 </programlisting>
 <para>
 The RSA-SHA256 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaSha256GetKlass" role="function">
+<title>xmlSecTransformRsaSha256GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaSha256GetKlass"><primary sortas="xmlSecTransformRsaSha256GetKlass">xmlSecTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha256GetKlass    (void);</programlisting>
 <para>
 The RSA-SHA256 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA256 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</title>
-<indexterm><primary>xmlSecTransformRsaSha384Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha384Id		xmlSecTransformRsaSha384GetKlass()
+<refsect2 id="xmlSecTransformRsaSha384Id" role="macro">
+<title>xmlSecTransformRsaSha384Id</title>
+<indexterm zone="xmlSecTransformRsaSha384Id"><primary sortas="xmlSecTransformRsaSha384Id">xmlSecTransformRsaSha384Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha384Id		xmlSecTransformRsaSha384GetKlass()
 </programlisting>
 <para>
 The RSA-SHA384 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaSha384GetKlass" role="function">
+<title>xmlSecTransformRsaSha384GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaSha384GetKlass"><primary sortas="xmlSecTransformRsaSha384GetKlass">xmlSecTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha384GetKlass    (void);</programlisting>
 <para>
 The RSA-SHA384 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA384 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</title>
-<indexterm><primary>xmlSecTransformRsaSha512Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha512Id		xmlSecTransformRsaSha512GetKlass()
+<refsect2 id="xmlSecTransformRsaSha512Id" role="macro">
+<title>xmlSecTransformRsaSha512Id</title>
+<indexterm zone="xmlSecTransformRsaSha512Id"><primary sortas="xmlSecTransformRsaSha512Id">xmlSecTransformRsaSha512Id</primary></indexterm><programlisting>#define xmlSecTransformRsaSha512Id		xmlSecTransformRsaSha512GetKlass()
 </programlisting>
 <para>
 The RSA-SHA512 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaSha512GetKlass" role="function">
+<title>xmlSecTransformRsaSha512GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaSha512GetKlass"><primary sortas="xmlSecTransformRsaSha512GetKlass">xmlSecTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaSha512GetKlass    (void);</programlisting>
 <para>
 The RSA-SHA512 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA512 signature transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</title>
-<indexterm><primary>xmlSecTransformRsaPkcs1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaPkcs1Id		xmlSecTransformRsaPkcs1GetKlass()
+<refsect2 id="xmlSecTransformRsaPkcs1Id" role="macro">
+<title>xmlSecTransformRsaPkcs1Id</title>
+<indexterm zone="xmlSecTransformRsaPkcs1Id"><primary sortas="xmlSecTransformRsaPkcs1Id">xmlSecTransformRsaPkcs1Id</primary></indexterm><programlisting>#define xmlSecTransformRsaPkcs1Id		xmlSecTransformRsaPkcs1GetKlass()
 </programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaPkcs1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaPkcs1GetKlass" role="function">
+<title>xmlSecTransformRsaPkcs1GetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaPkcs1GetKlass"><primary sortas="xmlSecTransformRsaPkcs1GetKlass">xmlSecTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaPkcs1GetKlass     (void);</programlisting>
 <para>
 The RSA-PKCS1 key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-PKCS1 key transport transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</title>
-<indexterm><primary>xmlSecTransformRsaOaepId</primary></indexterm><programlisting>#define xmlSecTransformRsaOaepId		xmlSecTransformRsaOaepGetKlass()
+<refsect2 id="xmlSecTransformRsaOaepId" role="macro">
+<title>xmlSecTransformRsaOaepId</title>
+<indexterm zone="xmlSecTransformRsaOaepId"><primary sortas="xmlSecTransformRsaOaepId">xmlSecTransformRsaOaepId</primary></indexterm><programlisting>#define xmlSecTransformRsaOaepId		xmlSecTransformRsaOaepGetKlass()
 </programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass ()</title>
-<indexterm><primary>xmlSecTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRsaOaepGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRsaOaepGetKlass" role="function">
+<title>xmlSecTransformRsaOaepGetKlass ()</title>
+<indexterm zone="xmlSecTransformRsaOaepGetKlass"><primary sortas="xmlSecTransformRsaOaepGetKlass">xmlSecTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRsaOaepGetKlass      (void);</programlisting>
 <para>
 The RSA-OAEP key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-OAEP key transport transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-OAEP key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGostR3411-94Id">xmlSecTransformGostR3411_94Id</title>
-<indexterm><primary>xmlSecTransformGostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGostR3411_94Id			xmlSecTransformGostR3411_94GetKlass()
+<refsect2 id="xmlSecTransformGostR3411-94Id" role="macro">
+<title>xmlSecTransformGostR3411_94Id</title>
+<indexterm zone="xmlSecTransformGostR3411-94Id"><primary sortas="xmlSecTransformGostR3411_94Id">xmlSecTransformGostR3411_94Id</primary></indexterm><programlisting>#define xmlSecTransformGostR3411_94Id			xmlSecTransformGostR3411_94GetKlass()
 </programlisting>
 <para>
 The GOSTR3411_94 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGostR3411-94GetKlass">xmlSecTransformGostR3411_94GetKlass ()</title>
-<indexterm><primary>xmlSecTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformGostR3411_94GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformGostR3411-94GetKlass" role="function">
+<title>xmlSecTransformGostR3411_94GetKlass ()</title>
+<indexterm zone="xmlSecTransformGostR3411-94GetKlass"><primary sortas="xmlSecTransformGostR3411_94GetKlass">xmlSecTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformGostR3411_94GetKlass (void);</programlisting>
 <para>
 GOSTR3411_94 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to GOSTR3411_94 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOSTR3411_94 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha1Id">xmlSecTransformSha1Id</title>
-<indexterm><primary>xmlSecTransformSha1Id</primary></indexterm><programlisting>#define xmlSecTransformSha1Id			xmlSecTransformSha1GetKlass()
+<refsect2 id="xmlSecTransformSha1Id" role="macro">
+<title>xmlSecTransformSha1Id</title>
+<indexterm zone="xmlSecTransformSha1Id"><primary sortas="xmlSecTransformSha1Id">xmlSecTransformSha1Id</primary></indexterm><programlisting>#define xmlSecTransformSha1Id			xmlSecTransformSha1GetKlass()
 </programlisting>
 <para>
 The SHA1 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass ()</title>
-<indexterm><primary>xmlSecTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformSha1GetKlass" role="function">
+<title>xmlSecTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecTransformSha1GetKlass"><primary sortas="xmlSecTransformSha1GetKlass">xmlSecTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha1GetKlass         (void);</programlisting>
 <para>
 SHA-1 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-1 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha224Id">xmlSecTransformSha224Id</title>
-<indexterm><primary>xmlSecTransformSha224Id</primary></indexterm><programlisting>#define xmlSecTransformSha224Id			xmlSecTransformSha224GetKlass()
+<refsect2 id="xmlSecTransformSha224Id" role="macro">
+<title>xmlSecTransformSha224Id</title>
+<indexterm zone="xmlSecTransformSha224Id"><primary sortas="xmlSecTransformSha224Id">xmlSecTransformSha224Id</primary></indexterm><programlisting>#define xmlSecTransformSha224Id			xmlSecTransformSha224GetKlass()
 </programlisting>
 <para>
 The SHA224 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass ()</title>
-<indexterm><primary>xmlSecTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformSha224GetKlass" role="function">
+<title>xmlSecTransformSha224GetKlass ()</title>
+<indexterm zone="xmlSecTransformSha224GetKlass"><primary sortas="xmlSecTransformSha224GetKlass">xmlSecTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha224GetKlass       (void);</programlisting>
 <para>
 SHA224 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA224 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA224 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha256Id">xmlSecTransformSha256Id</title>
-<indexterm><primary>xmlSecTransformSha256Id</primary></indexterm><programlisting>#define xmlSecTransformSha256Id			xmlSecTransformSha256GetKlass()
+<refsect2 id="xmlSecTransformSha256Id" role="macro">
+<title>xmlSecTransformSha256Id</title>
+<indexterm zone="xmlSecTransformSha256Id"><primary sortas="xmlSecTransformSha256Id">xmlSecTransformSha256Id</primary></indexterm><programlisting>#define xmlSecTransformSha256Id			xmlSecTransformSha256GetKlass()
 </programlisting>
 <para>
 The SHA256 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass ()</title>
-<indexterm><primary>xmlSecTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformSha256GetKlass" role="function">
+<title>xmlSecTransformSha256GetKlass ()</title>
+<indexterm zone="xmlSecTransformSha256GetKlass"><primary sortas="xmlSecTransformSha256GetKlass">xmlSecTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha256GetKlass       (void);</programlisting>
 <para>
 SHA256 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA256 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA256 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha384Id">xmlSecTransformSha384Id</title>
-<indexterm><primary>xmlSecTransformSha384Id</primary></indexterm><programlisting>#define xmlSecTransformSha384Id			xmlSecTransformSha384GetKlass()
+<refsect2 id="xmlSecTransformSha384Id" role="macro">
+<title>xmlSecTransformSha384Id</title>
+<indexterm zone="xmlSecTransformSha384Id"><primary sortas="xmlSecTransformSha384Id">xmlSecTransformSha384Id</primary></indexterm><programlisting>#define xmlSecTransformSha384Id			xmlSecTransformSha384GetKlass()
 </programlisting>
 <para>
 The SHA384 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass ()</title>
-<indexterm><primary>xmlSecTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformSha384GetKlass" role="function">
+<title>xmlSecTransformSha384GetKlass ()</title>
+<indexterm zone="xmlSecTransformSha384GetKlass"><primary sortas="xmlSecTransformSha384GetKlass">xmlSecTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha384GetKlass       (void);</programlisting>
 <para>
 SHA384 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA384 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA384 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha512Id">xmlSecTransformSha512Id</title>
-<indexterm><primary>xmlSecTransformSha512Id</primary></indexterm><programlisting>#define xmlSecTransformSha512Id			xmlSecTransformSha512GetKlass()
+<refsect2 id="xmlSecTransformSha512Id" role="macro">
+<title>xmlSecTransformSha512Id</title>
+<indexterm zone="xmlSecTransformSha512Id"><primary sortas="xmlSecTransformSha512Id">xmlSecTransformSha512Id</primary></indexterm><programlisting>#define xmlSecTransformSha512Id			xmlSecTransformSha512GetKlass()
 </programlisting>
 <para>
 The SHA512 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass ()</title>
-<indexterm><primary>xmlSecTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformSha512GetKlass" role="function">
+<title>xmlSecTransformSha512GetKlass ()</title>
+<indexterm zone="xmlSecTransformSha512GetKlass"><primary sortas="xmlSecTransformSha512GetKlass">xmlSecTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformSha512GetKlass       (void);</programlisting>
 <para>
 SHA512 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA512 digest transform klass or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA512 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppInit">xmlSecCryptoAppInit ()</title>
-<indexterm><primary>xmlSecCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppInit             (const <link linkend="char">char</link> *config);</programlisting>
+<refsect2 id="xmlSecCryptoAppInit" role="function">
+<title>xmlSecCryptoAppInit ()</title>
+<indexterm zone="xmlSecCryptoAppInit"><primary sortas="xmlSecCryptoAppInit">xmlSecCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppInit                 (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the path to crypto library configuration.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown ()</title>
-<indexterm><primary>xmlSecCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppShutdown         (void);</programlisting>
+<refsect2 id="xmlSecCryptoAppShutdown" role="function">
+<title>xmlSecCryptoAppShutdown ()</title>
+<indexterm zone="xmlSecCryptoAppShutdown"><primary sortas="xmlSecCryptoAppShutdown">xmlSecCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppShutdown             (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit ()</title>
-<indexterm><primary>xmlSecCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppDefaultKeysMngrInit
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecCryptoAppDefaultKeysMngrInit" role="function">
+<title>xmlSecCryptoAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrInit"><primary sortas="xmlSecCryptoAppDefaultKeysMngrInit">xmlSecCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrInit  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
 and a default crypto key data stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm><primary>xmlSecCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppDefaultKeysMngrAdoptKey
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecCryptoAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecCryptoAppDefaultKeysMngrAdoptKey">xmlSecCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecCryptoAppDefaultKeysMngrInit"><type>xmlSecCryptoAppDefaultKeysMngrInit</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad ()</title>
-<indexterm><primary>xmlSecCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppDefaultKeysMngrLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecCryptoAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecCryptoAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrLoad"><primary sortas="xmlSecCryptoAppDefaultKeysMngrLoad">xmlSecCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created 
 with <link linkend="xmlSecCryptoAppDefaultKeysMngrInit"><type>xmlSecCryptoAppDefaultKeysMngrInit</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave ()</title>
-<indexterm><primary>xmlSecCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppDefaultKeysMngrSave
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecCryptoAppDefaultKeysMngrSave" role="function">
+<title>xmlSecCryptoAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecCryptoAppDefaultKeysMngrSave"><primary sortas="xmlSecCryptoAppDefaultKeysMngrSave">xmlSecCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppDefaultKeysMngrSave  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the destination filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad ()</title>
-<indexterm><primary>xmlSecCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppKeysMngrCertLoad (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeysMngrCertLoad" role="function">
+<title>xmlSecCryptoAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoad"><primary sortas="xmlSecCryptoAppKeysMngrCertLoad">xmlSecCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeysMngrCertLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory ()</title>
-<indexterm><primary>xmlSecCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppKeysMngrCertLoadMemory
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecCryptoAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemory"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMemory">xmlSecCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeysMngrCertLoadMemory
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from binary buffer <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecCryptoAppKeyLoad         (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyLoad" role="function">
+<title>xmlSecCryptoAppKeyLoad ()</title>
+<indexterm zone="xmlSecCryptoAppKeyLoad"><primary sortas="xmlSecCryptoAppKeyLoad">xmlSecCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppKeyLoad              (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecCryptoAppKeyLoadMemory   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyLoadMemory" role="function">
+<title>xmlSecCryptoAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecCryptoAppKeyLoadMemory"><primary sortas="xmlSecCryptoAppKeyLoadMemory">xmlSecCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppKeyLoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the memory buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the size of binary key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load ()</title>
-<indexterm><primary>xmlSecCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecCryptoAppPkcs12Load      (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppPkcs12Load" role="function">
+<title>xmlSecCryptoAppPkcs12Load ()</title>
+<indexterm zone="xmlSecCryptoAppPkcs12Load"><primary sortas="xmlSecCryptoAppPkcs12Load">xmlSecCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppPkcs12Load           (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory ()</title>
-<indexterm><primary>xmlSecCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecCryptoAppPkcs12LoadMemory
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppPkcs12LoadMemory" role="function">
+<title>xmlSecCryptoAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMemory"><primary sortas="xmlSecCryptoAppPkcs12LoadMemory">xmlSecCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecCryptoAppPkcs12LoadMemory     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecCryptoAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppKeyCertLoad      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyCertLoad" role="function">
+<title>xmlSecCryptoAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecCryptoAppKeyCertLoad"><primary sortas="xmlSecCryptoAppKeyCertLoad">xmlSecCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeyCertLoad          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoAppKeyCertLoadMemory
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyCertLoadMemory" role="function">
+<title>xmlSecCryptoAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMemory"><primary sortas="xmlSecCryptoAppKeyCertLoadMemory">xmlSecCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoAppKeyCertLoadMemory    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from memory buffer and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback ()</title>
-<indexterm><primary>xmlSecCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*       xmlSecCryptoAppGetDefaultPwdCallback
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoAppGetDefaultPwdCallback" role="function">
+<title>xmlSecCryptoAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecCryptoAppGetDefaultPwdCallback"><primary sortas="xmlSecCryptoAppGetDefaultPwdCallback">xmlSecCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecCryptoAppGetDefaultPwdCallback
+                                                        (void);</programlisting>
 <para>
 Gets default password callback.</para>
 <para>
-
-</para></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/base64.sgml b/docs/api/sgml/base64.sgml
index 05f1a33..432b497 100644
--- a/docs/api/sgml/base64.sgml
+++ b/docs/api/sgml/base64.sgml
@@ -1,44 +1,43 @@
 <refentry id="xmlsec-base64">
 <refmeta>
-<refentrytitle>base64</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-base64.top_of_page">base64</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>base64</refname><refpurpose>Base64 encoding/decoding functions.</refpurpose>
+<refname>base64</refname>
+<refpurpose>Base64 encoding/decoding functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-base64.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC_BASE64_LINESIZE</link>
-<link linkend="int">int</link>         <link linkend="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</link>  (void);
-<link linkend="void">void</link>        <link linkend="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</link>  (<link linkend="int">int</link> columns);
-<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> <link linkend="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</link>    (<link linkend="int">int</link> encode,
-                                             <link linkend="int">int</link> columns);
-<link linkend="void">void</link>        <link linkend="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</link>          (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</link>       (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             <link linkend="int">int</link> encode,
-                                             <link linkend="int">int</link> columns);
-<link linkend="void">void</link>        <link linkend="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</link>         (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</link>           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *in,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> inSize,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> outSize);
-<link linkend="int">int</link>         <link linkend="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</link>            (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> outSize);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecBase64Encode">xmlSecBase64Encode</link>              (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len,
-                                             <link linkend="int">int</link> columns);
-<link linkend="int">int</link>         <link linkend="xmlSecBase64Decode">xmlSecBase64Decode</link>              (const <link linkend="xmlChar">xmlChar</link> *str,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);
+#define             <link linkend="XMLSEC-BASE64-LINESIZE--CAPS">XMLSEC_BASE64_LINESIZE</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</link>      (void);
+<link linkend="void">void</link>                <link linkend="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</link>      (<link linkend="int">int</link> columns);
+<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link>  <link linkend="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</link>               (<link linkend="int">int</link> encode,
+                                                         <link linkend="int">int</link> columns);
+<link linkend="void">void</link>                <link linkend="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</link>              (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
+<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</link>           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         <link linkend="int">int</link> encode,
+                                                         <link linkend="int">int</link> columns);
+<link linkend="void">void</link>                <link linkend="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</link>             (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);
+<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</link>               (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *in,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> inSize,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</link>                (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBase64Encode">xmlSecBase64Encode</link>                  (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len,
+                                                         <link linkend="int">int</link> columns);
+<link linkend="int">int</link>                 <link linkend="xmlSecBase64Decode">xmlSecBase64Decode</link>                  (const <link linkend="xmlChar">xmlChar</link> *str,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
 </synopsis>
 </refsynopsisdiv>
 
@@ -50,214 +49,203 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-base64.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Base64 encoding/decoding functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC_BASE64_LINESIZE</title>
-<indexterm><primary>XMLSEC_BASE64_LINESIZE</primary></indexterm><programlisting>#define XMLSEC_BASE64_LINESIZE				64
+<refsect1 id="xmlsec-base64.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-BASE64-LINESIZE--CAPS" role="macro">
+<title>XMLSEC_BASE64_LINESIZE</title>
+<indexterm zone="XMLSEC-BASE64-LINESIZE--CAPS"><primary sortas="XMLSEC_BASE64_LINESIZE">XMLSEC_BASE64_LINESIZE</primary></indexterm><programlisting>#define XMLSEC_BASE64_LINESIZE				64
 </programlisting>
 <para>
 The default maximum base64 encoded line size.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize ()</title>
-<indexterm><primary>xmlSecBase64GetDefaultLineSize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64GetDefaultLineSize  (void);</programlisting>
+<refsect2 id="xmlSecBase64GetDefaultLineSize" role="function">
+<title>xmlSecBase64GetDefaultLineSize ()</title>
+<indexterm zone="xmlSecBase64GetDefaultLineSize"><primary sortas="xmlSecBase64GetDefaultLineSize">xmlSecBase64GetDefaultLineSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64GetDefaultLineSize      (void);</programlisting>
 <para>
 Gets the current default line size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the current default line size.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the current default line size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize ()</title>
-<indexterm><primary>xmlSecBase64SetDefaultLineSize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBase64SetDefaultLineSize  (<link linkend="int">int</link> columns);</programlisting>
+<refsect2 id="xmlSecBase64SetDefaultLineSize" role="function">
+<title>xmlSecBase64SetDefaultLineSize ()</title>
+<indexterm zone="xmlSecBase64SetDefaultLineSize"><primary sortas="xmlSecBase64SetDefaultLineSize">xmlSecBase64SetDefaultLineSize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64SetDefaultLineSize      (<link linkend="int">int</link> columns);</programlisting>
 <para>
 Sets the current default line size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>columns</parameter>&#160;:</term>
 <listitem><simpara> number of columns
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate ()</title>
-<indexterm><primary>xmlSecBase64CtxCreate</primary></indexterm><programlisting><link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> xmlSecBase64CtxCreate    (<link linkend="int">int</link> encode,
-                                             <link linkend="int">int</link> columns);</programlisting>
+<refsect2 id="xmlSecBase64CtxCreate" role="function">
+<title>xmlSecBase64CtxCreate ()</title>
+<indexterm zone="xmlSecBase64CtxCreate"><primary sortas="xmlSecBase64CtxCreate">xmlSecBase64CtxCreate</primary></indexterm><programlisting><link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link>  xmlSecBase64CtxCreate               (<link linkend="int">int</link> encode,
+                                                         <link linkend="int">int</link> columns);</programlisting>
 <para>
 Allocates and initializes new base64 context.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encode</parameter>&#160;:</term>
 <listitem><simpara>		the encode/decode flag (1 - encode, 0 - decode) 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>columns</parameter>&#160;:</term>
 <listitem><simpara> 		the max line length.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to newly created <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly created <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy ()</title>
-<indexterm><primary>xmlSecBase64CtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBase64CtxDestroy          (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecBase64CtxDestroy" role="function">
+<title>xmlSecBase64CtxDestroy ()</title>
+<indexterm zone="xmlSecBase64CtxDestroy"><primary sortas="xmlSecBase64CtxDestroy">xmlSecBase64CtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64CtxDestroy              (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
 <para>
 Destroys base64 context.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize ()</title>
-<indexterm><primary>xmlSecBase64CtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64CtxInitialize       (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             <link linkend="int">int</link> encode,
-                                             <link linkend="int">int</link> columns);</programlisting>
+<refsect2 id="xmlSecBase64CtxInitialize" role="function">
+<title>xmlSecBase64CtxInitialize ()</title>
+<indexterm zone="xmlSecBase64CtxInitialize"><primary sortas="xmlSecBase64CtxInitialize">xmlSecBase64CtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxInitialize           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         <link linkend="int">int</link> encode,
+                                                         <link linkend="int">int</link> columns);</programlisting>
 <para>
 Initializes new base64 context.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>encode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encode</parameter>&#160;:</term>
 <listitem><simpara>		the encode/decode flag (1 - encode, 0 - decode) 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>columns</parameter>&#160;:</term>
 <listitem><simpara> 		the max line length.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize ()</title>
-<indexterm><primary>xmlSecBase64CtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBase64CtxFinalize         (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecBase64CtxFinalize" role="function">
+<title>xmlSecBase64CtxFinalize ()</title>
+<indexterm zone="xmlSecBase64CtxFinalize"><primary sortas="xmlSecBase64CtxFinalize">xmlSecBase64CtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBase64CtxFinalize             (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx);</programlisting>
 <para>
 Frees all the resources allocated by <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate ()</title>
-<indexterm><primary>xmlSecBase64CtxUpdate</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64CtxUpdate           (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *in,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> inSize,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
+<refsect2 id="xmlSecBase64CtxUpdate" role="function">
+<title>xmlSecBase64CtxUpdate ()</title>
+<indexterm zone="xmlSecBase64CtxUpdate"><primary sortas="xmlSecBase64CtxUpdate">xmlSecBase64CtxUpdate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxUpdate               (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *in,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> inSize,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
 <para>
 Encodes or decodes the next piece of data from input buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>in</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>in</parameter>&#160;:</term>
 <listitem><simpara>			the input buffer
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>inSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>inSize</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer size
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>out</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>out</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>outSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>outSize</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer size
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of bytes written to output buffer or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to output buffer or 
 -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal ()</title>
-<indexterm><primary>xmlSecBase64CtxFinal</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64CtxFinal            (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *out,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
+<refsect2 id="xmlSecBase64CtxFinal" role="function">
+<title>xmlSecBase64CtxFinal ()</title>
+<indexterm zone="xmlSecBase64CtxFinal"><primary sortas="xmlSecBase64CtxFinal">xmlSecBase64CtxFinal</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64CtxFinal                (<link linkend="xmlSecBase64Ctx">xmlSecBase64CtxPtr</link> ctx,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *out,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> outSize);</programlisting>
 <para>
 Encodes or decodes the last piece of data stored in the context
 and finalizes the result.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <link linkend="xmlSecBase64Ctx"><type>xmlSecBase64Ctx</type></link> structure
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>out</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>out</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>outSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>outSize</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer size
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of bytes written to output buffer or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to output buffer or 
 -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64Encode">xmlSecBase64Encode ()</title>
-<indexterm><primary>xmlSecBase64Encode</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecBase64Encode              (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len,
-                                             <link linkend="int">int</link> columns);</programlisting>
+<refsect2 id="xmlSecBase64Encode" role="function">
+<title>xmlSecBase64Encode ()</title>
+<indexterm zone="xmlSecBase64Encode"><primary sortas="xmlSecBase64Encode">xmlSecBase64Encode</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBase64Encode                  (const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len,
+                                                         <link linkend="int">int</link> columns);</programlisting>
 <para>
 Encodes the data from input buffer and allocates the string for the result.
 The caller is responsible for freeing returned buffer using
 <link linkend="xmlFree"><function>xmlFree()</function></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>len</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>len</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>columns</parameter>&#160;:</term>
 <listitem><simpara> 		the output max line length (if 0 then no line breaks
          		would be inserted)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>newly allocated string with base64 encoded data 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> newly allocated string with base64 encoded data 
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBase64Decode">xmlSecBase64Decode ()</title>
-<indexterm><primary>xmlSecBase64Decode</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBase64Decode              (const <link linkend="xmlChar">xmlChar</link> *str,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<refsect2 id="xmlSecBase64Decode" role="function">
+<title>xmlSecBase64Decode ()</title>
+<indexterm zone="xmlSecBase64Decode"><primary sortas="xmlSecBase64Decode">xmlSecBase64Decode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBase64Decode                  (const <link linkend="xmlChar">xmlChar</link> *str,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
 <para>
 Decodes input base64 encoded string and puts result into
 the output buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer with base64 encoded string
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>len</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>len</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer size
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of bytes written to the output buffer or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of bytes written to the output buffer or 
 a negative value if an error occurs 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/bn.sgml b/docs/api/sgml/bn.sgml
index 0db2289..d31e9af 100644
--- a/docs/api/sgml/bn.sgml
+++ b/docs/api/sgml/bn.sgml
@@ -1,72 +1,71 @@
 <refentry id="xmlsec-bn">
 <refmeta>
-<refentrytitle>bn</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-bn.top_of_page">bn</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>bn</refname><refpurpose>Big numbers support functions.</refpurpose>
+<refname>bn</refname>
+<refpurpose>Big numbers support functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-bn.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-enum        <link linkend="xmlSecBnFormat">xmlSecBnFormat</link>;
-<link linkend="xmlSecBn">xmlSecBnPtr</link> <link linkend="xmlSecBnCreate">xmlSecBnCreate</link>                  (<link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecBnDestroy">xmlSecBnDestroy</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnInitialize">xmlSecBnInitialize</link>              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecBnFinalize">xmlSecBnFinalize</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="xmlSecByte">xmlSecByte</link>* <link linkend="xmlSecBnGetData">xmlSecBnGetData</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnSetData">xmlSecBnSetData</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecBnGetSize">xmlSecBnGetSize</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="void">void</link>        <link linkend="xmlSecBnZero">xmlSecBnZero</link>                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnFromString">xmlSecBnFromString</link>              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> base);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecBnToString">xmlSecBnToString</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> base);
-<link linkend="int">int</link>         <link linkend="xmlSecBnFromHexString">xmlSecBnFromHexString</link>           (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecBnToHexString">xmlSecBnToHexString</link>             (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnFromDecString">xmlSecBnFromDecString</link>           (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecBnToDecString">xmlSecBnToDecString</link>             (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnMul">xmlSecBnMul</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> multiplier);
-<link linkend="int">int</link>         <link linkend="xmlSecBnDiv">xmlSecBnDiv</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> divider,
-                                             <link linkend="int">int</link> *mod);
-<link linkend="int">int</link>         <link linkend="xmlSecBnAdd">xmlSecBnAdd</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> delta);
-<link linkend="int">int</link>         <link linkend="xmlSecBnReverse">xmlSecBnReverse</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
-<link linkend="int">int</link>         <link linkend="xmlSecBnCompare">xmlSecBnCompare</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>         <link linkend="xmlSecBnCompareReverse">xmlSecBnCompareReverse</link>          (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>         <link linkend="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</link>            (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse);
-<link linkend="int">int</link>         <link linkend="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</link>            (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse,
-                                             <link linkend="int">int</link> addLineBreaks);
-<link linkend="int">int</link>         <link linkend="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse,
-                                             <link linkend="int">int</link> addLineBreaks);
+enum                <link linkend="xmlSecBnFormat">xmlSecBnFormat</link>;
+<link linkend="xmlSecBn">xmlSecBnPtr</link>         <link linkend="xmlSecBnCreate">xmlSecBnCreate</link>                      (<link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecBnDestroy">xmlSecBnDestroy</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnInitialize">xmlSecBnInitialize</link>                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecBnFinalize">xmlSecBnFinalize</link>                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="xmlSecByte">xmlSecByte</link>*         <link linkend="xmlSecBnGetData">xmlSecBnGetData</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnSetData">xmlSecBnSetData</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBnGetSize">xmlSecBnGetSize</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="void">void</link>                <link linkend="xmlSecBnZero">xmlSecBnZero</link>                        (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnFromString">xmlSecBnFromString</link>                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToString">xmlSecBnToString</link>                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnFromHexString">xmlSecBnFromHexString</link>               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToHexString">xmlSecBnToHexString</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnFromDecString">xmlSecBnFromDecString</link>               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecBnToDecString">xmlSecBnToDecString</link>                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnMul">xmlSecBnMul</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> multiplier);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnDiv">xmlSecBnDiv</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> divider,
+                                                         <link linkend="int">int</link> *mod);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnAdd">xmlSecBnAdd</link>                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> delta);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnReverse">xmlSecBnReverse</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnCompare">xmlSecBnCompare</link>                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnCompareReverse">xmlSecBnCompareReverse</link>              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</link>                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse,
+                                                         <link linkend="int">int</link> addLineBreaks);
+<link linkend="int">int</link>                 <link linkend="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</link>            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse,
+                                                         <link linkend="int">int</link> addLineBreaks);
 </synopsis>
 </refsynopsisdiv>
 
@@ -78,18 +77,18 @@ enum        <link linkend="xmlSecBnFormat">xmlSecBnFormat</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-bn.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Big numbers support functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecBnFormat">enum xmlSecBnFormat</title>
-<indexterm><primary>xmlSecBnFormat</primary></indexterm><programlisting>typedef enum {
+<refsect1 id="xmlsec-bn.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecBnFormat" role="enum">
+<title>enum xmlSecBnFormat</title>
+<indexterm zone="xmlSecBnFormat"><primary sortas="xmlSecBnFormat">xmlSecBnFormat</primary></indexterm><programlisting>typedef enum {
     xmlSecBnBase64,
     xmlSecBnHex,
     xmlSecBnDec
@@ -98,459 +97,435 @@ Big numbers support functions.
 <para>
 The big numbers formats.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecBnBase64" role="constant">
 <term><literal>xmlSecBnBase64</literal></term>
 <listitem><simpara>		the base64 decoded binary blob.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecBnHex" role="constant">
 <term><literal>xmlSecBnHex</literal></term>
 <listitem><simpara>		the hex number.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecBnDec" role="constant">
 <term><literal>xmlSecBnDec</literal></term>
 <listitem><simpara>		the decimal number.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnCreate">xmlSecBnCreate ()</title>
-<indexterm><primary>xmlSecBnCreate</primary></indexterm><programlisting><link linkend="xmlSecBn">xmlSecBnPtr</link> xmlSecBnCreate                  (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBnCreate" role="function">
+<title>xmlSecBnCreate ()</title>
+<indexterm zone="xmlSecBnCreate"><primary sortas="xmlSecBnCreate">xmlSecBnCreate</primary></indexterm><programlisting><link linkend="xmlSecBn">xmlSecBnPtr</link>         xmlSecBnCreate                      (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Creates a new BN object. Caller is responsible for destroying it
 by calling <parameter>xmlSecBnDestroy</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>	the initial allocated BN size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the newly BN or a NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the newly BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnDestroy">xmlSecBnDestroy ()</title>
-<indexterm><primary>xmlSecBnDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBnDestroy                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnDestroy" role="function">
+<title>xmlSecBnDestroy ()</title>
+<indexterm zone="xmlSecBnDestroy"><primary sortas="xmlSecBnDestroy">xmlSecBnDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnDestroy                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnCreate</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnInitialize">xmlSecBnInitialize ()</title>
-<indexterm><primary>xmlSecBnInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnInitialize              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBnInitialize" role="function">
+<title>xmlSecBnInitialize ()</title>
+<indexterm zone="xmlSecBnInitialize"><primary sortas="xmlSecBnInitialize">xmlSecBnInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnInitialize                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Initializes a BN object. Caller is responsible for destroying it
 by calling <parameter>xmlSecBnFinalize</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>	the initial allocated BN size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnFinalize">xmlSecBnFinalize ()</title>
-<indexterm><primary>xmlSecBnFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBnFinalize                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnFinalize" role="function">
+<title>xmlSecBnFinalize ()</title>
+<indexterm zone="xmlSecBnFinalize"><primary sortas="xmlSecBnFinalize">xmlSecBnFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnFinalize                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Destroys <parameter>bn</parameter> object created with <parameter>xmlSecBnInitialize</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnGetData">xmlSecBnGetData ()</title>
-<indexterm><primary>xmlSecBnGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>* xmlSecBnGetData                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnGetData" role="function">
+<title>xmlSecBnGetData ()</title>
+<indexterm zone="xmlSecBnGetData"><primary sortas="xmlSecBnGetData">xmlSecBnGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>*         xmlSecBnGetData                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Gets pointer to the binary <parameter>bn</parameter> representation.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to binary BN data or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to binary BN data or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnSetData">xmlSecBnSetData ()</title>
-<indexterm><primary>xmlSecBnSetData</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnSetData                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBnSetData" role="function">
+<title>xmlSecBnSetData ()</title>
+<indexterm zone="xmlSecBnSetData"><primary sortas="xmlSecBnSetData">xmlSecBnSetData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnSetData                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Sets the value of <parameter>bn</parameter> to <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to new BN binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>	the size of new BN data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnGetSize">xmlSecBnGetSize ()</title>
-<indexterm><primary>xmlSecBnGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecBnGetSize                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnGetSize" role="function">
+<title>xmlSecBnGetSize ()</title>
+<indexterm zone="xmlSecBnGetSize"><primary sortas="xmlSecBnGetSize">xmlSecBnGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBnGetSize                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Gets the size of binary data in <parameter>bn</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the size of binary data.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the size of binary data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnZero">xmlSecBnZero ()</title>
-<indexterm><primary>xmlSecBnZero</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBnZero                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnZero" role="function">
+<title>xmlSecBnZero ()</title>
+<indexterm zone="xmlSecBnZero"><primary sortas="xmlSecBnZero">xmlSecBnZero</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBnZero                        (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Sets the value of <parameter>bn</parameter> to zero.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnFromString">xmlSecBnFromString ()</title>
-<indexterm><primary>xmlSecBnFromString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnFromString              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
+<refsect2 id="xmlSecBnFromString" role="function">
+<title>xmlSecBnFromString ()</title>
+<indexterm zone="xmlSecBnFromString"><primary sortas="xmlSecBnFromString">xmlSecBnFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromString                  (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
 <para>
 Reads <parameter>bn</parameter> from string <parameter>str</parameter> assuming it has base <parameter>base</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara>	the string with BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>base</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>base</parameter>&#160;:</term>
 <listitem><simpara>	the base for <parameter>str</parameter>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnToString">xmlSecBnToString ()</title>
-<indexterm><primary>xmlSecBnToString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecBnToString                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
+<refsect2 id="xmlSecBnToString" role="function">
+<title>xmlSecBnToString ()</title>
+<indexterm zone="xmlSecBnToString"><primary sortas="xmlSecBnToString">xmlSecBnToString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToString                    (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> base);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to string with base <parameter>base</parameter>. Caller is responsible for 
 freeing returned string with <parameter>xmlFree</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>base</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>base</parameter>&#160;:</term>
 <listitem><simpara>	the base for returned string.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the string represenataion if BN or a NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnFromHexString">xmlSecBnFromHexString ()</title>
-<indexterm><primary>xmlSecBnFromHexString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnFromHexString           (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
+<refsect2 id="xmlSecBnFromHexString" role="function">
+<title>xmlSecBnFromHexString ()</title>
+<indexterm zone="xmlSecBnFromHexString"><primary sortas="xmlSecBnFromHexString">xmlSecBnFromHexString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromHexString               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
 <para>
 Reads <parameter>bn</parameter> from hex string <parameter>str</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara>	the string with BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnToHexString">xmlSecBnToHexString ()</title>
-<indexterm><primary>xmlSecBnToHexString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecBnToHexString             (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnToHexString" role="function">
+<title>xmlSecBnToHexString ()</title>
+<indexterm zone="xmlSecBnToHexString"><primary sortas="xmlSecBnToHexString">xmlSecBnToHexString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToHexString                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to hex string. Caller is responsible for 
 freeing returned string with <parameter>xmlFree</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the string represenataion if BN or a NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnFromDecString">xmlSecBnFromDecString ()</title>
-<indexterm><primary>xmlSecBnFromDecString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnFromDecString           (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
+<refsect2 id="xmlSecBnFromDecString" role="function">
+<title>xmlSecBnFromDecString ()</title>
+<indexterm zone="xmlSecBnFromDecString"><primary sortas="xmlSecBnFromDecString">xmlSecBnFromDecString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnFromDecString               (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
 <para>
 Reads <parameter>bn</parameter> from decimal string <parameter>str</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara>	the string with BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnToDecString">xmlSecBnToDecString ()</title>
-<indexterm><primary>xmlSecBnToDecString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecBnToDecString             (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnToDecString" role="function">
+<title>xmlSecBnToDecString ()</title>
+<indexterm zone="xmlSecBnToDecString"><primary sortas="xmlSecBnToDecString">xmlSecBnToDecString</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecBnToDecString                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Writes <parameter>bn</parameter> to decimal string. Caller is responsible for 
 freeing returned string with <parameter>xmlFree</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the string represenataion if BN or a NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the string represenataion if BN or a NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnMul">xmlSecBnMul ()</title>
-<indexterm><primary>xmlSecBnMul</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnMul                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> multiplier);</programlisting>
+<refsect2 id="xmlSecBnMul" role="function">
+<title>xmlSecBnMul ()</title>
+<indexterm zone="xmlSecBnMul"><primary sortas="xmlSecBnMul">xmlSecBnMul</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnMul                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> multiplier);</programlisting>
 <para>
 Multiplies <parameter>bn</parameter> with <parameter>multiplier</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>multiplier</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>multiplier</parameter>&#160;:</term>
 <listitem><simpara>		the multiplier.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnDiv">xmlSecBnDiv ()</title>
-<indexterm><primary>xmlSecBnDiv</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnDiv                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> divider,
-                                             <link linkend="int">int</link> *mod);</programlisting>
+<refsect2 id="xmlSecBnDiv" role="function">
+<title>xmlSecBnDiv ()</title>
+<indexterm zone="xmlSecBnDiv"><primary sortas="xmlSecBnDiv">xmlSecBnDiv</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnDiv                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> divider,
+                                                         <link linkend="int">int</link> *mod);</programlisting>
 <para>
 Divides <parameter>bn</parameter> by <parameter>divider</parameter> and places modulus into <parameter>mod</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>divider</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>divider</parameter>&#160;:</term>
 <listitem><simpara>	the divider
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mod</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mod</parameter>&#160;:</term>
 <listitem><simpara>	the pointer for modulus result.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnAdd">xmlSecBnAdd ()</title>
-<indexterm><primary>xmlSecBnAdd</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnAdd                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="int">int</link> delta);</programlisting>
+<refsect2 id="xmlSecBnAdd" role="function">
+<title>xmlSecBnAdd ()</title>
+<indexterm zone="xmlSecBnAdd"><primary sortas="xmlSecBnAdd">xmlSecBnAdd</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnAdd                         (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="int">int</link> delta);</programlisting>
 <para>
 Adds <parameter>delta</parameter> to <parameter>bn</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>delta</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>delta</parameter>&#160;:</term>
 <listitem><simpara>	the delta.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnReverse">xmlSecBnReverse ()</title>
-<indexterm><primary>xmlSecBnReverse</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnReverse                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
+<refsect2 id="xmlSecBnReverse" role="function">
+<title>xmlSecBnReverse ()</title>
+<indexterm zone="xmlSecBnReverse"><primary sortas="xmlSecBnReverse">xmlSecBnReverse</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnReverse                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn);</programlisting>
 <para>
 Reverses bytes order in <parameter>bn</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnCompare">xmlSecBnCompare ()</title>
-<indexterm><primary>xmlSecBnCompare</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnCompare                 (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
+<refsect2 id="xmlSecBnCompare" role="function">
+<title>xmlSecBnCompare ()</title>
+<indexterm zone="xmlSecBnCompare"><primary sortas="xmlSecBnCompare">xmlSecBnCompare</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnCompare                     (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
 <para>
 Compares the <parameter>bn</parameter> with <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>	the data to compare BN to.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>	the <parameter>data</parameter> size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
 is greater than <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnCompareReverse">xmlSecBnCompareReverse ()</title>
-<indexterm><primary>xmlSecBnCompareReverse</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnCompareReverse          (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
+<refsect2 id="xmlSecBnCompareReverse" role="function">
+<title>xmlSecBnCompareReverse ()</title>
+<indexterm zone="xmlSecBnCompareReverse"><primary sortas="xmlSecBnCompareReverse">xmlSecBnCompareReverse</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnCompareReverse              (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
 <para>
 Compares the <parameter>bn</parameter> with reverse <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>	the data to compare BN to.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>	the <parameter>data</parameter> size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 if data is equal, negative value if <parameter>bn</parameter> is less or positive value if <parameter>bn</parameter>
 is greater than <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue ()</title>
-<indexterm><primary>xmlSecBnGetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnGetNodeValue            (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse);</programlisting>
+<refsect2 id="xmlSecBnGetNodeValue" role="function">
+<title>xmlSecBnGetNodeValue ()</title>
+<indexterm zone="xmlSecBnGetNodeValue"><primary sortas="xmlSecBnGetNodeValue">xmlSecBnGetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnGetNodeValue                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse);</programlisting>
 <para>
 Converts the node content from <parameter>format</parameter> to <parameter>bn</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara>	the poitner to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>	the BN format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reverse</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reverse</parameter>&#160;:</term>
 <listitem><simpara>	if set then reverse read buffer after reading.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative values if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative values if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue ()</title>
-<indexterm><primary>xmlSecBnSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnSetNodeValue            (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse,
-                                             <link linkend="int">int</link> addLineBreaks);</programlisting>
+<refsect2 id="xmlSecBnSetNodeValue" role="function">
+<title>xmlSecBnSetNodeValue ()</title>
+<indexterm zone="xmlSecBnSetNodeValue"><primary sortas="xmlSecBnSetNodeValue">xmlSecBnSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnSetNodeValue                (<link linkend="xmlSecBn">xmlSecBnPtr</link> bn,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse,
+                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
 <para>
 Converts the <parameter>bn</parameter> and sets it to node content.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bn</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bn</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to BN.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara>		the poitner to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the BN format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reverse</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reverse</parameter>&#160;:</term>
 <listitem><simpara>		the flag that indicates whether to reverse the buffer before writing.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>addLineBreaks</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
 <listitem><simpara>  	the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative values if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative values if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue ()</title>
-<indexterm><primary>xmlSecBnBlobSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBnBlobSetNodeValue        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
-                                             <link linkend="int">int</link> reverse,
-                                             <link linkend="int">int</link> addLineBreaks);</programlisting>
+<refsect2 id="xmlSecBnBlobSetNodeValue" role="function">
+<title>xmlSecBnBlobSetNodeValue ()</title>
+<indexterm zone="xmlSecBnBlobSetNodeValue"><primary sortas="xmlSecBnBlobSetNodeValue">xmlSecBnBlobSetNodeValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBnBlobSetNodeValue            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlSecBnFormat">xmlSecBnFormat</link> format,
+                                                         <link linkend="int">int</link> reverse,
+                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
 <para>
 Converts the <parameter>blob</parameter> and sets it to node content.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to BN blob.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>	the size of BN blob.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara>	the poitner to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>	the BN format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reverse</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reverse</parameter>&#160;:</term>
 <listitem><simpara>	the flag that indicates whether to reverse the buffer before writing.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>addLineBreaks</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
 <listitem><simpara>  if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative values if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative values if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/buffer.sgml b/docs/api/sgml/buffer.sgml
index 7de49d6..b8cf659 100644
--- a/docs/api/sgml/buffer.sgml
+++ b/docs/api/sgml/buffer.sgml
@@ -1,61 +1,57 @@
 <refentry id="xmlsec-buffer">
 <refmeta>
-<refentrytitle>buffer</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-buffer.top_of_page">buffer</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>buffer</refname><refpurpose>Binary buffer implementation.</refpurpose>
+<refname>buffer</refname>
+<refpurpose>Binary buffer implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-buffer.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-enum        <link linkend="xmlSecAllocMode">xmlSecAllocMode</link>;
-struct      <link linkend="xmlSecBuffer">xmlSecBuffer</link>;
-<link linkend="void">void</link>        <link linkend="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</link> (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecBufferCreate">xmlSecBufferCreate</link>          (<link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecBufferDestroy">xmlSecBufferDestroy</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferInitialize">xmlSecBufferInitialize</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecBufferFinalize">xmlSecBufferFinalize</link>            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="xmlSecByte">xmlSecByte</link>* <link linkend="xmlSecBufferGetData">xmlSecBufferGetData</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferSetData">xmlSecBufferSetData</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecBufferGetSize">xmlSecBufferGetSize</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferSetSize">xmlSecBufferSetSize</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecBufferEmpty">xmlSecBufferEmpty</link>               (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferAppend">xmlSecBufferAppend</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferPrepend">xmlSecBufferPrepend</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferReadFile">xmlSecBufferReadFile</link>            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="char">char</link> *filename);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</link>
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</link>
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> columns);
-<link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> <link linkend="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</link>
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+enum                <link linkend="xmlSecAllocMode">xmlSecAllocMode</link>;
+struct              <link linkend="xmlSecBuffer">xmlSecBuffer</link>;
+<link linkend="void">void</link>                <link linkend="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</link>     (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
+<link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     <link linkend="xmlSecBufferCreate">xmlSecBufferCreate</link>                  (<link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecBufferDestroy">xmlSecBufferDestroy</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferInitialize">xmlSecBufferInitialize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecBufferFinalize">xmlSecBufferFinalize</link>                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="xmlSecByte">xmlSecByte</link>*         <link linkend="xmlSecBufferGetData">xmlSecBufferGetData</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetData">xmlSecBufferSetData</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBufferGetSize">xmlSecBufferGetSize</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetSize">xmlSecBufferSetSize</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecBufferEmpty">xmlSecBufferEmpty</link>                   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferAppend">xmlSecBufferAppend</link>                  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferPrepend">xmlSecBufferPrepend</link>                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</link>              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferReadFile">xmlSecBufferReadFile</link>                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="char">char</link> *filename);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</link>   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="int">int</link>                 <link linkend="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</link>  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> columns);
+<link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  <link linkend="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</link>      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);
 </synopsis>
 </refsynopsisdiv>
 
@@ -67,18 +63,18 @@ struct      <link linkend="xmlSecBuffer">xmlSecBuffer</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-buffer.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Binary buffer implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecAllocMode">enum xmlSecAllocMode</title>
-<indexterm><primary>xmlSecAllocMode</primary></indexterm><programlisting>typedef enum {
+<refsect1 id="xmlsec-buffer.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecAllocMode" role="enum">
+<title>enum xmlSecAllocMode</title>
+<indexterm zone="xmlSecAllocMode"><primary sortas="xmlSecAllocMode">xmlSecAllocMode</primary></indexterm><programlisting>typedef enum {
     xmlSecAllocModeExact = 0,
     xmlSecAllocModeDouble
 } xmlSecAllocMode;
@@ -86,25 +82,23 @@ Binary buffer implementation.
 <para>
 The memory allocation mode (used by <parameter>xmlSecBuffer</parameter> and <parameter>xmlSecList</parameter>).</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecAllocModeExact" role="constant">
 <term><literal>xmlSecAllocModeExact</literal></term>
 <listitem><simpara> 	the memory allocation mode that minimizes total 
 			allocated memory size.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecAllocModeDouble" role="constant">
 <term><literal>xmlSecAllocModeDouble</literal></term>
 <listitem><simpara>	the memory allocation mode that tries to minimize
 			the number of malloc calls.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBuffer">struct xmlSecBuffer</title>
-<indexterm><primary>xmlSecBuffer</primary></indexterm><programlisting>struct xmlSecBuffer {
-
+<refsect2 id="xmlSecBuffer" role="struct">
+<title>struct xmlSecBuffer</title>
+<indexterm zone="xmlSecBuffer"><primary sortas="xmlSecBuffer">xmlSecBuffer</primary></indexterm><programlisting>struct xmlSecBuffer {
     xmlSecByte* 	data;
     xmlSecSize 		size;
     xmlSecSize		maxSize;
@@ -114,374 +108,350 @@ The memory allocation mode (used by <parameter>xmlSecBuffer</parameter> and <par
 <para>
 Binary data buffer.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecByte">xmlSecByte</link> *<structfield>data</structfield></term>
+<term><link linkend="xmlSecByte">xmlSecByte</link>&#160;*<structfield>data</structfield>;</term>
 <listitem><simpara> the pointer to buffer data.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>size</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>size</structfield>;</term>
 <listitem><simpara> the current data size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>maxSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>maxSize</structfield>;</term>
 <listitem><simpara> the max data size (allocated buffer size).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link> <structfield>allocMode</structfield></term>
+<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link>&#160;<structfield>allocMode</structfield>;</term>
 <listitem><simpara> the buffer memory allocation mode.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode ()</title>
-<indexterm><primary>xmlSecBufferSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBufferSetDefaultAllocMode (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
+<refsect2 id="xmlSecBufferSetDefaultAllocMode" role="function">
+<title>xmlSecBufferSetDefaultAllocMode ()</title>
+<indexterm zone="xmlSecBufferSetDefaultAllocMode"><primary sortas="xmlSecBufferSetDefaultAllocMode">xmlSecBufferSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferSetDefaultAllocMode     (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
 <para>
 Sets new global default allocation mode and minimal intial size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>defAllocMode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>defAllocMode</parameter>&#160;:</term>
 <listitem><simpara>	the new default buffer allocation mode.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>defInitialSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>defInitialSize</parameter>&#160;:</term>
 <listitem><simpara>	the new default buffer minimal intial size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferCreate">xmlSecBufferCreate ()</title>
-<indexterm><primary>xmlSecBufferCreate</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecBufferCreate          (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferCreate" role="function">
+<title>xmlSecBufferCreate ()</title>
+<indexterm zone="xmlSecBufferCreate"><primary sortas="xmlSecBufferCreate">xmlSecBufferCreate</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     xmlSecBufferCreate                  (<link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Allocates and initalizes new memory buffer with given size.
 Caller is responsible for calling <link linkend="xmlSecBufferDestroy"><type>xmlSecBufferDestroy</type></link> function
 to free the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the intial size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated buffer or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferDestroy">xmlSecBufferDestroy ()</title>
-<indexterm><primary>xmlSecBufferDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBufferDestroy             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferDestroy" role="function">
+<title>xmlSecBufferDestroy ()</title>
+<indexterm zone="xmlSecBufferDestroy"><primary sortas="xmlSecBufferDestroy">xmlSecBufferDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferDestroy                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Desrtoys buffer object created with <link linkend="xmlSecBufferCreate"><type>xmlSecBufferCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferInitialize">xmlSecBufferInitialize ()</title>
-<indexterm><primary>xmlSecBufferInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferInitialize          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferInitialize" role="function">
+<title>xmlSecBufferInitialize ()</title>
+<indexterm zone="xmlSecBufferInitialize"><primary sortas="xmlSecBufferInitialize">xmlSecBufferInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferInitialize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Initializes buffer object <parameter>buf</parameter>. Caller is responsible for calling
 <link linkend="xmlSecBufferFinalize"><type>xmlSecBufferFinalize</type></link> function to free allocated resources.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the initial buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferFinalize">xmlSecBufferFinalize ()</title>
-<indexterm><primary>xmlSecBufferFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBufferFinalize            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferFinalize" role="function">
+<title>xmlSecBufferFinalize ()</title>
+<indexterm zone="xmlSecBufferFinalize"><primary sortas="xmlSecBufferFinalize">xmlSecBufferFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferFinalize                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Frees allocated resource for a buffer intialized with <link linkend="xmlSecBufferInitialize"><type>xmlSecBufferInitialize</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferGetData">xmlSecBufferGetData ()</title>
-<indexterm><primary>xmlSecBufferGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>* xmlSecBufferGetData             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferGetData" role="function">
+<title>xmlSecBufferGetData ()</title>
+<indexterm zone="xmlSecBufferGetData"><primary sortas="xmlSecBufferGetData">xmlSecBufferGetData</primary></indexterm><programlisting><link linkend="xmlSecByte">xmlSecByte</link>*         xmlSecBufferGetData                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Gets pointer to buffer's data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to buffer's data.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to buffer's data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferSetData">xmlSecBufferSetData ()</title>
-<indexterm><primary>xmlSecBufferSetData</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferSetData             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferSetData" role="function">
+<title>xmlSecBufferSetData ()</title>
+<indexterm zone="xmlSecBufferSetData"><primary sortas="xmlSecBufferSetData">xmlSecBufferSetData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetData                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Sets the value of the buffer to <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferGetSize">xmlSecBufferGetSize ()</title>
-<indexterm><primary>xmlSecBufferGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecBufferGetSize             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferGetSize" role="function">
+<title>xmlSecBufferGetSize ()</title>
+<indexterm zone="xmlSecBufferGetSize"><primary sortas="xmlSecBufferGetSize">xmlSecBufferGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBufferGetSize                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Gets the current buffer data size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the current data size.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the current data size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferSetSize">xmlSecBufferSetSize ()</title>
-<indexterm><primary>xmlSecBufferSetSize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferSetSize             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferSetSize" role="function">
+<title>xmlSecBufferSetSize ()</title>
+<indexterm zone="xmlSecBufferSetSize"><primary sortas="xmlSecBufferSetSize">xmlSecBufferSetSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetSize                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Sets new buffer data size. If necessary, buffer grows to 
 have at least <parameter>size</parameter> bytes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the new data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize ()</title>
-<indexterm><primary>xmlSecBufferGetMaxSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecBufferGetMaxSize          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferGetMaxSize" role="function">
+<title>xmlSecBufferGetMaxSize ()</title>
+<indexterm zone="xmlSecBufferGetMaxSize"><primary sortas="xmlSecBufferGetMaxSize">xmlSecBufferGetMaxSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecBufferGetMaxSize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Gets the maximum (allocated) buffer size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the maximum (allocated) buffer size.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the maximum (allocated) buffer size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize ()</title>
-<indexterm><primary>xmlSecBufferSetMaxSize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferSetMaxSize          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferSetMaxSize" role="function">
+<title>xmlSecBufferSetMaxSize ()</title>
+<indexterm zone="xmlSecBufferSetMaxSize"><primary sortas="xmlSecBufferSetMaxSize">xmlSecBufferSetMaxSize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferSetMaxSize              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Sets new buffer maximum size. If necessary, buffer grows to 
 have at least <parameter>size</parameter> bytes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the new maximum size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferEmpty">xmlSecBufferEmpty ()</title>
-<indexterm><primary>xmlSecBufferEmpty</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecBufferEmpty               (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferEmpty" role="function">
+<title>xmlSecBufferEmpty ()</title>
+<indexterm zone="xmlSecBufferEmpty"><primary sortas="xmlSecBufferEmpty">xmlSecBufferEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecBufferEmpty                   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Empties the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferAppend">xmlSecBufferAppend ()</title>
-<indexterm><primary>xmlSecBufferAppend</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferAppend              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferAppend" role="function">
+<title>xmlSecBufferAppend ()</title>
+<indexterm zone="xmlSecBufferAppend"><primary sortas="xmlSecBufferAppend">xmlSecBufferAppend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferAppend                  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Appends the <parameter>data</parameter> after the current data stored in the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferPrepend">xmlSecBufferPrepend ()</title>
-<indexterm><primary>xmlSecBufferPrepend</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferPrepend             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferPrepend" role="function">
+<title>xmlSecBufferPrepend ()</title>
+<indexterm zone="xmlSecBufferPrepend"><primary sortas="xmlSecBufferPrepend">xmlSecBufferPrepend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferPrepend                 (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Prepends the <parameter>data</parameter> before the current data stored in the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead ()</title>
-<indexterm><primary>xmlSecBufferRemoveHead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferRemoveHead          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferRemoveHead" role="function">
+<title>xmlSecBufferRemoveHead ()</title>
+<indexterm zone="xmlSecBufferRemoveHead"><primary sortas="xmlSecBufferRemoveHead">xmlSecBufferRemoveHead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferRemoveHead              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Removes <parameter>size</parameter> bytes from the beginning of the current buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the number of bytes to be removed.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail ()</title>
-<indexterm><primary>xmlSecBufferRemoveTail</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferRemoveTail          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecBufferRemoveTail" role="function">
+<title>xmlSecBufferRemoveTail ()</title>
+<indexterm zone="xmlSecBufferRemoveTail"><primary sortas="xmlSecBufferRemoveTail">xmlSecBufferRemoveTail</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferRemoveTail              (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Removes <parameter>size</parameter> bytes from the end of current buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the number of bytes to be removed.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferReadFile">xmlSecBufferReadFile ()</title>
-<indexterm><primary>xmlSecBufferReadFile</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferReadFile            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             const <link linkend="char">char</link> *filename);</programlisting>
+<refsect2 id="xmlSecBufferReadFile" role="function">
+<title>xmlSecBufferReadFile ()</title>
+<indexterm zone="xmlSecBufferReadFile"><primary sortas="xmlSecBufferReadFile">xmlSecBufferReadFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferReadFile                (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         const <link linkend="char">char</link> *filename);</programlisting>
 <para>
 Reads the content of the file <parameter>filename</parameter> in the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead ()</title>
-<indexterm><primary>xmlSecBufferBase64NodeContentRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferBase64NodeContentRead
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecBufferBase64NodeContentRead" role="function">
+<title>xmlSecBufferBase64NodeContentRead ()</title>
+<indexterm zone="xmlSecBufferBase64NodeContentRead"><primary sortas="xmlSecBufferBase64NodeContentRead">xmlSecBufferBase64NodeContentRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferBase64NodeContentRead   (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Reads the content of the <parameter>node</parameter>, base64 decodes it and stores the
 result in the buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite ()</title>
-<indexterm><primary>xmlSecBufferBase64NodeContentWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecBufferBase64NodeContentWrite
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> columns);</programlisting>
+<refsect2 id="xmlSecBufferBase64NodeContentWrite" role="function">
+<title>xmlSecBufferBase64NodeContentWrite ()</title>
+<indexterm zone="xmlSecBufferBase64NodeContentWrite"><primary sortas="xmlSecBufferBase64NodeContentWrite">xmlSecBufferBase64NodeContentWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecBufferBase64NodeContentWrite  (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> columns);</programlisting>
 <para>
 Sets the content of the <parameter>node</parameter> to the base64 encoded buffer data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to a node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>columns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>columns</parameter>&#160;:</term>
 <listitem><simpara>		the max line size fro base64 encoded data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer ()</title>
-<indexterm><primary>xmlSecBufferCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> xmlSecBufferCreateOutputBuffer
-                                            (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
+<refsect2 id="xmlSecBufferCreateOutputBuffer" role="function">
+<title>xmlSecBufferCreateOutputBuffer ()</title>
+<indexterm zone="xmlSecBufferCreateOutputBuffer"><primary sortas="xmlSecBufferCreateOutputBuffer">xmlSecBufferCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  xmlSecBufferCreateOutputBuffer      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buf);</programlisting>
 <para>
 Creates new LibXML output buffer to store data in the <parameter>buf</parameter>. Caller is 
 responsible for destroying <parameter>buf</parameter> when processing is done.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated output buffer or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated output buffer or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/dl.sgml b/docs/api/sgml/dl.sgml
index 25efffd..55435f0 100644
--- a/docs/api/sgml/dl.sgml
+++ b/docs/api/sgml/dl.sgml
@@ -1,31 +1,29 @@
 <refentry id="xmlsec-dl">
 <refmeta>
-<refentrytitle>dl</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-dl.top_of_page">dl</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>dl</refname><refpurpose>Dynamic crypto-engine library loading support.</refpurpose>
+<refname>dl</refname>
+<refpurpose>Dynamic crypto-engine library loading support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-dl.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</link>
-                                            (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLInit">xmlSecCryptoDLInit</link>              (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</link>          (void);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</link>       (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</link>
-                                            (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</link>     (const <link linkend="xmlChar">xmlChar</link> *crypto);
-<link linkend="int">int</link>         <link linkend="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</link>      (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</link>
+                                                        (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLInit">xmlSecCryptoDLInit</link>                  (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</link>              (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</link>           (const <link linkend="xmlChar">xmlChar</link> *crypto);
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</link>
+                                                        (const <link linkend="xmlChar">xmlChar</link> *crypto);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</link>         (const <link linkend="xmlChar">xmlChar</link> *crypto);
+<link linkend="int">int</link>                 <link linkend="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</link>          (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</link>  (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -37,128 +35,119 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-dl.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Dynamic crypto-engine library loading support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</title>
-<indexterm><primary>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
-                                            (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
+<refsect1 id="xmlsec-dl.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms" role="function">
+<title>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</title>
+<indexterm zone="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms"><primary sortas="xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
+                                                        (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
 <para>
 Registers the key data and transforms klasses from <parameter>functions</parameter> table in xmlsec.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>functions</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>functions</parameter>&#160;:</term>
 <listitem><simpara> 		the functions table.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLInit">xmlSecCryptoDLInit ()</title>
-<indexterm><primary>xmlSecCryptoDLInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLInit              (void);</programlisting>
+<refsect2 id="xmlSecCryptoDLInit" role="function">
+<title>xmlSecCryptoDLInit ()</title>
+<indexterm zone="xmlSecCryptoDLInit"><primary sortas="xmlSecCryptoDLInit">xmlSecCryptoDLInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLInit                  (void);</programlisting>
 <para>
 Initializes dynamic loading engine. This is an internal function
 and should not be called by application directly.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown ()</title>
-<indexterm><primary>xmlSecCryptoDLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLShutdown          (void);</programlisting>
+<refsect2 id="xmlSecCryptoDLShutdown" role="function">
+<title>xmlSecCryptoDLShutdown ()</title>
+<indexterm zone="xmlSecCryptoDLShutdown"><primary sortas="xmlSecCryptoDLShutdown">xmlSecCryptoDLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLShutdown              (void);</programlisting>
 <para>
 Shutdowns dynamic loading engine. This is an internal function
 and should not be called by application directly.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary ()</title>
-<indexterm><primary>xmlSecCryptoDLLoadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLLoadLibrary       (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<refsect2 id="xmlSecCryptoDLLoadLibrary" role="function">
+<title>xmlSecCryptoDLLoadLibrary ()</title>
+<indexterm zone="xmlSecCryptoDLLoadLibrary"><primary sortas="xmlSecCryptoDLLoadLibrary">xmlSecCryptoDLLoadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLLoadLibrary           (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
 <para>
 Loads the xmlsec-&lt;crypto&gt; library. This function is NOT thread safe, 
 application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>, <link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>,
 and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>crypto</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crypto</parameter>&#160;:</term>
 <listitem><simpara>		the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions ()</title>
-<indexterm><primary>xmlSecCryptoDLGetLibraryFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoDLGetLibraryFunctions
-                                            (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<refsect2 id="xmlSecCryptoDLGetLibraryFunctions" role="function">
+<title>xmlSecCryptoDLGetLibraryFunctions ()</title>
+<indexterm zone="xmlSecCryptoDLGetLibraryFunctions"><primary sortas="xmlSecCryptoDLGetLibraryFunctions">xmlSecCryptoDLGetLibraryFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoDLGetLibraryFunctions
+                                                        (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
 <para>
 Loads the xmlsec-&lt;crypto&gt; library and gets global crypto functions/transforms/keys data/keys store 
 table. This function is NOT thread safe, application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>, 
 <link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>, and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>crypto</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crypto</parameter>&#160;:</term>
 <listitem><simpara>		the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the table or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary ()</title>
-<indexterm><primary>xmlSecCryptoDLUnloadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLUnloadLibrary     (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
+<refsect2 id="xmlSecCryptoDLUnloadLibrary" role="function">
+<title>xmlSecCryptoDLUnloadLibrary ()</title>
+<indexterm zone="xmlSecCryptoDLUnloadLibrary"><primary sortas="xmlSecCryptoDLUnloadLibrary">xmlSecCryptoDLUnloadLibrary</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLUnloadLibrary         (const <link linkend="xmlChar">xmlChar</link> *crypto);</programlisting>
 <para>
 Unloads the xmlsec-&lt;crypto&gt; library. All pointers to this library
 functions tables became invalid. This function is NOT thread safe, 
 application MUST NOT call <link linkend="xmlSecCryptoDLLoadLibrary"><type>xmlSecCryptoDLLoadLibrary</type></link>, <link linkend="xmlSecCryptoDLGetLibraryFunctions"><type>xmlSecCryptoDLGetLibraryFunctions</type></link>,
 and <link linkend="xmlSecCryptoDLUnloadLibrary"><type>xmlSecCryptoDLUnloadLibrary</type></link> functions from multiple threads.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>crypto</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crypto</parameter>&#160;:</term>
 <listitem><simpara>		the desired crypto library name ("openssl", "nss", ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions ()</title>
-<indexterm><primary>xmlSecCryptoDLSetFunctions</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCryptoDLSetFunctions      (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
+<refsect2 id="xmlSecCryptoDLSetFunctions" role="function">
+<title>xmlSecCryptoDLSetFunctions ()</title>
+<indexterm zone="xmlSecCryptoDLSetFunctions"><primary sortas="xmlSecCryptoDLSetFunctions">xmlSecCryptoDLSetFunctions</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCryptoDLSetFunctions          (<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> functions);</programlisting>
 <para>
 Sets global crypto functions/transforms/keys data/keys store table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>functions</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>functions</parameter>&#160;:</term>
 <listitem><simpara>		the new table
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions ()</title>
-<indexterm><primary>xmlSecCryptoDLGetFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoDLGetFunctions
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoDLGetFunctions" role="function">
+<title>xmlSecCryptoDLGetFunctions ()</title>
+<indexterm zone="xmlSecCryptoDLGetFunctions"><primary sortas="xmlSecCryptoDLGetFunctions">xmlSecCryptoDLGetFunctions</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoDLGetFunctions  (void);</programlisting>
 <para>
 Gets global crypto functions/transforms/keys data/keys store table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the table.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the table.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/errors.sgml b/docs/api/sgml/errors.sgml
index 81f22f9..e4bd05e 100644
--- a/docs/api/sgml/errors.sgml
+++ b/docs/api/sgml/errors.sgml
@@ -1,102 +1,101 @@
 <refentry id="xmlsec-errors">
 <refmeta>
-<refentrytitle>errors</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-errors.top_of_page">errors</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>errors</refname><refpurpose>Error/log messages support.</refpurpose>
+<refname>errors</refname>
+<refpurpose>Error/log messages support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-errors.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-XML-FAILED-CAPS">XMLSEC_ERRORS_R_XML_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-IO-FAILED-CAPS">XMLSEC_ERRORS_R_IO_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-DISABLED-CAPS">XMLSEC_ERRORS_R_DISABLED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_DATA</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</link>
-#define     <link linkend="XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</link>
-#define     <link linkend="XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</link>
-#define     <link linkend="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</link>
-#define     <link linkend="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</link>
-#define     <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</link>
-#define     <link linkend="XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</link>
-#define     <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</link>
-#define     <link linkend="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</link>
-#define     <link linkend="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</link>
-#define     <link linkend="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</link>
-#define     <link linkend="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</link>
-#define     <link linkend="XMLSEC-ERRORS-R-ASSERTION-CAPS">XMLSEC_ERRORS_R_ASSERTION</link>
-#define     <link linkend="XMLSEC-ERRORS-MAX-NUMBER-CAPS">XMLSEC_ERRORS_MAX_NUMBER</link>
-<link linkend="void">void</link>        (<link linkend="xmlSecErrorsCallback">*xmlSecErrorsCallback</link>)         (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);
-<link linkend="void">void</link>        <link linkend="xmlSecErrorsInit">xmlSecErrorsInit</link>                (void);
-<link linkend="void">void</link>        <link linkend="xmlSecErrorsShutdown">xmlSecErrorsShutdown</link>            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</link>         (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);
-<link linkend="void">void</link>        <link linkend="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</link>     (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);
-<link linkend="void">void</link>        <link linkend="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</link>
-                                            (<link linkend="int">int</link> enabled);
-<link linkend="int">int</link>         <link linkend="xmlSecErrorsGetCode">xmlSecErrorsGetCode</link>             (<link linkend="xmlSecSize">xmlSecSize</link> pos);
-const <link linkend="char">char</link>* <link linkend="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</link>              (<link linkend="xmlSecSize">xmlSecSize</link> pos);
-#define     <link linkend="XMLSEC-ERRORS-HERE-CAPS">XMLSEC_ERRORS_HERE</link>
-#define     <link linkend="xmlSecErrorsSafeString">xmlSecErrorsSafeString</link>          (str)
-#define     <link linkend="XMLSEC-ERRORS-NO-MESSAGE-CAPS">XMLSEC_ERRORS_NO_MESSAGE</link>
-<link linkend="void">void</link>        <link linkend="xmlSecError">xmlSecError</link>                     (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg,
-                                             ...);
-#define     <link linkend="xmlSecAssert">xmlSecAssert</link>                    ( p )
-#define     <link linkend="xmlSecAssert2">xmlSecAssert2</link>                   ( p, ret )
+#define             <link linkend="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-XML-FAILED--CAPS">XMLSEC_ERRORS_R_XML_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-IO-FAILED--CAPS">XMLSEC_ERRORS_R_IO_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DISABLED--CAPS">XMLSEC_ERRORS_R_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_DATA</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</link>
+#define             <link linkend="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</link>
+#define             <link linkend="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</link>
+#define             <link linkend="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</link>
+#define             <link linkend="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</link>
+#define             <link linkend="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</link>
+#define             <link linkend="XMLSEC-ERRORS-R-ASSERTION--CAPS">XMLSEC_ERRORS_R_ASSERTION</link>
+#define             <link linkend="XMLSEC-ERRORS-MAX-NUMBER--CAPS">XMLSEC_ERRORS_MAX_NUMBER</link>
+<link linkend="void">void</link>                (<link linkend="xmlSecErrorsCallback">*xmlSecErrorsCallback</link>)             (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);
+<link linkend="void">void</link>                <link linkend="xmlSecErrorsInit">xmlSecErrorsInit</link>                    (void);
+<link linkend="void">void</link>                <link linkend="xmlSecErrorsShutdown">xmlSecErrorsShutdown</link>                (void);
+<link linkend="void">void</link>                <link linkend="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</link>             (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);
+<link linkend="void">void</link>                <link linkend="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</link>         (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);
+<link linkend="void">void</link>                <link linkend="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</link>
+                                                        (<link linkend="int">int</link> enabled);
+<link linkend="int">int</link>                 <link linkend="xmlSecErrorsGetCode">xmlSecErrorsGetCode</link>                 (<link linkend="xmlSecSize">xmlSecSize</link> pos);
+const <link linkend="char">char</link>*         <link linkend="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</link>                  (<link linkend="xmlSecSize">xmlSecSize</link> pos);
+#define             <link linkend="XMLSEC-ERRORS-HERE--CAPS">XMLSEC_ERRORS_HERE</link>
+#define             <link linkend="xmlSecErrorsSafeString">xmlSecErrorsSafeString</link>              (str)
+#define             <link linkend="XMLSEC-ERRORS-NO-MESSAGE--CAPS">XMLSEC_ERRORS_NO_MESSAGE</link>
+<link linkend="void">void</link>                <link linkend="xmlSecError">xmlSecError</link>                         (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg,
+                                                         ...);
+#define             <link linkend="xmlSecAssert">xmlSecAssert</link>                        ( p )
+#define             <link linkend="xmlSecAssert2">xmlSecAssert2</link>                       ( p, ret )
 </synopsis>
 </refsynopsisdiv>
 
@@ -108,695 +107,633 @@ const <link linkend="char">char</link>* <link linkend="xmlSecErrorsGetMsg">xmlSe
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-errors.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Error/log messages support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_XMLSEC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XMLSEC_FAILED		 	1
+<refsect1 id="xmlsec-errors.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_XMLSEC_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XMLSEC_FAILED">XMLSEC_ERRORS_R_XMLSEC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XMLSEC_FAILED		 	1
 </programlisting>
 <para>
 An XMLSec function failed (error subject is the failed function).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_MALLOC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MALLOC_FAILED		 	2
+<refsect2 id="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_MALLOC_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_MALLOC_FAILED">XMLSEC_ERRORS_R_MALLOC_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MALLOC_FAILED		 	2
 </programlisting>
 <para>
 Failed to allocate memory error.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_STRDUP_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_STRDUP_FAILED		 	3
+<refsect2 id="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_STRDUP_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_STRDUP_FAILED">XMLSEC_ERRORS_R_STRDUP_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_STRDUP_FAILED		 	3
 </programlisting>
 <para>
 Failed to duplicate string error.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CRYPTO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CRYPTO_FAILED		 	4
+<refsect2 id="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CRYPTO_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CRYPTO_FAILED">XMLSEC_ERRORS_R_CRYPTO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CRYPTO_FAILED		 	4
 </programlisting>
 <para>
 Crypto (OpenSSL) function failed (error subject is the failed function).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-XML-FAILED-CAPS">XMLSEC_ERRORS_R_XML_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_XML_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XML_FAILED		 	5
+<refsect2 id="XMLSEC-ERRORS-R-XML-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_XML_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-XML-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XML_FAILED">XMLSEC_ERRORS_R_XML_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XML_FAILED		 	5
 </programlisting>
 <para>
 LibXML function failed (error subject is the failed function).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_XSLT_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XSLT_FAILED		 	6
+<refsect2 id="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_XSLT_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_XSLT_FAILED">XMLSEC_ERRORS_R_XSLT_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_XSLT_FAILED		 	6
 </programlisting>
 <para>
 LibXSLT function failed (error subject is the failed function).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-IO-FAILED-CAPS">XMLSEC_ERRORS_R_IO_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_IO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_IO_FAILED		 	7
+<refsect2 id="XMLSEC-ERRORS-R-IO-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_IO_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-IO-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_IO_FAILED">XMLSEC_ERRORS_R_IO_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_IO_FAILED		 	7
 </programlisting>
 <para>
 IO operation failed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-DISABLED-CAPS">XMLSEC_ERRORS_R_DISABLED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DISABLED		 	8
+<refsect2 id="XMLSEC-ERRORS-R-DISABLED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_DISABLED</title>
+<indexterm zone="XMLSEC-ERRORS-R-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_DISABLED">XMLSEC_ERRORS_R_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DISABLED		 	8
 </programlisting>
 <para>
 The feature is disabled during compilation.
 Check './configure --help' for details on how to
 enable it.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED		 	9
+<refsect2 id="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</title>
+<indexterm zone="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS"><primary sortas="XMLSEC_ERRORS_R_NOT_IMPLEMENTED">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED		 	9
 </programlisting>
 <para>
 Feature is not implemented.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_SIZE		 	11
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_SIZE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_SIZE">XMLSEC_ERRORS_R_INVALID_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_SIZE		 	11
 </programlisting>
 <para>
 Invalid size.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_DATA</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_DATA		 	12
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-DATA--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_DATA</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-DATA--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_DATA">XMLSEC_ERRORS_R_INVALID_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_DATA		 	12
 </programlisting>
 <para>
 Invalid data.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_RESULT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_RESULT		 	13
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_RESULT</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_RESULT">XMLSEC_ERRORS_R_INVALID_RESULT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_RESULT		 	13
 </programlisting>
 <para>
 Invalid result.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TYPE		 	14
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_TYPE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TYPE">XMLSEC_ERRORS_R_INVALID_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TYPE		 	14
 </programlisting>
 <para>
 Invalid type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_OPERATION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_OPERATION	 	15
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_OPERATION</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_OPERATION">XMLSEC_ERRORS_R_INVALID_OPERATION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_OPERATION	 	15
 </programlisting>
 <para>
 Invalid operation.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_STATUS</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_STATUS 			16
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_STATUS</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_STATUS">XMLSEC_ERRORS_R_INVALID_STATUS</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_STATUS 			16
 </programlisting>
 <para>
 Invalid status.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_FORMAT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_FORMAT 			17
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_FORMAT</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_FORMAT">XMLSEC_ERRORS_R_INVALID_FORMAT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_FORMAT 			17
 </programlisting>
 <para>
 Invalid format.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</title>
-<indexterm><primary>XMLSEC_ERRORS_R_DATA_NOT_MATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DATA_NOT_MATCH		 	18
+<refsect2 id="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_DATA_NOT_MATCH</title>
+<indexterm zone="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS"><primary sortas="XMLSEC_ERRORS_R_DATA_NOT_MATCH">XMLSEC_ERRORS_R_DATA_NOT_MATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DATA_NOT_MATCH		 	18
 </programlisting>
 <para>
 The data do not match our expectation.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-NODE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE	 	 	21
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_NODE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE">XMLSEC_ERRORS_R_INVALID_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE	 	 	21
 </programlisting>
 <para>
 Invalid node (error subject is the node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT	 	22
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE_CONTENT">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT	 	22
 </programlisting>
 <para>
 Invalid node content (error subject is the node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE	 	23
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE	 	23
 </programlisting>
 <para>
 Invalid node attribute (error subject is the node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE	 	25
+<refsect2 id="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</title>
+<indexterm zone="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS"><primary sortas="XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE	 	25
 </programlisting>
 <para>
 Missing node attribute (error subject is the node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</title>
-<indexterm><primary>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT	 	26
+<refsect2 id="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</title>
+<indexterm zone="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS"><primary sortas="XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT	 	26
 </programlisting>
 <para>
 Node already present,</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_UNEXPECTED_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_UNEXPECTED_NODE	 	 	27
+<refsect2 id="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_UNEXPECTED_NODE</title>
+<indexterm zone="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS"><primary sortas="XMLSEC_ERRORS_R_UNEXPECTED_NODE">XMLSEC_ERRORS_R_UNEXPECTED_NODE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_UNEXPECTED_NODE	 	 	27
 </programlisting>
 <para>
 Unexpected node (error subject is the node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</title>
-<indexterm><primary>XMLSEC_ERRORS_R_NODE_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_NOT_FOUND 	 	 	28
+<refsect2 id="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_NODE_NOT_FOUND</title>
+<indexterm zone="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_NODE_NOT_FOUND">XMLSEC_ERRORS_R_NODE_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_NODE_NOT_FOUND 	 	 	28
 </programlisting>
 <para>
 Node not found (error subject is the required node name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_TRANSFORM</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM	 	31
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_TRANSFORM</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TRANSFORM">XMLSEC_ERRORS_R_INVALID_TRANSFORM</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM	 	31
 </programlisting>
 <para>
 This transform is invlaid here.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY		32
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY		32
 </programlisting>
 <para>
 Key is invalid for this transform.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_URI_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_URI_TYPE 	 	33
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_URI_TYPE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_URI_TYPE">XMLSEC_ERRORS_R_INVALID_URI_TYPE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_URI_TYPE 	 	33
 </programlisting>
 <para>
 Invalid URI type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED 	34
+<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</title>
+<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS"><primary sortas="XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED 	34
 </programlisting>
 <para>
 The transform requires the input document to be the same as context.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED		35
+<refsect2 id="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</title>
+<indexterm zone="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_TRANSFORM_DISABLED">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED		35
 </programlisting>
 <para>
 The transform is disabled.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_KEY_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA	 	41
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_KEY_DATA</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_KEY_DATA">XMLSEC_ERRORS_R_INVALID_KEY_DATA</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA	 	41
 </programlisting>
 <para>
 Key data is invalid.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</title>
-<indexterm><primary>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND		42
+<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</title>
+<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND		42
 </programlisting>
 <para>
 Data is not found (error subject is the data name).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</title>
-<indexterm><primary>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST	 	43
+<refsect2 id="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</title>
+<indexterm zone="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST	 	43
 </programlisting>
 <para>
 The key data is already exist.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE	 	44
+<refsect2 id="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</title>
+<indexterm zone="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS"><primary sortas="XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE	 	44
 </programlisting>
 <para>
 Invalid key size.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</title>
-<indexterm><primary>XMLSEC_ERRORS_R_KEY_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_NOT_FOUND		 	45
+<refsect2 id="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_KEY_NOT_FOUND</title>
+<indexterm zone="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEY_NOT_FOUND">XMLSEC_ERRORS_R_KEY_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEY_NOT_FOUND		 	45
 </programlisting>
 <para>
 Key not found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_KEYDATA_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEYDATA_DISABLED		46
+<refsect2 id="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_KEYDATA_DISABLED</title>
+<indexterm zone="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS"><primary sortas="XMLSEC_ERRORS_R_KEYDATA_DISABLED">XMLSEC_ERRORS_R_KEYDATA_DISABLED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_KEYDATA_DISABLED		46
 </programlisting>
 <para>
 The key data type disabled.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</title>
-<indexterm><primary>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL	 	51
+<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</title>
+<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL	 	51
 </programlisting>
 <para>
 Max allowed retrievals level reached.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</title>
-<indexterm><primary>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH	52
+<refsect2 id="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</title>
+<indexterm zone="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH	52
 </programlisting>
 <para>
 The retrieved key data type does not match the one specified 
 in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</title>
-<indexterm><primary>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL	 	61
+<refsect2 id="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</title>
+<indexterm zone="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS"><primary sortas="XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL	 	61
 </programlisting>
 <para>
 Max EncryptedKey level reached.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED	 	71
+<refsect2 id="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_VERIFY_FAILED">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED	 	71
 </programlisting>
 <para>
 Certificate verification failed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_FOUND		 	72
+<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_NOT_FOUND</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_NOT_FOUND">XMLSEC_ERRORS_R_CERT_NOT_FOUND</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_FOUND		 	72
 </programlisting>
 <para>
 Requested certificate is not found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_REVOKED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_REVOKED		 	73
+<refsect2 id="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_REVOKED</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_REVOKED">XMLSEC_ERRORS_R_CERT_REVOKED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_REVOKED		 	73
 </programlisting>
 <para>
 The certificate is revoked.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED	 	74
+<refsect2 id="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_ISSUER_FAILED">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED	 	74
 </programlisting>
 <para>
 Failed to get certificate issuer.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID	 	75
+<refsect2 id="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_NOT_YET_VALID">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID	 	75
 </programlisting>
 <para>
 "Not valid before" verification failed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</title>
-<indexterm><primary>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED	 	76
+<refsect2 id="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</title>
+<indexterm zone="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS"><primary sortas="XMLSEC_ERRORS_R_CERT_HAS_EXPIRED">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED	 	76
 </programlisting>
 <para>
 "Not valid after" verification failed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</title>
-<indexterm><primary>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES 	 	81
+<refsect2 id="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</title>
+<indexterm zone="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS"><primary sortas="XMLSEC_ERRORS_R_DSIG_NO_REFERENCES">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES 	 	81
 </programlisting>
 <para>
 The &lt;dsig:Reference&gt; nodes not found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</title>
-<indexterm><primary>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE 	 	82
+<refsect2 id="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</title>
+<indexterm zone="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS"><primary sortas="XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE 	 	82
 </programlisting>
 <para>
 The &lt;dsig:Reference&gt; validation failed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-R-ASSERTION-CAPS">XMLSEC_ERRORS_R_ASSERTION</title>
-<indexterm><primary>XMLSEC_ERRORS_R_ASSERTION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_ASSERTION		 	100
+<refsect2 id="XMLSEC-ERRORS-R-ASSERTION--CAPS" role="macro">
+<title>XMLSEC_ERRORS_R_ASSERTION</title>
+<indexterm zone="XMLSEC-ERRORS-R-ASSERTION--CAPS"><primary sortas="XMLSEC_ERRORS_R_ASSERTION">XMLSEC_ERRORS_R_ASSERTION</primary></indexterm><programlisting>#define XMLSEC_ERRORS_R_ASSERTION		 	100
 </programlisting>
 <para>
 Invalid assertion.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-MAX-NUMBER-CAPS">XMLSEC_ERRORS_MAX_NUMBER</title>
-<indexterm><primary>XMLSEC_ERRORS_MAX_NUMBER</primary></indexterm><programlisting>#define XMLSEC_ERRORS_MAX_NUMBER			256
+<refsect2 id="XMLSEC-ERRORS-MAX-NUMBER--CAPS" role="macro">
+<title>XMLSEC_ERRORS_MAX_NUMBER</title>
+<indexterm zone="XMLSEC-ERRORS-MAX-NUMBER--CAPS"><primary sortas="XMLSEC_ERRORS_MAX_NUMBER">XMLSEC_ERRORS_MAX_NUMBER</primary></indexterm><programlisting>#define XMLSEC_ERRORS_MAX_NUMBER			256
 </programlisting>
 <para>
 The maximum xmlsec errors number.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsCallback">xmlSecErrorsCallback ()</title>
-<indexterm><primary>xmlSecErrorsCallback</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecErrorsCallback)         (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);</programlisting>
+<refsect2 id="xmlSecErrorsCallback" role="function">
+<title>xmlSecErrorsCallback ()</title>
+<indexterm zone="xmlSecErrorsCallback"><primary sortas="xmlSecErrorsCallback">xmlSecErrorsCallback</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecErrorsCallback)             (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);</programlisting>
 <para>
 The errors reporting callback function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>		the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara>		the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara>		the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara>		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara>		the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsInit">xmlSecErrorsInit ()</title>
-<indexterm><primary>xmlSecErrorsInit</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecErrorsInit                (void);</programlisting>
+<refsect2 id="xmlSecErrorsInit" role="function">
+<title>xmlSecErrorsInit ()</title>
+<indexterm zone="xmlSecErrorsInit"><primary sortas="xmlSecErrorsInit">xmlSecErrorsInit</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsInit                    (void);</programlisting>
 <para>
 Initializes the errors reporting. It is called from <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function.
 and applications must not call this function directly.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsShutdown">xmlSecErrorsShutdown ()</title>
-<indexterm><primary>xmlSecErrorsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecErrorsShutdown            (void);</programlisting>
+<refsect2 id="xmlSecErrorsShutdown" role="function">
+<title>xmlSecErrorsShutdown ()</title>
+<indexterm zone="xmlSecErrorsShutdown"><primary sortas="xmlSecErrorsShutdown">xmlSecErrorsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsShutdown                (void);</programlisting>
 <para>
 Cleanups the errors reporting. It is called from <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function.
 and applications must not call this function directly.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback ()</title>
-<indexterm><primary>xmlSecErrorsSetCallback</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecErrorsSetCallback         (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);</programlisting>
+<refsect2 id="xmlSecErrorsSetCallback" role="function">
+<title>xmlSecErrorsSetCallback ()</title>
+<indexterm zone="xmlSecErrorsSetCallback"><primary sortas="xmlSecErrorsSetCallback">xmlSecErrorsSetCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsSetCallback             (<link linkend="xmlSecErrorsCallback">xmlSecErrorsCallback</link> callback);</programlisting>
 <para>
 Sets the errors callback function to <parameter>callback</parameter> that will be called 
 every time an error occurs.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>callback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>callback</parameter>&#160;:</term>
 <listitem><simpara> 		the new errors callback function.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback ()</title>
-<indexterm><primary>xmlSecErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecErrorsDefaultCallback     (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);</programlisting>
+<refsect2 id="xmlSecErrorsDefaultCallback" role="function">
+<title>xmlSecErrorsDefaultCallback ()</title>
+<indexterm zone="xmlSecErrorsDefaultCallback"><primary sortas="xmlSecErrorsDefaultCallback">xmlSecErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsDefaultCallback         (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);</programlisting>
 <para>
 The default error reporting callback that utilizes LibXML
 error reporting <link linkend="xmlGenericError"><type>xmlGenericError</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>		the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara>		the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara>		the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara>		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara>		the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput ()</title>
-<indexterm><primary>xmlSecErrorsDefaultCallbackEnableOutput</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecErrorsDefaultCallbackEnableOutput
-                                            (<link linkend="int">int</link> enabled);</programlisting>
+<refsect2 id="xmlSecErrorsDefaultCallbackEnableOutput" role="function">
+<title>xmlSecErrorsDefaultCallbackEnableOutput ()</title>
+<indexterm zone="xmlSecErrorsDefaultCallbackEnableOutput"><primary sortas="xmlSecErrorsDefaultCallbackEnableOutput">xmlSecErrorsDefaultCallbackEnableOutput</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecErrorsDefaultCallbackEnableOutput
+                                                        (<link linkend="int">int</link> enabled);</programlisting>
 <para>
 Enables or disables calling LibXML2 callback from the default
 errors callback.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>enabled</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>enabled</parameter>&#160;:</term>
 <listitem><simpara>		the flag.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsGetCode">xmlSecErrorsGetCode ()</title>
-<indexterm><primary>xmlSecErrorsGetCode</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecErrorsGetCode             (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecErrorsGetCode" role="function">
+<title>xmlSecErrorsGetCode ()</title>
+<indexterm zone="xmlSecErrorsGetCode"><primary sortas="xmlSecErrorsGetCode">xmlSecErrorsGetCode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecErrorsGetCode                 (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets the known error code at position <parameter>pos</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the error position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the known error code or 0 if <parameter>pos</parameter> is greater than 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the known error code or 0 if <parameter>pos</parameter> is greater than 
 total number of known error codes.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg ()</title>
-<indexterm><primary>xmlSecErrorsGetMsg</primary></indexterm><programlisting>const <link linkend="char">char</link>* xmlSecErrorsGetMsg              (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecErrorsGetMsg" role="function">
+<title>xmlSecErrorsGetMsg ()</title>
+<indexterm zone="xmlSecErrorsGetMsg"><primary sortas="xmlSecErrorsGetMsg">xmlSecErrorsGetMsg</primary></indexterm><programlisting>const <link linkend="char">char</link>*         xmlSecErrorsGetMsg                  (<link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets the known error message at position <parameter>pos</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the error position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the known error message or NULL if <parameter>pos</parameter> is greater than 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the known error message or NULL if <parameter>pos</parameter> is greater than 
 total number of known error codes.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-HERE-CAPS">XMLSEC_ERRORS_HERE</title>
-<indexterm><primary>XMLSEC_ERRORS_HERE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_HERE			__FILE__,__LINE__,__XMLSEC_FUNCTION__
+<refsect2 id="XMLSEC-ERRORS-HERE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_HERE</title>
+<indexterm zone="XMLSEC-ERRORS-HERE--CAPS"><primary sortas="XMLSEC_ERRORS_HERE">XMLSEC_ERRORS_HERE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_HERE			__FILE__,__LINE__,__XMLSEC_FUNCTION__
 </programlisting>
 <para>
 The macro that specifies the location (file, line and function)
 for the <link linkend="xmlSecError"><function>xmlSecError()</function></link> function.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecErrorsSafeString">xmlSecErrorsSafeString()</title>
-<indexterm><primary>xmlSecErrorsSafeString</primary></indexterm><programlisting>#define     xmlSecErrorsSafeString(str)</programlisting>
+<refsect2 id="xmlSecErrorsSafeString" role="macro">
+<title>xmlSecErrorsSafeString()</title>
+<indexterm zone="xmlSecErrorsSafeString"><primary sortas="xmlSecErrorsSafeString">xmlSecErrorsSafeString</primary></indexterm><programlisting>#define             xmlSecErrorsSafeString(str)</programlisting>
 <para>
 Macro. Returns <parameter>str</parameter> if it is not NULL or pointer to "NULL" otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara>		the string.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ERRORS-NO-MESSAGE-CAPS">XMLSEC_ERRORS_NO_MESSAGE</title>
-<indexterm><primary>XMLSEC_ERRORS_NO_MESSAGE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_NO_MESSAGE 		" "
+<refsect2 id="XMLSEC-ERRORS-NO-MESSAGE--CAPS" role="macro">
+<title>XMLSEC_ERRORS_NO_MESSAGE</title>
+<indexterm zone="XMLSEC-ERRORS-NO-MESSAGE--CAPS"><primary sortas="XMLSEC_ERRORS_NO_MESSAGE">XMLSEC_ERRORS_NO_MESSAGE</primary></indexterm><programlisting>#define XMLSEC_ERRORS_NO_MESSAGE 		" "
 </programlisting>
 <para>
 Empty error message " ".</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecError">xmlSecError ()</title>
-<indexterm><primary>xmlSecError</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecError                     (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg,
-                                             ...);</programlisting>
+<refsect2 id="xmlSecError" role="function">
+<title>xmlSecError ()</title>
+<indexterm zone="xmlSecError"><primary sortas="xmlSecError">xmlSecError</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecError                         (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg,
+                                                         ...);</programlisting>
 <para>
 Reports an error to the default (<link linkend="xmlSecErrorsDefaultCallback"><type>xmlSecErrorsDefaultCallback</type></link>) or 
 application specific callback installed using <link linkend="xmlSecErrorsSetCallback"><type>xmlSecErrorsSetCallback</type></link> 
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara> 		the error location filename (__FILE__).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara> 		the error location line number (__LINE__).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara> 		the error location function (__FUNCTIION__).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara> 		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara> 		the error message in printf format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>...</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>...</parameter>&#160;:</term>
 <listitem><simpara> 		the parameters for the <parameter>msg</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAssert">xmlSecAssert()</title>
-<indexterm><primary>xmlSecAssert</primary></indexterm><programlisting>#define     xmlSecAssert( p )</programlisting>
+<refsect2 id="xmlSecAssert" role="macro">
+<title>xmlSecAssert()</title>
+<indexterm zone="xmlSecAssert"><primary sortas="xmlSecAssert">xmlSecAssert</primary></indexterm><programlisting>#define             xmlSecAssert( p )</programlisting>
 <para>
 Macro. Verifies that <parameter>p</parameter> is true and calls <link linkend="return"><function>return()</function></link> otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>p</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>p</parameter>&#160;:</term>
 <listitem><simpara> the expression.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAssert2">xmlSecAssert2()</title>
-<indexterm><primary>xmlSecAssert2</primary></indexterm><programlisting>#define     xmlSecAssert2( p, ret )</programlisting>
+<refsect2 id="xmlSecAssert2" role="macro">
+<title>xmlSecAssert2()</title>
+<indexterm zone="xmlSecAssert2"><primary sortas="xmlSecAssert2">xmlSecAssert2</primary></indexterm><programlisting>#define             xmlSecAssert2( p, ret )</programlisting>
 <para>
 Macro. Verifies that <parameter>p</parameter> is true and calls return(<parameter>ret</parameter>) otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>p</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>p</parameter>&#160;:</term>
 <listitem><simpara> the expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ret</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ret</parameter>&#160;:</term>
 <listitem><simpara> the return value.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/exports.sgml b/docs/api/sgml/exports.sgml
index 2336218..0beedcf 100644
--- a/docs/api/sgml/exports.sgml
+++ b/docs/api/sgml/exports.sgml
@@ -1,21 +1,20 @@
 <refentry id="xmlsec-exports">
 <refmeta>
-<refentrytitle>exports</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-exports.top_of_page">exports</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>exports</refname><refpurpose></refpurpose>
+<refname>exports</refname>
+<refpurpose></refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-exports.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="extern">extern</link>
+#define             <link linkend="extern">extern</link>
 </synopsis>
 </refsynopsisdiv>
 
@@ -27,20 +26,18 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-exports.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
-
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="extern">extern</title>
-<indexterm><primary>extern</primary></indexterm><programlisting>#define     extern</programlisting>
+<refsect1 id="xmlsec-exports.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="extern" role="macro">
+<title>extern</title>
+<indexterm zone="extern"><primary sortas="extern">extern</primary></indexterm><programlisting>#define             extern</programlisting>
 <para>
-
 </para></refsect2>
 
 </refsect1>
diff --git a/docs/api/sgml/gnutls/app.sgml b/docs/api/sgml/gnutls/app.sgml
index 00aa791..9ae0ae1 100644
--- a/docs/api/sgml/gnutls/app.sgml
+++ b/docs/api/sgml/gnutls/app.sgml
@@ -1,75 +1,69 @@
 <refentry id="xmlsec-gnutls-app">
 <refmeta>
-<refentrytitle>app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-gnutls-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>app</refname><refpurpose>Application functions implementation for GnuTLS.</refpurpose>
+<refname>app</refname>
+<refpurpose>Application functions implementation for GnuTLS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-gnutls-app.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link>             (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link>         (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link>         (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link>   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link>      (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link>
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link>
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*       <link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</link>                 (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</link>             (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</link>              (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</link>           (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</link>     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="void">void</link>*               <link linkend="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</link>
+                                                        (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -81,368 +75,351 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-gnutls-app.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Application functions implementation for GnuTLS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit ()</title>
-<indexterm><primary>xmlSecGnuTLSAppInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppInit             (const <link linkend="char">char</link> *config);</programlisting>
+<refsect1 id="xmlsec-gnutls-app.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecGnuTLSAppInit" role="function">
+<title>xmlSecGnuTLSAppInit ()</title>
+<indexterm zone="xmlSecGnuTLSAppInit"><primary sortas="xmlSecGnuTLSAppInit">xmlSecGnuTLSAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppInit                 (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the path to GnuTLS configuration (unused).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown ()</title>
-<indexterm><primary>xmlSecGnuTLSAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppShutdown         (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppShutdown" role="function">
+<title>xmlSecGnuTLSAppShutdown ()</title>
+<indexterm zone="xmlSecGnuTLSAppShutdown"><primary sortas="xmlSecGnuTLSAppShutdown">xmlSecGnuTLSAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppShutdown             (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit ()</title>
-<indexterm><primary>xmlSecGnuTLSAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppDefaultKeysMngrInit
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrInit" role="function">
+<title>xmlSecGnuTLSAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrInit"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrInit">xmlSecGnuTLSAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
 and a default GnuTLS crypto key data stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm><primary>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrAdoptKey">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad ()</title>
-<indexterm><primary>xmlSecGnuTLSAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppDefaultKeysMngrLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrLoad"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrLoad">xmlSecGnuTLSAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created 
 with <link linkend="xmlSecGnuTLSAppDefaultKeysMngrInit"><type>xmlSecGnuTLSAppDefaultKeysMngrInit</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave ()</title>
-<indexterm><primary>xmlSecGnuTLSAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppDefaultKeysMngrSave
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppDefaultKeysMngrSave" role="function">
+<title>xmlSecGnuTLSAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecGnuTLSAppDefaultKeysMngrSave"><primary sortas="xmlSecGnuTLSAppDefaultKeysMngrSave">xmlSecGnuTLSAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the destination filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppKeysMngrCertLoad (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoad" role="function">
+<title>xmlSecGnuTLSAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoad"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoad">xmlSecGnuTLSAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppKeysMngrCertLoadMemory
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeysMngrCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeysMngrCertLoadMemory">xmlSecGnuTLSAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from binary buffer <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecGnuTLSAppKeyLoad         (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeyLoad" role="function">
+<title>xmlSecGnuTLSAppKeyLoad ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeyLoad"><primary sortas="xmlSecGnuTLSAppKeyLoad">xmlSecGnuTLSAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoad              (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecGnuTLSAppKeyLoadMemory   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeyLoadMemory" role="function">
+<title>xmlSecGnuTLSAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeyLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyLoadMemory">xmlSecGnuTLSAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppKeyLoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the memory buffer (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the size of binary key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load ()</title>
-<indexterm><primary>xmlSecGnuTLSAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecGnuTLSAppPkcs12Load      (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppPkcs12Load" role="function">
+<title>xmlSecGnuTLSAppPkcs12Load ()</title>
+<indexterm zone="xmlSecGnuTLSAppPkcs12Load"><primary sortas="xmlSecGnuTLSAppPkcs12Load">xmlSecGnuTLSAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12Load           (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file
 (not implemented yet).
 For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory ()</title>
-<indexterm><primary>xmlSecGnuTLSAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecGnuTLSAppPkcs12LoadMemory
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppPkcs12LoadMemory" role="function">
+<title>xmlSecGnuTLSAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecGnuTLSAppPkcs12LoadMemory"><primary sortas="xmlSecGnuTLSAppPkcs12LoadMemory">xmlSecGnuTLSAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecGnuTLSAppPkcs12LoadMemory     (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecGnuTLSAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppKeyCertLoad      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeyCertLoad" role="function">
+<title>xmlSecGnuTLSAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeyCertLoad"><primary sortas="xmlSecGnuTLSAppKeyCertLoad">xmlSecGnuTLSAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoad          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key
 (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory ()</title>
-<indexterm><primary>xmlSecGnuTLSAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSAppKeyCertLoadMemory
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppKeyCertLoadMemory" role="function">
+<title>xmlSecGnuTLSAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecGnuTLSAppKeyCertLoadMemory"><primary sortas="xmlSecGnuTLSAppKeyCertLoadMemory">xmlSecGnuTLSAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from memory buffer and adds it to key (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback ()</title>
-<indexterm><primary>xmlSecGnuTLSAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*       xmlSecGnuTLSAppGetDefaultPwdCallback
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSAppGetDefaultPwdCallback" role="function">
+<title>xmlSecGnuTLSAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecGnuTLSAppGetDefaultPwdCallback"><primary sortas="xmlSecGnuTLSAppGetDefaultPwdCallback">xmlSecGnuTLSAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecGnuTLSAppGetDefaultPwdCallback
+                                                        (void);</programlisting>
 <para>
 Gets default password callback.</para>
 <para>
-
-</para></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/gnutls/crypto.sgml b/docs/api/sgml/gnutls/crypto.sgml
index a933904..e5cc3c7 100644
--- a/docs/api/sgml/gnutls/crypto.sgml
+++ b/docs/api/sgml/gnutls/crypto.sgml
@@ -1,73 +1,66 @@
 <refentry id="xmlsec-gnutls-crypto">
 <refmeta>
-<refentrytitle>crypto</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-gnutls-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-GNUTLS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>crypto</refname><refpurpose>Crypto transforms implementation for GnuTLS.</refpurpose>
+<refname>crypto</refname>
+<refpurpose>Crypto transforms implementation for GnuTLS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-gnutls-crypto.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link>                (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link>            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link>      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-#define     <link linkend="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</link>
-                                            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</link>
-                                            (<link linkend="int">int</link> min_length);
-#define     <link linkend="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link>
-                                            (void);
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSInit">xmlSecGnuTLSInit</link>                    (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</link>                (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</link>            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</link>          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+#define             <link linkend="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</link>      (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</link>      (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</link>  (void);
+<link linkend="void">void</link>                <link linkend="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</link>  (<link linkend="int">int</link> min_length);
+#define             <link linkend="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</link>   (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -79,390 +72,352 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-gnutls-crypto.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for GnuTLS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoGetFunctions-gnutls">xmlSecCryptoGetFunctions_gnutls ()</title>
-<indexterm><primary>xmlSecCryptoGetFunctions_gnutls</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoGetFunctions_gnutls
-                                            (void);</programlisting>
+<refsect1 id="xmlsec-gnutls-crypto.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoGetFunctions-gnutls" role="function">
+<title>xmlSecCryptoGetFunctions_gnutls ()</title>
+<indexterm zone="xmlSecCryptoGetFunctions-gnutls"><primary sortas="xmlSecCryptoGetFunctions_gnutls">xmlSecCryptoGetFunctions_gnutls</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_gnutls
+                                                        (void);</programlisting>
 <para>
 Gets the pointer to xmlsec-gnutls functions table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the xmlsec-gnutls functions table or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-gnutls functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSInit">xmlSecGnuTLSInit ()</title>
-<indexterm><primary>xmlSecGnuTLSInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSInit                (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSInit" role="function">
+<title>xmlSecGnuTLSInit ()</title>
+<indexterm zone="xmlSecGnuTLSInit"><primary sortas="xmlSecGnuTLSInit">xmlSecGnuTLSInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSInit                    (void);</programlisting>
 <para>
 XMLSec library specific crypto engine initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown ()</title>
-<indexterm><primary>xmlSecGnuTLSShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSShutdown            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSShutdown" role="function">
+<title>xmlSecGnuTLSShutdown ()</title>
+<indexterm zone="xmlSecGnuTLSShutdown"><primary sortas="xmlSecGnuTLSShutdown">xmlSecGnuTLSShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSShutdown                (void);</programlisting>
 <para>
 XMLSec library specific crypto engine shutdown.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit ()</title>
-<indexterm><primary>xmlSecGnuTLSKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSKeysMngrInit        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeysMngrInit" role="function">
+<title>xmlSecGnuTLSKeysMngrInit ()</title>
+<indexterm zone="xmlSecGnuTLSKeysMngrInit"><primary sortas="xmlSecGnuTLSKeysMngrInit">xmlSecGnuTLSKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeysMngrInit            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Adds GnuTLS specific key data stores in keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom ()</title>
-<indexterm><primary>xmlSecGnuTLSGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSGenerateRandom      (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecGnuTLSGenerateRandom" role="function">
+<title>xmlSecGnuTLSGenerateRandom ()</title>
+<indexterm zone="xmlSecGnuTLSGenerateRandom"><primary sortas="xmlSecGnuTLSGenerateRandom">xmlSecGnuTLSGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSGenerateRandom          (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara>		the destination buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the numer of bytes to generate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataAesId</primary></indexterm><programlisting>#define     xmlSecGnuTLSKeyDataAesId</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataAesId" role="macro">
+<title>xmlSecGnuTLSKeyDataAesId</title>
+<indexterm zone="xmlSecGnuTLSKeyDataAesId"><primary sortas="xmlSecGnuTLSKeyDataAesId">xmlSecGnuTLSKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataAesId</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecGnuTLSKeyDataAesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataAesGetKlass" role="function">
+<title>xmlSecGnuTLSKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataAesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataAesGetKlass">xmlSecGnuTLSKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataAesGetKlass      (void);</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSKeyDataAesSet       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataAesSet" role="function">
+<title>xmlSecGnuTLSKeyDataAesSet ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataAesSet"><primary sortas="xmlSecGnuTLSKeyDataAesSet">xmlSecGnuTLSKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataAesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of AES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to AES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes128CbcId</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformAes128CbcId</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes128CbcId" role="macro">
+<title>xmlSecGnuTLSTransformAes128CbcId</title>
+<indexterm zone="xmlSecGnuTLSTransformAes128CbcId"><primary sortas="xmlSecGnuTLSTransformAes128CbcId">xmlSecGnuTLSTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes128CbcId</programlisting>
 <para>
 The AES128 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformAes128CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes128CbcGetKlass" role="function">
+<title>xmlSecGnuTLSTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformAes128CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes128CbcGetKlass">xmlSecGnuTLSTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes128CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 128 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 128 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes192CbcId</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformAes192CbcId</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes192CbcId" role="macro">
+<title>xmlSecGnuTLSTransformAes192CbcId</title>
+<indexterm zone="xmlSecGnuTLSTransformAes192CbcId"><primary sortas="xmlSecGnuTLSTransformAes192CbcId">xmlSecGnuTLSTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes192CbcId</programlisting>
 <para>
 The AES192 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformAes192CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes192CbcGetKlass" role="function">
+<title>xmlSecGnuTLSTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformAes192CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes192CbcGetKlass">xmlSecGnuTLSTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes192CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 192 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 192 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes256CbcId</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformAes256CbcId</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes256CbcId" role="macro">
+<title>xmlSecGnuTLSTransformAes256CbcId</title>
+<indexterm zone="xmlSecGnuTLSTransformAes256CbcId"><primary sortas="xmlSecGnuTLSTransformAes256CbcId">xmlSecGnuTLSTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformAes256CbcId</programlisting>
 <para>
 The AES256 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformAes256CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformAes256CbcGetKlass" role="function">
+<title>xmlSecGnuTLSTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformAes256CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformAes256CbcGetKlass">xmlSecGnuTLSTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformAes256CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 256 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 256 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataDesId</primary></indexterm><programlisting>#define     xmlSecGnuTLSKeyDataDesId</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataDesId" role="macro">
+<title>xmlSecGnuTLSKeyDataDesId</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDesId"><primary sortas="xmlSecGnuTLSKeyDataDesId">xmlSecGnuTLSKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataDesId</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecGnuTLSKeyDataDesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataDesGetKlass" role="function">
+<title>xmlSecGnuTLSKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDesGetKlass"><primary sortas="xmlSecGnuTLSKeyDataDesGetKlass">xmlSecGnuTLSKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataDesGetKlass      (void);</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSKeyDataDesSet       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataDesSet" role="function">
+<title>xmlSecGnuTLSKeyDataDesSet ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataDesSet"><primary sortas="xmlSecGnuTLSKeyDataDesSet">xmlSecGnuTLSKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataDesSet           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of DES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</title>
-<indexterm><primary>xmlSecGnuTLSTransformDes3CbcId</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformDes3CbcId</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformDes3CbcId" role="macro">
+<title>xmlSecGnuTLSTransformDes3CbcId</title>
+<indexterm zone="xmlSecGnuTLSTransformDes3CbcId"><primary sortas="xmlSecGnuTLSTransformDes3CbcId">xmlSecGnuTLSTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformDes3CbcId</programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformDes3CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformDes3CbcGetKlass" role="function">
+<title>xmlSecGnuTLSTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformDes3CbcGetKlass"><primary sortas="xmlSecGnuTLSTransformDes3CbcGetKlass">xmlSecGnuTLSTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformDes3CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 Triple DES CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Triple DES encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength ()</title>
-<indexterm><primary>xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSHmacGetMinOutputLength
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSHmacGetMinOutputLength" role="function">
+<title>xmlSecGnuTLSHmacGetMinOutputLength ()</title>
+<indexterm zone="xmlSecGnuTLSHmacGetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacGetMinOutputLength">xmlSecGnuTLSHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSHmacGetMinOutputLength  (void);</programlisting>
 <para>
 Gets the value of min HMAC length.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the min HMAC output length
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength ()</title>
-<indexterm><primary>xmlSecGnuTLSHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecGnuTLSHmacSetMinOutputLength
-                                            (<link linkend="int">int</link> min_length);</programlisting>
+<refsect2 id="xmlSecGnuTLSHmacSetMinOutputLength" role="function">
+<title>xmlSecGnuTLSHmacSetMinOutputLength ()</title>
+<indexterm zone="xmlSecGnuTLSHmacSetMinOutputLength"><primary sortas="xmlSecGnuTLSHmacSetMinOutputLength">xmlSecGnuTLSHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecGnuTLSHmacSetMinOutputLength  (<link linkend="int">int</link> min_length);</programlisting>
 <para>
 Sets the min HMAC output length</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>min_length</parameter>&#160;:</term>
 <listitem><simpara> the new min length 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecGnuTLSKeyDataHmacId</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataHmacId" role="macro">
+<title>xmlSecGnuTLSKeyDataHmacId</title>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacId"><primary sortas="xmlSecGnuTLSKeyDataHmacId">xmlSecGnuTLSKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecGnuTLSKeyDataHmacId</programlisting>
 <para>
 The HMAC key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecGnuTLSKeyDataHmacGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataHmacGetKlass" role="function">
+<title>xmlSecGnuTLSKeyDataHmacGetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacGetKlass"><primary sortas="xmlSecGnuTLSKeyDataHmacGetKlass">xmlSecGnuTLSKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecGnuTLSKeyDataHmacGetKlass     (void);</programlisting>
 <para>
 The HMAC key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HMAC key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet ()</title>
-<indexterm><primary>xmlSecGnuTLSKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGnuTLSKeyDataHmacSet      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecGnuTLSKeyDataHmacSet" role="function">
+<title>xmlSecGnuTLSKeyDataHmacSet ()</title>
+<indexterm zone="xmlSecGnuTLSKeyDataHmacSet"><primary sortas="xmlSecGnuTLSKeyDataHmacSet">xmlSecGnuTLSKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGnuTLSKeyDataHmacSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of HMAC key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacMd5Id</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacMd5Id" role="macro">
+<title>xmlSecGnuTLSTransformHmacMd5Id</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacMd5Id"><primary sortas="xmlSecGnuTLSTransformHmacMd5Id">xmlSecGnuTLSTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacMd5Id</programlisting>
 <para>
 The HMAC with MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformHmacMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacMd5GetKlass" role="function">
+<title>xmlSecGnuTLSTransformHmacMd5GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacMd5GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacMd5GetKlass">xmlSecGnuTLSTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacMd5GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-MD5 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-MD5 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacRipemd160Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacRipemd160Id</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacRipemd160Id" role="macro">
+<title>xmlSecGnuTLSTransformHmacRipemd160Id</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160Id"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160Id">xmlSecGnuTLSTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacRipemd160Id</programlisting>
 <para>
 The HMAC with RipeMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformHmacRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacRipemd160GetKlass" role="function">
+<title>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacRipemd160GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacRipemd160GetKlass">xmlSecGnuTLSTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-RIPEMD160 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-RIPEMD160 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformHmacSha1Id</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacSha1Id" role="macro">
+<title>xmlSecGnuTLSTransformHmacSha1Id</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha1Id"><primary sortas="xmlSecGnuTLSTransformHmacSha1Id">xmlSecGnuTLSTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformHmacSha1Id</programlisting>
 <para>
 The HMAC with SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformHmacSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformHmacSha1GetKlass" role="function">
+<title>xmlSecGnuTLSTransformHmacSha1GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformHmacSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformHmacSha1GetKlass">xmlSecGnuTLSTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformHmacSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA1 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA1 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</title>
-<indexterm><primary>xmlSecGnuTLSTransformSha1Id</primary></indexterm><programlisting>#define     xmlSecGnuTLSTransformSha1Id</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformSha1Id" role="macro">
+<title>xmlSecGnuTLSTransformSha1Id</title>
+<indexterm zone="xmlSecGnuTLSTransformSha1Id"><primary sortas="xmlSecGnuTLSTransformSha1Id">xmlSecGnuTLSTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecGnuTLSTransformSha1Id</programlisting>
 <para>
 The SHA1 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass ()</title>
-<indexterm><primary>xmlSecGnuTLSTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecGnuTLSTransformSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecGnuTLSTransformSha1GetKlass" role="function">
+<title>xmlSecGnuTLSTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecGnuTLSTransformSha1GetKlass"><primary sortas="xmlSecGnuTLSTransformSha1GetKlass">xmlSecGnuTLSTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecGnuTLSTransformSha1GetKlass   (void);</programlisting>
 <para>
 SHA-1 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-1 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/io.sgml b/docs/api/sgml/io.sgml
index f6068f6..971f99f 100644
--- a/docs/api/sgml/io.sgml
+++ b/docs/api/sgml/io.sgml
@@ -1,34 +1,31 @@
 <refentry id="xmlsec-io">
 <refmeta>
-<refentrytitle>io</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-io.top_of_page">io</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>io</refname><refpurpose>Input/output support.</refpurpose>
+<refname>io</refname>
+<refpurpose>Input/output support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-io.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecIOInit">xmlSecIOInit</link>                    (void);
-<link linkend="void">void</link>        <link linkend="xmlSecIOShutdown">xmlSecIOShutdown</link>                (void);
-<link linkend="void">void</link>        <link linkend="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</link>        (void);
-<link linkend="int">int</link>         <link linkend="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</link>       (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
-                                             <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
-                                             <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
-                                             <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);
-#define     <link linkend="xmlSecTransformInputURIId">xmlSecTransformInputURIId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</link>     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecIOInit">xmlSecIOInit</link>                        (void);
+<link linkend="void">void</link>                <link linkend="xmlSecIOShutdown">xmlSecIOShutdown</link>                    (void);
+<link linkend="void">void</link>                <link linkend="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</link>            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</link>    (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</link>           (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
+                                                         <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
+                                                         <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
+                                                         <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);
+#define             <link linkend="xmlSecTransformInputURIId">xmlSecTransformInputURIId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</link>         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
 </synopsis>
 </refsynopsisdiv>
 
@@ -40,119 +37,109 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-io.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Input/output support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecIOInit">xmlSecIOInit ()</title>
-<indexterm><primary>xmlSecIOInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecIOInit                    (void);</programlisting>
+<refsect1 id="xmlsec-io.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecIOInit" role="function">
+<title>xmlSecIOInit ()</title>
+<indexterm zone="xmlSecIOInit"><primary sortas="xmlSecIOInit">xmlSecIOInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIOInit                        (void);</programlisting>
 <para>
 The IO initialization (called from <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function).
 Applications should not call this function directly.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIOShutdown">xmlSecIOShutdown ()</title>
-<indexterm><primary>xmlSecIOShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecIOShutdown                (void);</programlisting>
+<refsect2 id="xmlSecIOShutdown" role="function">
+<title>xmlSecIOShutdown ()</title>
+<indexterm zone="xmlSecIOShutdown"><primary sortas="xmlSecIOShutdown">xmlSecIOShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecIOShutdown                    (void);</programlisting>
 <para>
 The IO clenaup (called from <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function).
 Applications should not call this function directly.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks ()</title>
-<indexterm><primary>xmlSecIOCleanupCallbacks</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecIOCleanupCallbacks        (void);</programlisting>
+<refsect2 id="xmlSecIOCleanupCallbacks" role="function">
+<title>xmlSecIOCleanupCallbacks ()</title>
+<indexterm zone="xmlSecIOCleanupCallbacks"><primary sortas="xmlSecIOCleanupCallbacks">xmlSecIOCleanupCallbacks</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecIOCleanupCallbacks            (void);</programlisting>
 <para>
 Clears the entire input callback table. this includes the
 compiled-in I/O.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks ()</title>
-<indexterm><primary>xmlSecIORegisterDefaultCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecIORegisterDefaultCallbacks
-                                            (void);</programlisting>
+<refsect2 id="xmlSecIORegisterDefaultCallbacks" role="function">
+<title>xmlSecIORegisterDefaultCallbacks ()</title>
+<indexterm zone="xmlSecIORegisterDefaultCallbacks"><primary sortas="xmlSecIORegisterDefaultCallbacks">xmlSecIORegisterDefaultCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIORegisterDefaultCallbacks    (void);</programlisting>
 <para>
 Registers the default compiled-in I/O handlers.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks ()</title>
-<indexterm><primary>xmlSecIORegisterCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecIORegisterCallbacks       (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
-                                             <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
-                                             <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
-                                             <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);</programlisting>
+<refsect2 id="xmlSecIORegisterCallbacks" role="function">
+<title>xmlSecIORegisterCallbacks ()</title>
+<indexterm zone="xmlSecIORegisterCallbacks"><primary sortas="xmlSecIORegisterCallbacks">xmlSecIORegisterCallbacks</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIORegisterCallbacks           (<link linkend="xmlInputMatchCallback">xmlInputMatchCallback</link> matchFunc,
+                                                         <link linkend="xmlInputOpenCallback">xmlInputOpenCallback</link> openFunc,
+                                                         <link linkend="xmlInputReadCallback">xmlInputReadCallback</link> readFunc,
+                                                         <link linkend="xmlInputCloseCallback">xmlInputCloseCallback</link> closeFunc);</programlisting>
 <para>
 Register a new set of I/O callback for handling parser input.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>matchFunc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>matchFunc</parameter>&#160;:</term>
 <listitem><simpara>  	the protocol match callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>openFunc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>openFunc</parameter>&#160;:</term>
 <listitem><simpara>  		the open stream callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>readFunc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>readFunc</parameter>&#160;:</term>
 <listitem><simpara>  		the read from stream callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>closeFunc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>closeFunc</parameter>&#160;:</term>
 <listitem><simpara>  	the close stream callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the 0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInputURIId">xmlSecTransformInputURIId</title>
-<indexterm><primary>xmlSecTransformInputURIId</primary></indexterm><programlisting>#define     xmlSecTransformInputURIId</programlisting>
+<refsect2 id="xmlSecTransformInputURIId" role="macro">
+<title>xmlSecTransformInputURIId</title>
+<indexterm zone="xmlSecTransformInputURIId"><primary sortas="xmlSecTransformInputURIId">xmlSecTransformInputURIId</primary></indexterm><programlisting>#define             xmlSecTransformInputURIId</programlisting>
 <para>
 The Input URI transform id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass ()</title>
-<indexterm><primary>xmlSecTransformInputURIGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformInputURIGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformInputURIGetKlass" role="function">
+<title>xmlSecTransformInputURIGetKlass ()</title>
+<indexterm zone="xmlSecTransformInputURIGetKlass"><primary sortas="xmlSecTransformInputURIGetKlass">xmlSecTransformInputURIGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInputURIGetKlass     (void);</programlisting>
 <para>
 The input uri transform klass. Reads binary data from an uri.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>input URI transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> input URI transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen ()</title>
-<indexterm><primary>xmlSecTransformInputURIOpen</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformInputURIOpen     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTransformInputURIOpen" role="function">
+<title>xmlSecTransformInputURIOpen ()</title>
+<indexterm zone="xmlSecTransformInputURIOpen"><primary sortas="xmlSecTransformInputURIOpen">xmlSecTransformInputURIOpen</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformInputURIOpen         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Opens the given <parameter>uri</parameter> for reading.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to IO transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara> 		the URL to open.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/keyinfo.sgml b/docs/api/sgml/keyinfo.sgml
index 42433bd..b22bff9 100644
--- a/docs/api/sgml/keyinfo.sgml
+++ b/docs/api/sgml/keyinfo.sgml
@@ -1,64 +1,62 @@
 <refentry id="xmlsec-keyinfo">
 <refmeta>
-<refentrytitle>keyinfo</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-keyinfo.top_of_page">keyinfo</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keyinfo</refname><refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node parser.</refpurpose>
+<refname>keyinfo</refname>
+<refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node parser.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-keyinfo.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</link>           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</link>          (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-enum        <link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link>;
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</link>
-#define     <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</link>
-struct      <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>;
-<link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link> <link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</link>         (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</link>      (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</link>           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</link>    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</link>    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</link>       (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</link>    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecKeyDataNameId">xmlSecKeyDataNameId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</link>   (void);
-#define     <link linkend="xmlSecKeyDataValueId">xmlSecKeyDataValueId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</link>  (void);
-#define     <link linkend="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</link>               (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</link>              (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+enum                <link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link>;
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</link>
+#define             <link linkend="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</link>
+struct              <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>;
+<link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link>  <link linkend="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</link>             (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</link>             (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</link>          (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</link>            (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</link>               (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</link>           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</link>        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecKeyDataNameId">xmlSecKeyDataNameId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</link>           (void);
+#define             <link linkend="xmlSecKeyDataValueId">xmlSecKeyDataValueId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</link>          (void);
+#define             <link linkend="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</link>   (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -70,63 +68,61 @@ struct      <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-keyinfo.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node parser.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead ()</title>
-<indexterm><primary>xmlSecKeyInfoNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyInfoNodeRead           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect1 id="xmlsec-keyinfo.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecKeyInfoNodeRead" role="function">
+<title>xmlSecKeyInfoNodeRead ()</title>
+<indexterm zone="xmlSecKeyInfoNodeRead"><primary sortas="xmlSecKeyInfoNodeRead">xmlSecKeyInfoNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoNodeRead               (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Parses the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element <parameter>keyInfoNode</parameter>, extracts the key data
 and stores into <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to result key object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or -1 if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite ()</title>
-<indexterm><primary>xmlSecKeyInfoNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyInfoNodeWrite          (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyInfoNodeWrite" role="function">
+<title>xmlSecKeyInfoNodeWrite ()</title>
+<indexterm zone="xmlSecKeyInfoNodeWrite"><primary sortas="xmlSecKeyInfoNodeWrite">xmlSecKeyInfoNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoNodeWrite              (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Writes the <parameter>key</parameter> into the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element template <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or -1 if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or -1 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoMode">enum xmlSecKeyInfoMode</title>
-<indexterm><primary>xmlSecKeyInfoMode</primary></indexterm><programlisting>typedef enum {
+<refsect2 id="xmlSecKeyInfoMode" role="enum">
+<title>enum xmlSecKeyInfoMode</title>
+<indexterm zone="xmlSecKeyInfoMode"><primary sortas="xmlSecKeyInfoMode">xmlSecKeyInfoMode</primary></indexterm><programlisting>typedef enum {
     xmlSecKeyInfoModeRead = 0,
     xmlSecKeyInfoModeWrite
 } xmlSecKeyInfoMode;
@@ -134,153 +130,138 @@ Writes the <parameter>key</parameter> into the <ulink URL="http://www.w3.org/TR/
 <para>
 The <parameter>xmlSecKeyInfoCtx</parameter> operation mode (read or write).</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecKeyInfoModeRead" role="constant">
 <term><literal>xmlSecKeyInfoModeRead</literal></term>
 <listitem><simpara> read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyInfoModeWrite" role="constant">
 <term><literal>xmlSecKeyInfoModeWrite</literal></term>
 <listitem><simpara> write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND		0x00000001
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND		0x00000001
 </programlisting>
 <para>
 If flag is set then we will continue reading <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> 
 element even when key is already found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD		0x00000002
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD		0x00000002
 </programlisting>
 <para>
 If flag is set then we abort if an unknown <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> 
 child is found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN		0x00000004
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN		0x00000004
 </programlisting>
 <para>
 If flags is set then we abort if an unknown key name 
 (content of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName ">&lt;dsig:KeyName /&gt;</ulink> element) is found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD	0x00000008
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD	0x00000008
 </programlisting>
 <para>
 If flags is set then we abort if an unknown <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink> 
 child is found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF	0x00000010
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF	0x00000010
 </programlisting>
 <para>
 If flag is set then we abort if an unknown href attribute
 of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element is found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF	0x00000020
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF	0x00000020
 </programlisting>
 <para>
 If flag is set then we abort if an href attribute <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> 
 element does not match the real key data type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD	0x00000100
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD	0x00000100
 </programlisting>
 <para>
 If flags is set then we abort if an unknown <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink> 
 child is found.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS		0x00000200
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS		0x00000200
 </programlisting>
 <para>
 If flag is set then we'll load certificates from <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink>
 element without verification.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT	0x00000400
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT	0x00000400
 </programlisting>
 <para>
 If flag is set then we'll stop when we could not resolve reference
 to certificate from <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial ">&lt;dsig:X509IssuerSerial /&gt;</ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI ">&lt;dsig:X509SKI /&gt;</ulink> or 
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName ">&lt;dsig:X509SubjectName /&gt;</ulink> elements.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT	0x00000800
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT	0x00000800
 </programlisting>
 <para>
 If the flag is set then we'll stop when <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data ">&lt;dsig:X509Data /&gt;</ulink> element
 processing does not return a verified certificate.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION 0x00001000
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION 0x00001000
 </programlisting>
 <para>
 If the flag is set then we'll stop when <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element
 processing fails.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE			0x00002000
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE			0x00002000
 </programlisting>
 <para>
 If the flag is set then we'll stop when we found an empty node.
 Otherwise we just ignore it.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</title>
-<indexterm><primary>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS	0x00004000
+<refsect2 id="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS" role="macro">
+<title>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</title>
+<indexterm zone="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS"><primary sortas="XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</primary></indexterm><programlisting>#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS	0x00004000
 </programlisting>
 <para>
 If the flag is set then we'll skip strict checking of certs and CRLs</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtx">struct xmlSecKeyInfoCtx</title>
-<indexterm><primary>xmlSecKeyInfoCtx</primary></indexterm><programlisting>struct xmlSecKeyInfoCtx {
-
+<refsect2 id="xmlSecKeyInfoCtx" role="struct">
+<title>struct xmlSecKeyInfoCtx</title>
+<indexterm zone="xmlSecKeyInfoCtx"><primary sortas="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</primary></indexterm><programlisting>struct xmlSecKeyInfoCtx {
     void*				userData;
     unsigned int			flags;
     unsigned int			flags2;
@@ -321,73 +302,72 @@ If the flag is set then we'll skip strict checking of certs and CRLs</para>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> reading or writing context.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>userData</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
 <listitem><simpara>		the pointer to user data (xmlsec and xmlsec-crypto 
 		never touch this).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
 <listitem><simpara> 		the bit mask for flags that control processin.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags2</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
 <listitem><simpara> 		reserved for future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> <structfield>keysMngr</structfield></term>
+<term><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>&#160;<structfield>keysMngr</structfield>;</term>
 <listitem><simpara>		the pointer to current keys manager.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link> <structfield>mode</structfield></term>
+<term><link linkend="xmlSecKeyInfoMode">xmlSecKeyInfoMode</link>&#160;<structfield>mode</structfield>;</term>
 <listitem><simpara> 		do we read or write <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> element.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>enabledKeyData</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>enabledKeyData</structfield>;</term>
 <listitem><simpara> 	the list of enabled <parameter>xmlSecKeyDataId</parameter> (if list is 
 		empty then all data ids are enabled).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>base64LineSize</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>base64LineSize</structfield>;</term>
 <listitem><simpara>	the max columns size for base64 encoding.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>retrievalMethodCtx</structfield></term>
+<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>retrievalMethodCtx</structfield>;</term>
 <listitem><simpara> the transforms context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink>
 			element processing.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>maxRetrievalMethodLevel</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>maxRetrievalMethodLevel</structfield>;</term>
 <listitem><simpara> the max recursion level when processing
 		<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element; default level is 1 
 		(see also <parameter>curRetrievalMethodLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> <structfield>encCtx</structfield></term>
+<term><link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link>&#160;<structfield>encCtx</structfield>;</term>
 <listitem><simpara>		the encryption context for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey ">&lt;dsig:EncryptedKey /&gt;</ulink> element
 		processing.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>maxEncryptedKeyLevel</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>maxEncryptedKeyLevel</structfield>;</term>
 <listitem><simpara> the max recursion level when processing 
 		<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element; default level is 1 
 		(see <parameter>curEncryptedKeyLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="time-t">time_t</link> <structfield>certsVerificationTime</structfield></term>
+<term><link linkend="time-t">time_t</link>&#160;<structfield>certsVerificationTime</structfield>;</term>
 <listitem><simpara> the time to use for X509 certificates verification
 		("not valid before" and "not valid after" checks);
 		if <parameter>certsVerificationTime</parameter> is equal to 0 (default) 
@@ -396,192 +376,182 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInf
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>certsVerificationDepth</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>certsVerificationDepth</structfield>;</term>
 <listitem><simpara> the max certifications chain length (default is 9).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>pgpReserved</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>pgpReserved</structfield>;</term>
 <listitem><simpara>	reserved for PGP.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>curRetrievalMethodLevel</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>curRetrievalMethodLevel</structfield>;</term>
 <listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> element 
 		processing level (see <parameter>maxRetrievalMethodLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>curEncryptedKeyLevel</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>curEncryptedKeyLevel</structfield>;</term>
 <listitem><simpara> the current <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey ">&lt;enc:EncryptedKey /&gt;</ulink> element
 		processing level (see <parameter>maxEncryptedKeyLevel</parameter>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyReq">xmlSecKeyReq</link> <structfield>keyReq</structfield></term>
+<term><link linkend="xmlSecKeyReq">xmlSecKeyReq</link>&#160;<structfield>keyReq</structfield>;</term>
 <listitem><simpara>		the current key requirements.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link> xmlSecKeyInfoCtxCreate  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxCreate" role="function">
+<title>xmlSecKeyInfoCtxCreate ()</title>
+<indexterm zone="xmlSecKeyInfoCtxCreate"><primary sortas="xmlSecKeyInfoCtxCreate">xmlSecKeyInfoCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyInfoCtxPtr">xmlSecKeyInfoCtxPtr</link>  xmlSecKeyInfoCtxCreate             (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Allocates and initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 Caller is responsible for freeing it by calling <link linkend="xmlSecKeyInfoCtxDestroy"><type>xmlSecKeyInfoCtxDestroy</type></link> 
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated object or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyInfoCtxDestroy         (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxDestroy" role="function">
+<title>xmlSecKeyInfoCtxDestroy ()</title>
+<indexterm zone="xmlSecKeyInfoCtxDestroy"><primary sortas="xmlSecKeyInfoCtxDestroy">xmlSecKeyInfoCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDestroy             (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Destroys <parameter>keyInfoCtx</parameter> object created with <link linkend="xmlSecKeyInfoCtxCreate"><type>xmlSecKeyInfoCtxCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyInfoCtxInitialize      (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxInitialize" role="function">
+<title>xmlSecKeyInfoCtxInitialize ()</title>
+<indexterm zone="xmlSecKeyInfoCtxInitialize"><primary sortas="xmlSecKeyInfoCtxInitialize">xmlSecKeyInfoCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxInitialize          (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context. Caller is 
 responsible for cleaning it up by <link linkend="xmlSecKeyInfoCtxFinalize"><type>xmlSecKeyInfoCtxFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyInfoCtxFinalize        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxFinalize" role="function">
+<title>xmlSecKeyInfoCtxFinalize ()</title>
+<indexterm zone="xmlSecKeyInfoCtxFinalize"><primary sortas="xmlSecKeyInfoCtxFinalize">xmlSecKeyInfoCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxFinalize            (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Cleans up the <parameter>keyInfoCtx</parameter> initialized with <link linkend="xmlSecKeyInfoCtxInitialize"><type>xmlSecKeyInfoCtxInitialize</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyInfoCtxReset           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxReset" role="function">
+<title>xmlSecKeyInfoCtxReset ()</title>
+<indexterm zone="xmlSecKeyInfoCtxReset"><primary sortas="xmlSecKeyInfoCtxReset">xmlSecKeyInfoCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxReset               (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Resets the <parameter>keyInfoCtx</parameter> state. User settings are not changed.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyInfoCtxCopyUserPref    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxCopyUserPref" role="function">
+<title>xmlSecKeyInfoCtxCopyUserPref ()</title>
+<indexterm zone="xmlSecKeyInfoCtxCopyUserPref"><primary sortas="xmlSecKeyInfoCtxCopyUserPref">xmlSecKeyInfoCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxCopyUserPref        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> dst,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> src);</programlisting>
 <para>
 Copies user preferences from <parameter>src</parameter> context to <parameter>dst</parameter> context.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxCreateEncCtx</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyInfoCtxCreateEncCtx    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxCreateEncCtx" role="function">
+<title>xmlSecKeyInfoCtxCreateEncCtx ()</title>
+<indexterm zone="xmlSecKeyInfoCtxCreateEncCtx"><primary sortas="xmlSecKeyInfoCtxCreateEncCtx">xmlSecKeyInfoCtxCreateEncCtx</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyInfoCtxCreateEncCtx        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Creates encryption context form processing <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> child
 of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyInfoCtxDebugDump       (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxDebugDump" role="function">
+<title>xmlSecKeyInfoCtxDebugDump ()</title>
+<indexterm zone="xmlSecKeyInfoCtxDebugDump"><primary sortas="xmlSecKeyInfoCtxDebugDump">xmlSecKeyInfoCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDebugDump           (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints user settings and current context state to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the output file pointer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyInfoCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyInfoCtxDebugXmlDump    (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyInfoCtxDebugXmlDump" role="function">
+<title>xmlSecKeyInfoCtxDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyInfoCtxDebugXmlDump"><primary sortas="xmlSecKeyInfoCtxDebugXmlDump">xmlSecKeyInfoCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyInfoCtxDebugXmlDump        (<link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints user settings and current context state in XML format to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the output file pointer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataNameId">xmlSecKeyDataNameId</title>
-<indexterm><primary>xmlSecKeyDataNameId</primary></indexterm><programlisting>#define xmlSecKeyDataNameId 		xmlSecKeyDataNameGetKlass()
+<refsect2 id="xmlSecKeyDataNameId" role="macro">
+<title>xmlSecKeyDataNameId</title>
+<indexterm zone="xmlSecKeyDataNameId"><primary sortas="xmlSecKeyDataNameId">xmlSecKeyDataNameId</primary></indexterm><programlisting>#define xmlSecKeyDataNameId 		xmlSecKeyDataNameGetKlass()
 </programlisting>
 <para>
 The &lt;dsig:KeyName&gt; processing class.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataNameGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataNameGetKlass   (void);</programlisting>
+<refsect2 id="xmlSecKeyDataNameGetKlass" role="function">
+<title>xmlSecKeyDataNameGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataNameGetKlass"><primary sortas="xmlSecKeyDataNameGetKlass">xmlSecKeyDataNameGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataNameGetKlass           (void);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element key data klass 
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-KeyName"><type>sec-KeyName</type></link>):
@@ -595,23 +565,21 @@ other protocol-related information that indirectly identifies a key pair.
 (Common uses of KeyName include simple string names for keys, a key index, 
 a distinguished name (DN), an email address, etc.)</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element processing key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataValueId">xmlSecKeyDataValueId</title>
-<indexterm><primary>xmlSecKeyDataValueId</primary></indexterm><programlisting>#define xmlSecKeyDataValueId		xmlSecKeyDataValueGetKlass()
+<refsect2 id="xmlSecKeyDataValueId" role="macro">
+<title>xmlSecKeyDataValueId</title>
+<indexterm zone="xmlSecKeyDataValueId"><primary sortas="xmlSecKeyDataValueId">xmlSecKeyDataValueId</primary></indexterm><programlisting>#define xmlSecKeyDataValueId		xmlSecKeyDataValueGetKlass()
 </programlisting>
 <para>
 The &lt;dsig:KeyValue&gt; processing class.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataValueGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataValueGetKlass  (void);</programlisting>
+<refsect2 id="xmlSecKeyDataValueGetKlass" role="function">
+<title>xmlSecKeyDataValueGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataValueGetKlass"><primary sortas="xmlSecKeyDataValueGetKlass">xmlSecKeyDataValueGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataValueGetKlass          (void);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element key data klass 
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-KeyValue"><type>sec-KeyValue</type></link>):
@@ -620,24 +588,22 @@ The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyVal
 The KeyValue element contains a single public key that may be useful in 
 validating the signature.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</title>
-<indexterm><primary>xmlSecKeyDataRetrievalMethodId</primary></indexterm><programlisting>#define xmlSecKeyDataRetrievalMethodId	xmlSecKeyDataRetrievalMethodGetKlass()
+<refsect2 id="xmlSecKeyDataRetrievalMethodId" role="macro">
+<title>xmlSecKeyDataRetrievalMethodId</title>
+<indexterm zone="xmlSecKeyDataRetrievalMethodId"><primary sortas="xmlSecKeyDataRetrievalMethodId">xmlSecKeyDataRetrievalMethodId</primary></indexterm><programlisting>#define xmlSecKeyDataRetrievalMethodId	xmlSecKeyDataRetrievalMethodGetKlass()
 </programlisting>
 <para>
 The &lt;dsig:RetrievalMethod&gt; processing class.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataRetrievalMethodGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataRetrievalMethodGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataRetrievalMethodGetKlass" role="function">
+<title>xmlSecKeyDataRetrievalMethodGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataRetrievalMethodGetKlass"><primary sortas="xmlSecKeyDataRetrievalMethodGetKlass">xmlSecKeyDataRetrievalMethodGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataRetrievalMethodGetKlass
+                                                        (void);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> element key data klass 
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-RetrievalMethod"><type>sec-RetrievalMethod</type></link>):
@@ -653,24 +619,21 @@ sequence of X509Certificate elements.
 RetrievalMethod uses the same syntax and dereferencing behavior as 
 Reference's URI and The Reference Processing Model.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> element processing key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</title>
-<indexterm><primary>xmlSecKeyDataEncryptedKeyId</primary></indexterm><programlisting>#define xmlSecKeyDataEncryptedKeyId	xmlSecKeyDataEncryptedKeyGetKlass()
+<refsect2 id="xmlSecKeyDataEncryptedKeyId" role="macro">
+<title>xmlSecKeyDataEncryptedKeyId</title>
+<indexterm zone="xmlSecKeyDataEncryptedKeyId"><primary sortas="xmlSecKeyDataEncryptedKeyId">xmlSecKeyDataEncryptedKeyId</primary></indexterm><programlisting>#define xmlSecKeyDataEncryptedKeyId	xmlSecKeyDataEncryptedKeyGetKlass()
 </programlisting>
 <para>
 The &lt;enc:EncryptedKey&gt; processing class.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataEncryptedKeyGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataEncryptedKeyGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataEncryptedKeyGetKlass" role="function">
+<title>xmlSecKeyDataEncryptedKeyGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataEncryptedKeyGetKlass"><primary sortas="xmlSecKeyDataEncryptedKeyGetKlass">xmlSecKeyDataEncryptedKeyGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataEncryptedKeyGetKlass   (void);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element key data klass 
 (http://www.w3.org/TR/xmlenc-core/<link linkend="sec-EncryptedKey"><type>sec-EncryptedKey</type></link>):
@@ -684,9 +647,8 @@ is always encrypted to the recipient(s). When EncryptedKey is decrypted the
 resulting octets are made available to the EncryptionMethod algorithm 
 without any additional processing.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element processing key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element processing key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/keys.sgml b/docs/api/sgml/keys.sgml
index caa594d..7ddb16b 100644
--- a/docs/api/sgml/keys.sgml
+++ b/docs/api/sgml/keys.sgml
@@ -1,106 +1,103 @@
 <refentry id="xmlsec-keys">
 <refmeta>
-<refentrytitle>keys</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-keys.top_of_page">keys</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keys</refname><refpurpose>Crypto key object definition.</refpurpose>
+<refname>keys</refname>
+<refpurpose>Crypto key object definition.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-keys.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-typedef     <link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>;
-#define     <link linkend="xmlSecKeyUsageSign">xmlSecKeyUsageSign</link>
-#define     <link linkend="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</link>
-#define     <link linkend="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</link>
-#define     <link linkend="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</link>
-#define     <link linkend="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</link>
-#define     <link linkend="xmlSecKeyUsageAny">xmlSecKeyUsageAny</link>
-<link linkend="int">int</link>         <link linkend="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</link>      (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</link>        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</link>           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</link>            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
-                                             <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);
-<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> <link linkend="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</link>  (const <link linkend="xmlChar">xmlChar</link> *application,
-                                             const <link linkend="xmlChar">xmlChar</link> *identifier);
-<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> <link linkend="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</link>
-                                            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</link>         (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</link>             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             const <link linkend="xmlChar">xmlChar</link> *application,
-                                             const <link linkend="xmlChar">xmlChar</link> *identifier);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</link>       (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</link>    (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-struct      <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWith</link>;
-#define     <link linkend="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</link>
-                                            (void);
-struct      <link linkend="xmlSecKeyReq">xmlSecKeyReq</link>;
-<link linkend="int">int</link>         <link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link>          (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link>            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyReqReset">xmlSecKeyReqReset</link>               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link>                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</link>            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</link>       (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</link>           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</link>        (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-struct      <link linkend="xmlSecKey">xmlSecKey</link>;
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyCreate">xmlSecKeyCreate</link>                (void);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDestroy">xmlSecKeyDestroy</link>                (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyEmpty">xmlSecKeyEmpty</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> <link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</link>             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyCopy">xmlSecKeyCopy</link>                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);
-const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecKeyGetName">xmlSecKeyGetName</link>             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecKeySetName">xmlSecKeySetName</link>                (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> <link linkend="xmlSecKeyGetType">xmlSecKeyGetType</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</link>          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecKeySetValue">xmlSecKeySetValue</link>               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link>        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyAdoptData">xmlSecKeyAdoptData</link>              (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDebugDump">xmlSecKeyDebugDump</link>              (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</link>           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyGenerate">xmlSecKeyGenerate</link>              (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</link>        (const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyMatch">xmlSecKeyMatch</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link>        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             const <link linkend="char">char</link> *filename);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-#define     <link linkend="xmlSecKeyIsValid">xmlSecKeyIsValid</link>                (key)
-#define     <link linkend="xmlSecKeyCheckId">xmlSecKeyCheckId</link>                (key, keyId)
-#define     <link linkend="xmlSecKeyPtrListId">xmlSecKeyPtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link>    (void);
+typedef             <link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>;
+#define             <link linkend="xmlSecKeyUsageSign">xmlSecKeyUsageSign</link>
+#define             <link linkend="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</link>
+#define             <link linkend="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</link>
+#define             <link linkend="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</link>
+#define             <link linkend="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</link>
+#define             <link linkend="xmlSecKeyUsageAny">xmlSecKeyUsageAny</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</link>          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</link>            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</link>               (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</link>                (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
+                                                         <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);
+<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link>  <link linkend="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</link>             (const <link linkend="xmlChar">xmlChar</link> *application,
+                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);
+<link linkend="xmlSecKeyUseWithPtr">xmlSecKeyUseWithPtr</link>  <link linkend="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</link>          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</link>             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</link>                 (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         const <link linkend="xmlChar">xmlChar</link> *application,
+                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</link>           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</link>        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+struct              <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWith</link>;
+#define             <link linkend="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</link>     (void);
+struct              <link linkend="xmlSecKeyReq">xmlSecKeyReq</link>;
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</link>              (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</link>                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyReqReset">xmlSecKeyReqReset</link>                   (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqCopy">xmlSecKeyReqCopy</link>                    (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</link>                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</link>           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</link>               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</link>            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+struct              <link linkend="xmlSecKey">xmlSecKey</link>;
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyCreate">xmlSecKeyCreate</link>                     (void);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDestroy">xmlSecKeyDestroy</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyEmpty">xmlSecKeyEmpty</link>                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyDuplicate">xmlSecKeyDuplicate</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyCopy">xmlSecKeyCopy</link>                       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);
+const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecKeyGetName">xmlSecKeyGetName</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeySetName">xmlSecKeySetName</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name);
+<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   <link linkend="xmlSecKeyGetType">xmlSecKeyGetType</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyGetValue">xmlSecKeyGetValue</link>                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeySetValue">xmlSecKeySetValue</link>                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);
+<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyGetData">xmlSecKeyGetData</link>                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
+<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyEnsureData">xmlSecKeyEnsureData</link>                 (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyAdoptData">xmlSecKeyAdoptData</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDebugDump">xmlSecKeyDebugDump</link>                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</link>               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyGenerate">xmlSecKeyGenerate</link>                   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</link>             (const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyMatch">xmlSecKeyMatch</link>                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</link>             (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         const <link linkend="char">char</link> *filename);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyReadMemory">xmlSecKeyReadMemory</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+#define             <link linkend="xmlSecKeyIsValid">xmlSecKeyIsValid</link>                    (key)
+#define             <link linkend="xmlSecKeyCheckId">xmlSecKeyCheckId</link>                    (key, keyId)
+#define             <link linkend="xmlSecKeyPtrListId">xmlSecKeyPtrListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</link>            (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -112,240 +109,221 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecKeyGetName">x
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-keys.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto key object definition.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecKeyUsage">xmlSecKeyUsage</title>
-<indexterm><primary>xmlSecKeyUsage</primary></indexterm><programlisting>typedef unsigned int 			xmlSecKeyUsage;
+<refsect1 id="xmlsec-keys.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecKeyUsage" role="typedef">
+<title>xmlSecKeyUsage</title>
+<indexterm zone="xmlSecKeyUsage"><primary sortas="xmlSecKeyUsage">xmlSecKeyUsage</primary></indexterm><programlisting>typedef unsigned int 			xmlSecKeyUsage;
 </programlisting>
 <para>
 The key usage.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageSign">xmlSecKeyUsageSign</title>
-<indexterm><primary>xmlSecKeyUsageSign</primary></indexterm><programlisting>#define	xmlSecKeyUsageSign		0x00000001
+<refsect2 id="xmlSecKeyUsageSign" role="macro">
+<title>xmlSecKeyUsageSign</title>
+<indexterm zone="xmlSecKeyUsageSign"><primary sortas="xmlSecKeyUsageSign">xmlSecKeyUsageSign</primary></indexterm><programlisting>#define	xmlSecKeyUsageSign		0x00000001
 </programlisting>
 <para>
 Key can be used in any way.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</title>
-<indexterm><primary>xmlSecKeyUsageVerify</primary></indexterm><programlisting>#define	xmlSecKeyUsageVerify		0x00000002
+<refsect2 id="xmlSecKeyUsageVerify" role="macro">
+<title>xmlSecKeyUsageVerify</title>
+<indexterm zone="xmlSecKeyUsageVerify"><primary sortas="xmlSecKeyUsageVerify">xmlSecKeyUsageVerify</primary></indexterm><programlisting>#define	xmlSecKeyUsageVerify		0x00000002
 </programlisting>
 <para>
 Key for signing.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</title>
-<indexterm><primary>xmlSecKeyUsageEncrypt</primary></indexterm><programlisting>#define	xmlSecKeyUsageEncrypt		0x00000004
+<refsect2 id="xmlSecKeyUsageEncrypt" role="macro">
+<title>xmlSecKeyUsageEncrypt</title>
+<indexterm zone="xmlSecKeyUsageEncrypt"><primary sortas="xmlSecKeyUsageEncrypt">xmlSecKeyUsageEncrypt</primary></indexterm><programlisting>#define	xmlSecKeyUsageEncrypt		0x00000004
 </programlisting>
 <para>
 Key for signature verification.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</title>
-<indexterm><primary>xmlSecKeyUsageDecrypt</primary></indexterm><programlisting>#define	xmlSecKeyUsageDecrypt		0x00000008
+<refsect2 id="xmlSecKeyUsageDecrypt" role="macro">
+<title>xmlSecKeyUsageDecrypt</title>
+<indexterm zone="xmlSecKeyUsageDecrypt"><primary sortas="xmlSecKeyUsageDecrypt">xmlSecKeyUsageDecrypt</primary></indexterm><programlisting>#define	xmlSecKeyUsageDecrypt		0x00000008
 </programlisting>
 <para>
 An encryption key.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</title>
-<indexterm><primary>xmlSecKeyUsageKeyExchange</primary></indexterm><programlisting>#define	xmlSecKeyUsageKeyExchange	0x00000010
+<refsect2 id="xmlSecKeyUsageKeyExchange" role="macro">
+<title>xmlSecKeyUsageKeyExchange</title>
+<indexterm zone="xmlSecKeyUsageKeyExchange"><primary sortas="xmlSecKeyUsageKeyExchange">xmlSecKeyUsageKeyExchange</primary></indexterm><programlisting>#define	xmlSecKeyUsageKeyExchange	0x00000010
 </programlisting>
 <para>
 The key is used for key exchange.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUsageAny">xmlSecKeyUsageAny</title>
-<indexterm><primary>xmlSecKeyUsageAny</primary></indexterm><programlisting>#define	xmlSecKeyUsageAny		0xFFFFFFFF
+<refsect2 id="xmlSecKeyUsageAny" role="macro">
+<title>xmlSecKeyUsageAny</title>
+<indexterm zone="xmlSecKeyUsageAny"><primary sortas="xmlSecKeyUsageAny">xmlSecKeyUsageAny</primary></indexterm><programlisting>#define	xmlSecKeyUsageAny		0xFFFFFFFF
 </programlisting>
 <para>
 A decryption key.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize ()</title>
-<indexterm><primary>xmlSecKeyUseWithInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyUseWithInitialize      (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<refsect2 id="xmlSecKeyUseWithInitialize" role="function">
+<title>xmlSecKeyUseWithInitialize ()</title>
+<indexterm zone="xmlSecKeyUseWithInitialize"><primary sortas="xmlSecKeyUseWithInitialize">xmlSecKeyUseWithInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithInitialize          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
 <para>
 Initializes <parameter>keyUseWith</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize ()</title>
-<indexterm><primary>xmlSecKeyUseWithFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyUseWithFinalize        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<refsect2 id="xmlSecKeyUseWithFinalize" role="function">
+<title>xmlSecKeyUseWithFinalize ()</title>
+<indexterm zone="xmlSecKeyUseWithFinalize"><primary sortas="xmlSecKeyUseWithFinalize">xmlSecKeyUseWithFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithFinalize            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
 <para>
 Finalizes <parameter>keyUseWith</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset ()</title>
-<indexterm><primary>xmlSecKeyUseWithReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyUseWithReset           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<refsect2 id="xmlSecKeyUseWithReset" role="function">
+<title>xmlSecKeyUseWithReset ()</title>
+<indexterm zone="xmlSecKeyUseWithReset"><primary sortas="xmlSecKeyUseWithReset">xmlSecKeyUseWithReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithReset               (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
 <para>
 Resets the <parameter>keyUseWith</parameter> to its state after initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy ()</title>
-<indexterm><primary>xmlSecKeyUseWithCopy</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyUseWithCopy            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
-                                             <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);</programlisting>
+<refsect2 id="xmlSecKeyUseWithCopy" role="function">
+<title>xmlSecKeyUseWithCopy ()</title>
+<indexterm zone="xmlSecKeyUseWithCopy"><primary sortas="xmlSecKeyUseWithCopy">xmlSecKeyUseWithCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithCopy                (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> dst,
+                                                         <link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> src);</programlisting>
 <para>
 Copies information from <parameter>dst</parameter> to <parameter>src</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to destination object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to source object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate ()</title>
-<indexterm><primary>xmlSecKeyUseWithCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> xmlSecKeyUseWithCreate  (const <link linkend="xmlChar">xmlChar</link> *application,
-                                             const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
+<refsect2 id="xmlSecKeyUseWithCreate" role="function">
+<title>xmlSecKeyUseWithCreate ()</title>
+<indexterm zone="xmlSecKeyUseWithCreate"><primary sortas="xmlSecKeyUseWithCreate">xmlSecKeyUseWithCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link>  xmlSecKeyUseWithCreate             (const <link linkend="xmlChar">xmlChar</link> *application,
+                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
 <para>
 Creates new xmlSecKeyUseWith object. The caller is responsible for destroying
 returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>application</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>application</parameter>&#160;:</term>
 <listitem><simpara>        the application value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>identifier</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>identifier</parameter>&#160;:</term>
 <listitem><simpara>         the identifier value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created object or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate ()</title>
-<indexterm><primary>xmlSecKeyUseWithDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> xmlSecKeyUseWithDuplicate
-                                            (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<refsect2 id="xmlSecKeyUseWithDuplicate" role="function">
+<title>xmlSecKeyUseWithDuplicate ()</title>
+<indexterm zone="xmlSecKeyUseWithDuplicate"><primary sortas="xmlSecKeyUseWithDuplicate">xmlSecKeyUseWithDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyUseWithPtr">xmlSecKeyUseWithPtr</link>  xmlSecKeyUseWithDuplicate          (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
 <para>
 Duplicates <parameter>keyUseWith</parameter> object. The caller is responsible for destroying
 returned object with <parameter>xmlSecKeyUseWithDestroy</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created object or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy ()</title>
-<indexterm><primary>xmlSecKeyUseWithDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyUseWithDestroy         (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
+<refsect2 id="xmlSecKeyUseWithDestroy" role="function">
+<title>xmlSecKeyUseWithDestroy ()</title>
+<indexterm zone="xmlSecKeyUseWithDestroy"><primary sortas="xmlSecKeyUseWithDestroy">xmlSecKeyUseWithDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDestroy             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith);</programlisting>
 <para>
 Destroys <parameter>keyUseWith</parameter> created with <parameter>xmlSecKeyUseWithCreate</parameter> or <parameter>xmlSecKeyUseWithDuplicate</parameter>
 functions.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet ()</title>
-<indexterm><primary>xmlSecKeyUseWithSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyUseWithSet             (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             const <link linkend="xmlChar">xmlChar</link> *application,
-                                             const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
+<refsect2 id="xmlSecKeyUseWithSet" role="function">
+<title>xmlSecKeyUseWithSet ()</title>
+<indexterm zone="xmlSecKeyUseWithSet"><primary sortas="xmlSecKeyUseWithSet">xmlSecKeyUseWithSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyUseWithSet                 (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         const <link linkend="xmlChar">xmlChar</link> *application,
+                                                         const <link linkend="xmlChar">xmlChar</link> *identifier);</programlisting>
 <para>
 Sets <parameter>application</parameter> and <parameter>identifier</parameter> in the <parameter>keyUseWith</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>application</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>application</parameter>&#160;:</term>
 <listitem><simpara>        the new application value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>identifier</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>identifier</parameter>&#160;:</term>
 <listitem><simpara>         the new identifier value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump ()</title>
-<indexterm><primary>xmlSecKeyUseWithDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyUseWithDebugDump       (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyUseWithDebugDump" role="function">
+<title>xmlSecKeyUseWithDebugDump ()</title>
+<indexterm zone="xmlSecKeyUseWithDebugDump"><primary sortas="xmlSecKeyUseWithDebugDump">xmlSecKeyUseWithDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDebugDump           (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyUseWithDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyUseWithDebugXmlDump    (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyUseWithDebugXmlDump" role="function">
+<title>xmlSecKeyUseWithDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyUseWithDebugXmlDump"><primary sortas="xmlSecKeyUseWithDebugXmlDump">xmlSecKeyUseWithDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyUseWithDebugXmlDump        (<link linkend="xmlSecKeyUseWith">xmlSecKeyUseWithPtr</link> keyUseWith,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyUseWith</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyUseWith</parameter>&#160;:</term>
 <listitem><simpara>         the pointer to information about key application/user.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWith">struct xmlSecKeyUseWith</title>
-<indexterm><primary>xmlSecKeyUseWith</primary></indexterm><programlisting>struct xmlSecKeyUseWith {
-
+<refsect2 id="xmlSecKeyUseWith" role="struct">
+<title>struct xmlSecKeyUseWith</title>
+<indexterm zone="xmlSecKeyUseWith"><primary sortas="xmlSecKeyUseWith">xmlSecKeyUseWith</primary></indexterm><programlisting>struct xmlSecKeyUseWith {
     xmlChar*                    application;
     xmlChar*                    identifier;
 
@@ -356,54 +334,49 @@ Prints xmlSecKeyUseWith debug information to a file <parameter>output</parameter
 <para>
 Information about application and user of the key.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>application</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>application</structfield>;</term>
 <listitem><simpara>        the application.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>identifier</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>identifier</structfield>;</term>
 <listitem><simpara>         the identifier.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for future use.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved2</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved2</structfield>;</term>
 <listitem><simpara>		reserved for future use.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</title>
-<indexterm><primary>xmlSecKeyUseWithPtrListId</primary></indexterm><programlisting>#define xmlSecKeyUseWithPtrListId	xmlSecKeyUseWithPtrListGetKlass()
+<refsect2 id="xmlSecKeyUseWithPtrListId" role="macro">
+<title>xmlSecKeyUseWithPtrListId</title>
+<indexterm zone="xmlSecKeyUseWithPtrListId"><primary sortas="xmlSecKeyUseWithPtrListId">xmlSecKeyUseWithPtrListId</primary></indexterm><programlisting>#define xmlSecKeyUseWithPtrListId	xmlSecKeyUseWithPtrListGetKlass()
 </programlisting>
 <para>
 The keys list klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass ()</title>
-<indexterm><primary>xmlSecKeyUseWithPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecKeyUseWithPtrListGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyUseWithPtrListGetKlass" role="function">
+<title>xmlSecKeyUseWithPtrListGetKlass ()</title>
+<indexterm zone="xmlSecKeyUseWithPtrListGetKlass"><primary sortas="xmlSecKeyUseWithPtrListGetKlass">xmlSecKeyUseWithPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyUseWithPtrListGetKlass     (void);</programlisting>
 <para>
 The key data list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key data list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReq">struct xmlSecKeyReq</title>
-<indexterm><primary>xmlSecKeyReq</primary></indexterm><programlisting>struct xmlSecKeyReq {
-
+<refsect2 id="xmlSecKeyReq" role="struct">
+<title>struct xmlSecKeyReq</title>
+<indexterm zone="xmlSecKeyReq"><primary sortas="xmlSecKeyReq">xmlSecKeyReq</primary></indexterm><programlisting>struct xmlSecKeyReq {
     xmlSecKeyDataId	        keyId;
     xmlSecKeyDataType		keyType;
     xmlSecKeyUsage		keyUsage;
@@ -417,176 +390,166 @@ The key data list klass.</para>
 <para>
 The key requirements information.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <structfield>keyId</structfield></term>
+<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>&#160;<structfield>keyId</structfield>;</term>
 <listitem><simpara>		the desired key value klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> <structfield>keyType</structfield></term>
+<term><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>&#160;<structfield>keyType</structfield>;</term>
 <listitem><simpara>		the desired key type.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link> <structfield>keyUsage</structfield></term>
+<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>&#160;<structfield>keyUsage</structfield>;</term>
 <listitem><simpara>		the desired key usage.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>keyBitsSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>keyBitsSize</structfield>;</term>
 <listitem><simpara>	the desired key size (in bits!).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>keyUseWithList</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>keyUseWithList</structfield>;</term>
 <listitem><simpara>     the desired key use with application/identifier information.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for future use.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved2</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved2</structfield>;</term>
 <listitem><simpara>		reserved for future use.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize ()</title>
-<indexterm><primary>xmlSecKeyReqInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyReqInitialize          (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecKeyReqInitialize" role="function">
+<title>xmlSecKeyReqInitialize ()</title>
+<indexterm zone="xmlSecKeyReqInitialize"><primary sortas="xmlSecKeyReqInitialize">xmlSecKeyReqInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqInitialize              (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Initialize key requirements object. Caller is responsible for
 cleaning it with <link linkend="xmlSecKeyReqFinalize"><type>xmlSecKeyReqFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize ()</title>
-<indexterm><primary>xmlSecKeyReqFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyReqFinalize            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecKeyReqFinalize" role="function">
+<title>xmlSecKeyReqFinalize ()</title>
+<indexterm zone="xmlSecKeyReqFinalize"><primary sortas="xmlSecKeyReqFinalize">xmlSecKeyReqFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqFinalize                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Cleans the key requirements object initialized with <link linkend="xmlSecKeyReqInitialize"><type>xmlSecKeyReqInitialize</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqReset">xmlSecKeyReqReset ()</title>
-<indexterm><primary>xmlSecKeyReqReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyReqReset               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecKeyReqReset" role="function">
+<title>xmlSecKeyReqReset ()</title>
+<indexterm zone="xmlSecKeyReqReset"><primary sortas="xmlSecKeyReqReset">xmlSecKeyReqReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqReset                   (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Resets key requirements object for new key search.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqCopy">xmlSecKeyReqCopy ()</title>
-<indexterm><primary>xmlSecKeyReqCopy</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyReqCopy                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);</programlisting>
+<refsect2 id="xmlSecKeyReqCopy" role="function">
+<title>xmlSecKeyReqCopy ()</title>
+<indexterm zone="xmlSecKeyReqCopy"><primary sortas="xmlSecKeyReqCopy">xmlSecKeyReqCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqCopy                    (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> dst,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> src);</programlisting>
 <para>
 Copies key requirements from <parameter>src</parameter> object to <parameter>dst</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey ()</title>
-<indexterm><primary>xmlSecKeyReqMatchKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyReqMatchKey            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyReqMatchKey" role="function">
+<title>xmlSecKeyReqMatchKey ()</title>
+<indexterm zone="xmlSecKeyReqMatchKey"><primary sortas="xmlSecKeyReqMatchKey">xmlSecKeyReqMatchKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqMatchKey                (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Checks whether <parameter>key</parameter> matches key requirements <parameter>keyReq</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if key matches requirements, 0 if not and a negative value
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if key matches requirements, 0 if not and a negative value
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue ()</title>
-<indexterm><primary>xmlSecKeyReqMatchKeyValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyReqMatchKeyValue       (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
+<refsect2 id="xmlSecKeyReqMatchKeyValue" role="function">
+<title>xmlSecKeyReqMatchKeyValue ()</title>
+<indexterm zone="xmlSecKeyReqMatchKeyValue"><primary sortas="xmlSecKeyReqMatchKeyValue">xmlSecKeyReqMatchKeyValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyReqMatchKeyValue           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
 <para>
 Checks whether <parameter>keyValue</parameter> matches key requirements <parameter>keyReq</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>value</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if key value matches requirements, 0 if not and a negative value
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if key value matches requirements, 0 if not and a negative value
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump ()</title>
-<indexterm><primary>xmlSecKeyReqDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyReqDebugDump           (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyReqDebugDump" role="function">
+<title>xmlSecKeyReqDebugDump ()</title>
+<indexterm zone="xmlSecKeyReqDebugDump"><primary sortas="xmlSecKeyReqDebugDump">xmlSecKeyReqDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqDebugDump               (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyReqDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyReqDebugXmlDump        (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyReqDebugXmlDump" role="function">
+<title>xmlSecKeyReqDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyReqDebugXmlDump"><primary sortas="xmlSecKeyReqDebugXmlDump">xmlSecKeyReqDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyReqDebugXmlDump            (<link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>keyReq</parameter> into <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKey">struct xmlSecKey</title>
-<indexterm><primary>xmlSecKey</primary></indexterm><programlisting>struct xmlSecKey {
-
+<refsect2 id="xmlSecKey" role="struct">
+<title>struct xmlSecKey</title>
+<indexterm zone="xmlSecKey"><primary sortas="xmlSecKey">xmlSecKey</primary></indexterm><programlisting>struct xmlSecKey {
     xmlChar*				name;
     xmlSecKeyDataPtr			value;
     xmlSecPtrListPtr			dataList;
@@ -598,445 +561,419 @@ Prints debug information about <parameter>keyReq</parameter> into <parameter>out
 <para>
 The key.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara> 		the key name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <structfield>value</structfield></term>
+<term><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>&#160;<structfield>value</structfield>;</term>
 <listitem><simpara>		the key value.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <structfield>dataList</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>&#160;<structfield>dataList</structfield>;</term>
 <listitem><simpara>		the key data list.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link> <structfield>usage</structfield></term>
+<term><link linkend="xmlSecKeyUsage">xmlSecKeyUsage</link>&#160;<structfield>usage</structfield>;</term>
 <listitem><simpara>		the key usage.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="time-t">time_t</link> <structfield>notValidBefore</structfield></term>
+<term><link linkend="time-t">time_t</link>&#160;<structfield>notValidBefore</structfield>;</term>
 <listitem><simpara>	the start key validity interval.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="time-t">time_t</link> <structfield>notValidAfter</structfield></term>
+<term><link linkend="time-t">time_t</link>&#160;<structfield>notValidAfter</structfield>;</term>
 <listitem><simpara>	the end key validity interval.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyCreate">xmlSecKeyCreate ()</title>
-<indexterm><primary>xmlSecKeyCreate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyCreate                (void);</programlisting>
+<refsect2 id="xmlSecKeyCreate" role="function">
+<title>xmlSecKeyCreate ()</title>
+<indexterm zone="xmlSecKeyCreate"><primary sortas="xmlSecKeyCreate">xmlSecKeyCreate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyCreate                     (void);</programlisting>
 <para>
 Allocates and initializes new key. Caller is responsible for 
 freeing returned object with <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated <parameter>xmlSecKey</parameter> structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated <parameter>xmlSecKey</parameter> structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDestroy">xmlSecKeyDestroy ()</title>
-<indexterm><primary>xmlSecKeyDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDestroy                (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyDestroy" role="function">
+<title>xmlSecKeyDestroy ()</title>
+<indexterm zone="xmlSecKeyDestroy"><primary sortas="xmlSecKeyDestroy">xmlSecKeyDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDestroy                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Destroys the key created using <link linkend="xmlSecKeyCreate"><type>xmlSecKeyCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyEmpty">xmlSecKeyEmpty ()</title>
-<indexterm><primary>xmlSecKeyEmpty</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyEmpty                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyEmpty" role="function">
+<title>xmlSecKeyEmpty ()</title>
+<indexterm zone="xmlSecKeyEmpty"><primary sortas="xmlSecKeyEmpty">xmlSecKeyEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyEmpty                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Clears the <parameter>key</parameter> data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDuplicate">xmlSecKeyDuplicate ()</title>
-<indexterm><primary>xmlSecKeyDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> xmlSecKeyDuplicate             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyDuplicate" role="function">
+<title>xmlSecKeyDuplicate ()</title>
+<indexterm zone="xmlSecKeyDuplicate"><primary sortas="xmlSecKeyDuplicate">xmlSecKeyDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeyDuplicate                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Creates a duplicate of the given <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated <link linkend="xmlSecKey"><type>xmlSecKey</type></link> structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyCopy">xmlSecKeyCopy ()</title>
-<indexterm><primary>xmlSecKeyCopy</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyCopy                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);</programlisting>
+<refsect2 id="xmlSecKeyCopy" role="function">
+<title>xmlSecKeyCopy ()</title>
+<indexterm zone="xmlSecKeyCopy"><primary sortas="xmlSecKeyCopy">xmlSecKeyCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyCopy                       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> keyDst,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> keySrc);</programlisting>
 <para>
 Copies key data from <parameter>keySrc</parameter> to <parameter>keyDst</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyDst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyDst</parameter>&#160;:</term>
 <listitem><simpara>		the destination key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keySrc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keySrc</parameter>&#160;:</term>
 <listitem><simpara>		the source key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGetName">xmlSecKeyGetName ()</title>
-<indexterm><primary>xmlSecKeyGetName</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* xmlSecKeyGetName             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyGetName" role="function">
+<title>xmlSecKeyGetName ()</title>
+<indexterm zone="xmlSecKeyGetName"><primary sortas="xmlSecKeyGetName">xmlSecKeyGetName</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecKeyGetName                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Gets key name (see also <link linkend="xmlSecKeySetName"><type>xmlSecKeySetName</type></link> function).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key name.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key name.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeySetName">xmlSecKeySetName ()</title>
-<indexterm><primary>xmlSecKeySetName</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeySetName                (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
+<refsect2 id="xmlSecKeySetName" role="function">
+<title>xmlSecKeySetName ()</title>
+<indexterm zone="xmlSecKeySetName"><primary sortas="xmlSecKeySetName">xmlSecKeySetName</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeySetName                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
 <para>
 Sets key name (see also <link linkend="xmlSecKeyGetName"><type>xmlSecKeyGetName</type></link> function).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the new key name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGetType">xmlSecKeyGetType ()</title>
-<indexterm><primary>xmlSecKeyGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> xmlSecKeyGetType          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyGetType" role="function">
+<title>xmlSecKeyGetType ()</title>
+<indexterm zone="xmlSecKeyGetType"><primary sortas="xmlSecKeyGetType">xmlSecKeyGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   xmlSecKeyGetType                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Gets <parameter>key</parameter> type.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key type.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGetValue">xmlSecKeyGetValue ()</title>
-<indexterm><primary>xmlSecKeyGetValue</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> xmlSecKeyGetValue          (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecKeyGetValue" role="function">
+<title>xmlSecKeyGetValue ()</title>
+<indexterm zone="xmlSecKeyGetValue"><primary sortas="xmlSecKeyGetValue">xmlSecKeyGetValue</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyGetValue                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Gets key value (see also <link linkend="xmlSecKeySetValue"><type>xmlSecKeySetValue</type></link> function).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key value (crypto material).
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key value (crypto material).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeySetValue">xmlSecKeySetValue ()</title>
-<indexterm><primary>xmlSecKeySetValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeySetValue               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
+<refsect2 id="xmlSecKeySetValue" role="function">
+<title>xmlSecKeySetValue ()</title>
+<indexterm zone="xmlSecKeySetValue"><primary sortas="xmlSecKeySetValue">xmlSecKeySetValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeySetValue                   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> value);</programlisting>
 <para>
 Sets key value (see also <link linkend="xmlSecKeyGetValue"><type>xmlSecKeyGetValue</type></link> function).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>value</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>value</parameter>&#160;:</term>
 <listitem><simpara>		the new value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGetData">xmlSecKeyGetData ()</title>
-<indexterm><primary>xmlSecKeyGetData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> xmlSecKeyGetData           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
+<refsect2 id="xmlSecKeyGetData" role="function">
+<title>xmlSecKeyGetData ()</title>
+<indexterm zone="xmlSecKeyGetData"><primary sortas="xmlSecKeyGetData">xmlSecKeyGetData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyGetData                    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
 <para>
 Gets key's data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the requested data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>additional data associated with the <parameter>key</parameter> (see also 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> additional data associated with the <parameter>key</parameter> (see also 
 <link linkend="xmlSecKeyAdoptData"><type>xmlSecKeyAdoptData</type></link> function).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyEnsureData">xmlSecKeyEnsureData ()</title>
-<indexterm><primary>xmlSecKeyEnsureData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> xmlSecKeyEnsureData        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
+<refsect2 id="xmlSecKeyEnsureData" role="function">
+<title>xmlSecKeyEnsureData ()</title>
+<indexterm zone="xmlSecKeyEnsureData"><primary sortas="xmlSecKeyEnsureData">xmlSecKeyEnsureData</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyEnsureData                 (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
 <para>
 If necessary, creates key data of <parameter>dataId</parameter> klass and adds to <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the requested data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to key data or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyAdoptData">xmlSecKeyAdoptData ()</title>
-<indexterm><primary>xmlSecKeyAdoptData</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyAdoptData              (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyAdoptData" role="function">
+<title>xmlSecKeyAdoptData ()</title>
+<indexterm zone="xmlSecKeyAdoptData"><primary sortas="xmlSecKeyAdoptData">xmlSecKeyAdoptData</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyAdoptData                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Adds <parameter>data</parameter> to the <parameter>key</parameter>. The <parameter>data</parameter> object will be destroyed
 by <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDebugDump">xmlSecKeyDebugDump ()</title>
-<indexterm><primary>xmlSecKeyDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDebugDump              (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDebugDump" role="function">
+<title>xmlSecKeyDebugDump ()</title>
+<indexterm zone="xmlSecKeyDebugDump"><primary sortas="xmlSecKeyDebugDump">xmlSecKeyDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDebugDump                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDebugXmlDump           (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDebugXmlDump" role="function">
+<title>xmlSecKeyDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyDebugXmlDump"><primary sortas="xmlSecKeyDebugXmlDump">xmlSecKeyDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDebugXmlDump               (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the information about the <parameter>key</parameter> to the <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGenerate">xmlSecKeyGenerate ()</title>
-<indexterm><primary>xmlSecKeyGenerate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyGenerate              (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecKeyGenerate" role="function">
+<title>xmlSecKeyGenerate ()</title>
+<indexterm zone="xmlSecKeyGenerate"><primary sortas="xmlSecKeyGenerate">xmlSecKeyGenerate</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyGenerate                   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Generates new key of requested klass <parameter>dataId</parameter> and <parameter>type</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the requested key klass (rsa, dsa, aes, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sizeBits</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
 <listitem><simpara>		the new key size (in bits!).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the new key type (session, permanent, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName ()</title>
-<indexterm><primary>xmlSecKeyGenerateByName</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyGenerateByName        (const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecKeyGenerateByName" role="function">
+<title>xmlSecKeyGenerateByName ()</title>
+<indexterm zone="xmlSecKeyGenerateByName"><primary sortas="xmlSecKeyGenerateByName">xmlSecKeyGenerateByName</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyGenerateByName             (const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Generates new key of requested <parameter>klass</parameter> and <parameter>type</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the requested key klass name (rsa, dsa, aes, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sizeBits</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
 <listitem><simpara>		the new key size (in bits!).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the new key type (session, permanent, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyMatch">xmlSecKeyMatch ()</title>
-<indexterm><primary>xmlSecKeyMatch</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyMatch                  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecKeyMatch" role="function">
+<title>xmlSecKeyMatch ()</title>
+<indexterm zone="xmlSecKeyMatch"><primary sortas="xmlSecKeyMatch">xmlSecKeyMatch</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyMatch                      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Checks whether the <parameter>key</parameter> matches the given criteria.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key name (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key requirements.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if the key satisfies the given criteria or 0 otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the key satisfies the given criteria or 0 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer ()</title>
-<indexterm><primary>xmlSecKeyReadBuffer</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyReadBuffer            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);</programlisting>
+<refsect2 id="xmlSecKeyReadBuffer" role="function">
+<title>xmlSecKeyReadBuffer ()</title>
+<indexterm zone="xmlSecKeyReadBuffer"><primary sortas="xmlSecKeyReadBuffer">xmlSecKeyReadBuffer</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadBuffer                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         <link linkend="xmlSecBuffer">xmlSecBuffer</link> *buffer);</programlisting>
 <para>
 Reads the key value of klass <parameter>dataId</parameter> from a buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the key value data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara>		the buffer that contains the binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile ()</title>
-<indexterm><primary>xmlSecKeyReadBinaryFile</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyReadBinaryFile        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             const <link linkend="char">char</link> *filename);</programlisting>
+<refsect2 id="xmlSecKeyReadBinaryFile" role="function">
+<title>xmlSecKeyReadBinaryFile ()</title>
+<indexterm zone="xmlSecKeyReadBinaryFile"><primary sortas="xmlSecKeyReadBinaryFile">xmlSecKeyReadBinaryFile</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadBinaryFile             (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         const <link linkend="char">char</link> *filename);</programlisting>
 <para>
 Reads the key value of klass <parameter>dataId</parameter> from a binary file <parameter>filename</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the key value data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key binary filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyReadMemory">xmlSecKeyReadMemory ()</title>
-<indexterm><primary>xmlSecKeyReadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecKeyReadMemory            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
+<refsect2 id="xmlSecKeyReadMemory" role="function">
+<title>xmlSecKeyReadMemory ()</title>
+<indexterm zone="xmlSecKeyReadMemory"><primary sortas="xmlSecKeyReadMemory">xmlSecKeyReadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecKeyReadMemory                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
 <para>
 Reads the key value of klass <parameter>dataId</parameter> from a memory block <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the key value data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the memory containing the key
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara> 		the size of the memory block
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyIsValid">xmlSecKeyIsValid()</title>
-<indexterm><primary>xmlSecKeyIsValid</primary></indexterm><programlisting>#define     xmlSecKeyIsValid(key)</programlisting>
+<refsect2 id="xmlSecKeyIsValid" role="macro">
+<title>xmlSecKeyIsValid()</title>
+<indexterm zone="xmlSecKeyIsValid"><primary sortas="xmlSecKeyIsValid">xmlSecKeyIsValid</primary></indexterm><programlisting>#define             xmlSecKeyIsValid(key)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>key</parameter> is not NULL and <parameter>key</parameter>-&gt;id is not NULL
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> the pointer to key.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyCheckId">xmlSecKeyCheckId()</title>
-<indexterm><primary>xmlSecKeyCheckId</primary></indexterm><programlisting>#define     xmlSecKeyCheckId(key, keyId)</programlisting>
+<refsect2 id="xmlSecKeyCheckId" role="macro">
+<title>xmlSecKeyCheckId()</title>
+<indexterm zone="xmlSecKeyCheckId"><primary sortas="xmlSecKeyCheckId">xmlSecKeyCheckId</primary></indexterm><programlisting>#define             xmlSecKeyCheckId(key, keyId)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>key</parameter> is valid and <parameter>key</parameter>'s id is equal to <parameter>keyId</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyId</parameter>&#160;:</term>
 <listitem><simpara> the key Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyPtrListId">xmlSecKeyPtrListId</title>
-<indexterm><primary>xmlSecKeyPtrListId</primary></indexterm><programlisting>#define xmlSecKeyPtrListId	xmlSecKeyPtrListGetKlass()
+<refsect2 id="xmlSecKeyPtrListId" role="macro">
+<title>xmlSecKeyPtrListId</title>
+<indexterm zone="xmlSecKeyPtrListId"><primary sortas="xmlSecKeyPtrListId">xmlSecKeyPtrListId</primary></indexterm><programlisting>#define xmlSecKeyPtrListId	xmlSecKeyPtrListGetKlass()
 </programlisting>
 <para>
 The keys list klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass ()</title>
-<indexterm><primary>xmlSecKeyPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecKeyPtrListGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecKeyPtrListGetKlass" role="function">
+<title>xmlSecKeyPtrListGetKlass ()</title>
+<indexterm zone="xmlSecKeyPtrListGetKlass"><primary sortas="xmlSecKeyPtrListGetKlass">xmlSecKeyPtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyPtrListGetKlass            (void);</programlisting>
 <para>
 The keys list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>keys list id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> keys list id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/keysdata.sgml b/docs/api/sgml/keysdata.sgml
index 0fc7412..21e73f2 100644
--- a/docs/api/sgml/keysdata.sgml
+++ b/docs/api/sgml/keysdata.sgml
@@ -1,202 +1,185 @@
 <refentry id="xmlsec-keysdata">
 <refmeta>
-<refentrytitle>keysdata</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-keysdata.top_of_page">keysdata</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keysdata</refname><refpurpose>Crypto key data object definition.</refpurpose>
+<refname>keysdata</refname>
+<refpurpose>Crypto key data object definition.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-keysdata.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-typedef     <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>;
-#define     <link linkend="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</link>
-#define     <link linkend="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</link>
-#define     <link linkend="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</link>
-#define     <link linkend="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</link>
-#define     <link linkend="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</link>
-#define     <link linkend="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</link>
-typedef     <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>;
-#define     <link linkend="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</link>
-#define     <link linkend="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</link>
-#define     <link linkend="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</link>
-#define     <link linkend="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</link>
-#define     <link linkend="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</link>
-#define     <link linkend="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</link>
-#define     <link linkend="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</link>
-#define     <link linkend="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</link>
-#define     <link linkend="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</link>
-enum        <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link>;
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</link>        (void);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</link>            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</link>        (void);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</link> (void);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</link>        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
-struct      <link linkend="xmlSecKeyData">xmlSecKeyData</link>;
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyDataCreate">xmlSecKeyDataCreate</link>        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
-<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> <link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</link>            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> <link linkend="xmlSecKeyDataGetType">xmlSecKeyDataGetType</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</link>            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</link>           (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</link>           (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-#define     <link linkend="xmlSecKeyDataGetName">xmlSecKeyDataGetName</link>            (data)
-#define     <link linkend="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</link>            (data)
-#define     <link linkend="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</link>            (data, dataId)
-#define     <link linkend="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</link>         (data, usg)
-#define     <link linkend="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</link>          (data, size)
-#define     <link linkend="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</link>
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataInitMethod">*xmlSecKeyDataInitMethod</link>)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataDuplicateMethod">*xmlSecKeyDataDuplicateMethod</link>) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
-<link linkend="void">void</link>        (<link linkend="xmlSecKeyDataFinalizeMethod">*xmlSecKeyDataFinalizeMethod</link>)  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataXmlReadMethod">*xmlSecKeyDataXmlReadMethod</link>)   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataXmlWriteMethod">*xmlSecKeyDataXmlWriteMethod</link>)  (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataBinReadMethod">*xmlSecKeyDataBinReadMethod</link>)   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataBinWriteMethod">*xmlSecKeyDataBinWriteMethod</link>)  (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataGenerateMethod">*xmlSecKeyDataGenerateMethod</link>)  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> (<link linkend="xmlSecKeyDataGetTypeMethod">*xmlSecKeyDataGetTypeMethod</link>)
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecSize">xmlSecSize</link>  (<link linkend="xmlSecKeyDataGetSizeMethod">*xmlSecKeyDataGetSizeMethod</link>)   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-const <link linkend="xmlChar">xmlChar</link>* (<link linkend="xmlSecKeyDataGetIdentifierMethod">*xmlSecKeyDataGetIdentifierMethod</link>)
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="void">void</link>        (<link linkend="xmlSecKeyDataDebugDumpMethod">*xmlSecKeyDataDebugDumpMethod</link>) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-struct      <link linkend="xmlSecKeyDataKlass">xmlSecKeyDataKlass</link>;
-#define     <link linkend="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</link>       (klass)
-#define     <link linkend="xmlSecKeyDataListId">xmlSecKeyDataListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</link>   (void);
-#define     <link linkend="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</link> (void);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</link>         (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</link>    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</link> (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</link>
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</link> (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</link>
-                                            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</link> (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</link>
-                                            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-struct      <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStore</link>;
-<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> <link linkend="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</link>
-                                            (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</link>       (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-#define     <link linkend="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</link>       (store)
-#define     <link linkend="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</link>       (store)
-#define     <link linkend="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</link>       (store, storeId)
-#define     <link linkend="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</link>     (store, size)
-#define     <link linkend="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</link>
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyDataStoreInitializeMethod">*xmlSecKeyDataStoreInitializeMethod</link>)
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-<link linkend="void">void</link>        (<link linkend="xmlSecKeyDataStoreFinalizeMethod">*xmlSecKeyDataStoreFinalizeMethod</link>)
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-struct      <link linkend="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</link>;
-#define     <link linkend="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</link>  (klass)
-#define     <link linkend="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</link>
-                                            (void);
+typedef             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>;
+#define             <link linkend="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</link>
+#define             <link linkend="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</link>
+#define             <link linkend="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</link>
+#define             <link linkend="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</link>
+#define             <link linkend="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</link>
+#define             <link linkend="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</link>
+typedef             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>;
+#define             <link linkend="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</link>
+#define             <link linkend="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</link>
+#define             <link linkend="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</link>
+#define             <link linkend="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</link>
+#define             <link linkend="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</link>
+#define             <link linkend="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</link>
+#define             <link linkend="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</link>
+#define             <link linkend="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</link>
+#define             <link linkend="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</link>
+enum                <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link>;
+<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</link>                 (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</link>                (void);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</link>            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</link>            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
+struct              <link linkend="xmlSecKeyData">xmlSecKeyData</link>;
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyDataCreate">xmlSecKeyDataCreate</link>                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);
+<link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    <link linkend="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</link>               (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   <link linkend="xmlSecKeyDataGetType">xmlSecKeyDataGetType</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</link>                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</link>           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</link>                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</link>               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</link>                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</link>               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+#define             <link linkend="xmlSecKeyDataGetName">xmlSecKeyDataGetName</link>                (data)
+#define             <link linkend="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</link>                (data)
+#define             <link linkend="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</link>                (data, dataId)
+#define             <link linkend="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</link>             (data, usg)
+#define             <link linkend="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</link>              (data, size)
+#define             <link linkend="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</link>
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataInitMethod">*xmlSecKeyDataInitMethod</link>)          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataDuplicateMethod">*xmlSecKeyDataDuplicateMethod</link>)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
+<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataFinalizeMethod">*xmlSecKeyDataFinalizeMethod</link>)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataXmlReadMethod">*xmlSecKeyDataXmlReadMethod</link>)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataXmlWriteMethod">*xmlSecKeyDataXmlWriteMethod</link>)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataBinReadMethod">*xmlSecKeyDataBinReadMethod</link>)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataBinWriteMethod">*xmlSecKeyDataBinWriteMethod</link>)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataGenerateMethod">*xmlSecKeyDataGenerateMethod</link>)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   (<link linkend="xmlSecKeyDataGetTypeMethod">*xmlSecKeyDataGetTypeMethod</link>)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecSize">xmlSecSize</link>          (<link linkend="xmlSecKeyDataGetSizeMethod">*xmlSecKeyDataGetSizeMethod</link>)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+const <link linkend="xmlChar">xmlChar</link> *     (<link linkend="xmlSecKeyDataGetIdentifierMethod">*xmlSecKeyDataGetIdentifierMethod</link>) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataDebugDumpMethod">*xmlSecKeyDataDebugDumpMethod</link>)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+struct              <link linkend="xmlSecKeyDataKlass">xmlSecKeyDataKlass</link>;
+#define             <link linkend="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</link>           (klass)
+#define             <link linkend="xmlSecKeyDataListId">xmlSecKeyDataListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</link>           (void);
+#define             <link linkend="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</link>         (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</link>             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</link>        (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</link>     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</link>    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</link>     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</link>    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+struct              <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStore</link>;
+<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link>  <link linkend="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</link>         (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</link>           (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+#define             <link linkend="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</link>           (store)
+#define             <link linkend="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</link>           (store)
+#define             <link linkend="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</link>           (store, storeId)
+#define             <link linkend="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</link>         (store, size)
+#define             <link linkend="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</link>
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyDataStoreInitializeMethod">*xmlSecKeyDataStoreInitializeMethod</link>)
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+<link linkend="void">void</link>                (<link linkend="xmlSecKeyDataStoreFinalizeMethod">*xmlSecKeyDataStoreFinalizeMethod</link>) (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+struct              <link linkend="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</link>;
+#define             <link linkend="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</link>      (klass)
+#define             <link linkend="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</link>   (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -208,216 +191,194 @@ struct      <link linkend="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</lin
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-keysdata.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto key data object definition.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsage">xmlSecKeyDataUsage</title>
-<indexterm><primary>xmlSecKeyDataUsage</primary></indexterm><programlisting>typedef unsigned int					xmlSecKeyDataUsage;
+<refsect1 id="xmlsec-keysdata.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecKeyDataUsage" role="typedef">
+<title>xmlSecKeyDataUsage</title>
+<indexterm zone="xmlSecKeyDataUsage"><primary sortas="xmlSecKeyDataUsage">xmlSecKeyDataUsage</primary></indexterm><programlisting>typedef unsigned int					xmlSecKeyDataUsage;
 </programlisting>
 <para>
 The bits mask that determines possible keys data usage.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</title>
-<indexterm><primary>xmlSecKeyDataUsageUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataUsageUnknown			0x00000
+<refsect2 id="xmlSecKeyDataUsageUnknown" role="macro">
+<title>xmlSecKeyDataUsageUnknown</title>
+<indexterm zone="xmlSecKeyDataUsageUnknown"><primary sortas="xmlSecKeyDataUsageUnknown">xmlSecKeyDataUsageUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataUsageUnknown			0x00000
 </programlisting>
 <para>
 The key data usage is unknown.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyInfoNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeRead		0x00001
+<refsect2 id="xmlSecKeyDataUsageKeyInfoNodeRead" role="macro">
+<title>xmlSecKeyDataUsageKeyInfoNodeRead</title>
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeRead"><primary sortas="xmlSecKeyDataUsageKeyInfoNodeRead">xmlSecKeyDataUsageKeyInfoNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeRead		0x00001
 </programlisting>
 <para>
 The key data could be read from a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyInfoNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeWrite		0x00002
+<refsect2 id="xmlSecKeyDataUsageKeyInfoNodeWrite" role="macro">
+<title>xmlSecKeyDataUsageKeyInfoNodeWrite</title>
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNodeWrite"><primary sortas="xmlSecKeyDataUsageKeyInfoNodeWrite">xmlSecKeyDataUsageKeyInfoNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyInfoNodeWrite		0x00002
 </programlisting>
 <para>
 The key data could be written to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyValueNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeRead		0x00004
+<refsect2 id="xmlSecKeyDataUsageKeyValueNodeRead" role="macro">
+<title>xmlSecKeyDataUsageKeyValueNodeRead</title>
+<indexterm zone="xmlSecKeyDataUsageKeyValueNodeRead"><primary sortas="xmlSecKeyDataUsageKeyValueNodeRead">xmlSecKeyDataUsageKeyValueNodeRead</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeRead		0x00004
 </programlisting>
 <para>
 The key data could be read from a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyValueNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeWrite		0x00008
+<refsect2 id="xmlSecKeyDataUsageKeyValueNodeWrite" role="macro">
+<title>xmlSecKeyDataUsageKeyValueNodeWrite</title>
+<indexterm zone="xmlSecKeyDataUsageKeyValueNodeWrite"><primary sortas="xmlSecKeyDataUsageKeyValueNodeWrite">xmlSecKeyDataUsageKeyValueNodeWrite</primary></indexterm><programlisting>#define xmlSecKeyDataUsageKeyValueNodeWrite		0x00008
 </programlisting>
 <para>
 The key data could be written to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</title>
-<indexterm><primary>xmlSecKeyDataUsageRetrievalMethodNodeXml</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeXml	0x00010
+<refsect2 id="xmlSecKeyDataUsageRetrievalMethodNodeXml" role="macro">
+<title>xmlSecKeyDataUsageRetrievalMethodNodeXml</title>
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeXml"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNodeXml">xmlSecKeyDataUsageRetrievalMethodNodeXml</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeXml	0x00010
 </programlisting>
 <para>
 The key data could be retrieved using <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
 in XML format.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</title>
-<indexterm><primary>xmlSecKeyDataUsageRetrievalMethodNodeBin</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeBin	0x00020
+<refsect2 id="xmlSecKeyDataUsageRetrievalMethodNodeBin" role="macro">
+<title>xmlSecKeyDataUsageRetrievalMethodNodeBin</title>
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNodeBin"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNodeBin">xmlSecKeyDataUsageRetrievalMethodNodeBin</primary></indexterm><programlisting>#define xmlSecKeyDataUsageRetrievalMethodNodeBin	0x00020
 </programlisting>
 <para>
 The key data could be retrieved using <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
 in binary format.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</title>
-<indexterm><primary>xmlSecKeyDataUsageAny</primary></indexterm><programlisting>#define xmlSecKeyDataUsageAny				0xFFFFF
+<refsect2 id="xmlSecKeyDataUsageAny" role="macro">
+<title>xmlSecKeyDataUsageAny</title>
+<indexterm zone="xmlSecKeyDataUsageAny"><primary sortas="xmlSecKeyDataUsageAny">xmlSecKeyDataUsageAny</primary></indexterm><programlisting>#define xmlSecKeyDataUsageAny				0xFFFFF
 </programlisting>
 <para>
 Any key data usage.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyInfoNode</primary></indexterm><programlisting>#define     xmlSecKeyDataUsageKeyInfoNode</programlisting>
+<refsect2 id="xmlSecKeyDataUsageKeyInfoNode" role="macro">
+<title>xmlSecKeyDataUsageKeyInfoNode</title>
+<indexterm zone="xmlSecKeyDataUsageKeyInfoNode"><primary sortas="xmlSecKeyDataUsageKeyInfoNode">xmlSecKeyDataUsageKeyInfoNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageKeyInfoNode</programlisting>
 <para>
 The key data could be read and written from/to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo ">&lt;dsig:KeyInfo /&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</title>
-<indexterm><primary>xmlSecKeyDataUsageKeyValueNode</primary></indexterm><programlisting>#define     xmlSecKeyDataUsageKeyValueNode</programlisting>
+<refsect2 id="xmlSecKeyDataUsageKeyValueNode" role="macro">
+<title>xmlSecKeyDataUsageKeyValueNode</title>
+<indexterm zone="xmlSecKeyDataUsageKeyValueNode"><primary sortas="xmlSecKeyDataUsageKeyValueNode">xmlSecKeyDataUsageKeyValueNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageKeyValueNode</programlisting>
 <para>
 The key data could be read and written from/to a <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue ">&lt;dsig:KeyValue /&gt;</ulink> child.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</title>
-<indexterm><primary>xmlSecKeyDataUsageRetrievalMethodNode</primary></indexterm><programlisting>#define     xmlSecKeyDataUsageRetrievalMethodNode</programlisting>
+<refsect2 id="xmlSecKeyDataUsageRetrievalMethodNode" role="macro">
+<title>xmlSecKeyDataUsageRetrievalMethodNode</title>
+<indexterm zone="xmlSecKeyDataUsageRetrievalMethodNode"><primary sortas="xmlSecKeyDataUsageRetrievalMethodNode">xmlSecKeyDataUsageRetrievalMethodNode</primary></indexterm><programlisting>#define             xmlSecKeyDataUsageRetrievalMethodNode</programlisting>
 <para>
 The key data could be retrieved using <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod ">&lt;dsig:RetrievalMethod /&gt;</ulink> node
 in any format.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataType">xmlSecKeyDataType</title>
-<indexterm><primary>xmlSecKeyDataType</primary></indexterm><programlisting>typedef unsigned int				xmlSecKeyDataType;
+<refsect2 id="xmlSecKeyDataType" role="typedef">
+<title>xmlSecKeyDataType</title>
+<indexterm zone="xmlSecKeyDataType"><primary sortas="xmlSecKeyDataType">xmlSecKeyDataType</primary></indexterm><programlisting>typedef unsigned int				xmlSecKeyDataType;
 </programlisting>
 <para>
 The key data type (public/private, session/permanet, etc.).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</title>
-<indexterm><primary>xmlSecKeyDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataTypeUnknown			0x0000
+<refsect2 id="xmlSecKeyDataTypeUnknown" role="macro">
+<title>xmlSecKeyDataTypeUnknown</title>
+<indexterm zone="xmlSecKeyDataTypeUnknown"><primary sortas="xmlSecKeyDataTypeUnknown">xmlSecKeyDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataTypeUnknown			0x0000
 </programlisting>
 <para>
 The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeNone"><type>xmlSecKeyDataTypeNone</type></link>).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</title>
-<indexterm><primary>xmlSecKeyDataTypeNone</primary></indexterm><programlisting>#define xmlSecKeyDataTypeNone				xmlSecKeyDataTypeUnknown
+<refsect2 id="xmlSecKeyDataTypeNone" role="macro">
+<title>xmlSecKeyDataTypeNone</title>
+<indexterm zone="xmlSecKeyDataTypeNone"><primary sortas="xmlSecKeyDataTypeNone">xmlSecKeyDataTypeNone</primary></indexterm><programlisting>#define xmlSecKeyDataTypeNone				xmlSecKeyDataTypeUnknown
 </programlisting>
 <para>
 The key data type is unknown (same as <link linkend="xmlSecKeyDataTypeUnknown"><type>xmlSecKeyDataTypeUnknown</type></link>).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</title>
-<indexterm><primary>xmlSecKeyDataTypePublic</primary></indexterm><programlisting>#define xmlSecKeyDataTypePublic				0x0001
+<refsect2 id="xmlSecKeyDataTypePublic" role="macro">
+<title>xmlSecKeyDataTypePublic</title>
+<indexterm zone="xmlSecKeyDataTypePublic"><primary sortas="xmlSecKeyDataTypePublic">xmlSecKeyDataTypePublic</primary></indexterm><programlisting>#define xmlSecKeyDataTypePublic				0x0001
 </programlisting>
 <para>
 The key data contain a public key.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</title>
-<indexterm><primary>xmlSecKeyDataTypePrivate</primary></indexterm><programlisting>#define xmlSecKeyDataTypePrivate			0x0002
+<refsect2 id="xmlSecKeyDataTypePrivate" role="macro">
+<title>xmlSecKeyDataTypePrivate</title>
+<indexterm zone="xmlSecKeyDataTypePrivate"><primary sortas="xmlSecKeyDataTypePrivate">xmlSecKeyDataTypePrivate</primary></indexterm><programlisting>#define xmlSecKeyDataTypePrivate			0x0002
 </programlisting>
 <para>
 The key data contain a private key.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</title>
-<indexterm><primary>xmlSecKeyDataTypeSymmetric</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSymmetric			0x0004
+<refsect2 id="xmlSecKeyDataTypeSymmetric" role="macro">
+<title>xmlSecKeyDataTypeSymmetric</title>
+<indexterm zone="xmlSecKeyDataTypeSymmetric"><primary sortas="xmlSecKeyDataTypeSymmetric">xmlSecKeyDataTypeSymmetric</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSymmetric			0x0004
 </programlisting>
 <para>
 The key data contain a symmetric key.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</title>
-<indexterm><primary>xmlSecKeyDataTypeSession</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSession			0x0008
+<refsect2 id="xmlSecKeyDataTypeSession" role="macro">
+<title>xmlSecKeyDataTypeSession</title>
+<indexterm zone="xmlSecKeyDataTypeSession"><primary sortas="xmlSecKeyDataTypeSession">xmlSecKeyDataTypeSession</primary></indexterm><programlisting>#define xmlSecKeyDataTypeSession			0x0008
 </programlisting>
 <para>
 The key data contain session key (one time key, not stored in keys manager).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</title>
-<indexterm><primary>xmlSecKeyDataTypePermanent</primary></indexterm><programlisting>#define xmlSecKeyDataTypePermanent			0x0010
+<refsect2 id="xmlSecKeyDataTypePermanent" role="macro">
+<title>xmlSecKeyDataTypePermanent</title>
+<indexterm zone="xmlSecKeyDataTypePermanent"><primary sortas="xmlSecKeyDataTypePermanent">xmlSecKeyDataTypePermanent</primary></indexterm><programlisting>#define xmlSecKeyDataTypePermanent			0x0010
 </programlisting>
 <para>
 The key data contain permanent key (stored in keys manager).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</title>
-<indexterm><primary>xmlSecKeyDataTypeTrusted</primary></indexterm><programlisting>#define xmlSecKeyDataTypeTrusted			0x0100
+<refsect2 id="xmlSecKeyDataTypeTrusted" role="macro">
+<title>xmlSecKeyDataTypeTrusted</title>
+<indexterm zone="xmlSecKeyDataTypeTrusted"><primary sortas="xmlSecKeyDataTypeTrusted">xmlSecKeyDataTypeTrusted</primary></indexterm><programlisting>#define xmlSecKeyDataTypeTrusted			0x0100
 </programlisting>
 <para>
 The key data is trusted.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</title>
-<indexterm><primary>xmlSecKeyDataTypeAny</primary></indexterm><programlisting>#define xmlSecKeyDataTypeAny				0xFFFF
+<refsect2 id="xmlSecKeyDataTypeAny" role="macro">
+<title>xmlSecKeyDataTypeAny</title>
+<indexterm zone="xmlSecKeyDataTypeAny"><primary sortas="xmlSecKeyDataTypeAny">xmlSecKeyDataTypeAny</primary></indexterm><programlisting>#define xmlSecKeyDataTypeAny				0xFFFF
 </programlisting>
 <para>
 Any key data.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataFormat">enum xmlSecKeyDataFormat</title>
-<indexterm><primary>xmlSecKeyDataFormat</primary></indexterm><programlisting>typedef enum {
+<refsect2 id="xmlSecKeyDataFormat" role="enum">
+<title>enum xmlSecKeyDataFormat</title>
+<indexterm zone="xmlSecKeyDataFormat"><primary sortas="xmlSecKeyDataFormat">xmlSecKeyDataFormat</primary></indexterm><programlisting>typedef enum {
     xmlSecKeyDataFormatUnknown = 0,
     xmlSecKeyDataFormatBinary,
     xmlSecKeyDataFormatPem,
@@ -432,117 +393,110 @@ Any key data.</para>
 <para>
 The key data format (binary, der, pem, etc.).</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatUnknown" role="constant">
 <term><literal>xmlSecKeyDataFormatUnknown</literal></term>
 <listitem><simpara>		the key data format is unknown.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatBinary" role="constant">
 <term><literal>xmlSecKeyDataFormatBinary</literal></term>
 <listitem><simpara>		the binary key data.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatPem" role="constant">
 <term><literal>xmlSecKeyDataFormatPem</literal></term>
 <listitem><simpara>		the PEM key data (cert or public/private key).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatDer" role="constant">
 <term><literal>xmlSecKeyDataFormatDer</literal></term>
 <listitem><simpara>		the DER key data (cert or public/private key).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatPkcs8Pem" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs8Pem</literal></term>
 <listitem><simpara>	the PKCS8 PEM private key.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatPkcs8Der" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs8Der</literal></term>
 <listitem><simpara>	the PKCS8 DER private key. 
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatPkcs12" role="constant">
 <term><literal>xmlSecKeyDataFormatPkcs12</literal></term>
 <listitem><simpara>		the PKCS12 format (bag of keys and certs)
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatCertPem" role="constant">
 <term><literal>xmlSecKeyDataFormatCertPem</literal></term>
 <listitem><simpara>		the PEM cert.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecKeyDataFormatCertDer" role="constant">
 <term><literal>xmlSecKeyDataFormatCertDer</literal></term>
 <listitem><simpara>		the DER cert.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet ()</title>
-<indexterm><primary>xmlSecKeyDataIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecKeyDataIdsGet        (void);</programlisting>
+<refsect2 id="xmlSecKeyDataIdsGet" role="function">
+<title>xmlSecKeyDataIdsGet ()</title>
+<indexterm zone="xmlSecKeyDataIdsGet"><primary sortas="xmlSecKeyDataIdsGet">xmlSecKeyDataIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecKeyDataIdsGet                 (void);</programlisting>
 <para>
 Gets global registered key data klasses list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to list of all registered key data klasses.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to list of all registered key data klasses.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit ()</title>
-<indexterm><primary>xmlSecKeyDataIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataIdsInit            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataIdsInit" role="function">
+<title>xmlSecKeyDataIdsInit ()</title>
+<indexterm zone="xmlSecKeyDataIdsInit"><primary sortas="xmlSecKeyDataIdsInit">xmlSecKeyDataIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsInit                (void);</programlisting>
 <para>
 Initializes the key data klasses. This function is called from the 
 <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown ()</title>
-<indexterm><primary>xmlSecKeyDataIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataIdsShutdown        (void);</programlisting>
+<refsect2 id="xmlSecKeyDataIdsShutdown" role="function">
+<title>xmlSecKeyDataIdsShutdown ()</title>
+<indexterm zone="xmlSecKeyDataIdsShutdown"><primary sortas="xmlSecKeyDataIdsShutdown">xmlSecKeyDataIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdsShutdown            (void);</programlisting>
 <para>
 Shuts down the keys data klasses. This function is called from the 
 <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function and the application should not call it directly.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault ()</title>
-<indexterm><primary>xmlSecKeyDataIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataIdsRegisterDefault (void);</programlisting>
+<refsect2 id="xmlSecKeyDataIdsRegisterDefault" role="function">
+<title>xmlSecKeyDataIdsRegisterDefault ()</title>
+<indexterm zone="xmlSecKeyDataIdsRegisterDefault"><primary sortas="xmlSecKeyDataIdsRegisterDefault">xmlSecKeyDataIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsRegisterDefault     (void);</programlisting>
 <para>
 Registers default (implemented by XML Security Library)
 key data klasses: <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> element processing klass, 
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> element processing klass, ...</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister ()</title>
-<indexterm><primary>xmlSecKeyDataIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataIdsRegister        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
+<refsect2 id="xmlSecKeyDataIdsRegister" role="function">
+<title>xmlSecKeyDataIdsRegister ()</title>
+<indexterm zone="xmlSecKeyDataIdsRegister"><primary sortas="xmlSecKeyDataIdsRegister">xmlSecKeyDataIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdsRegister            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
 <para>
 Registers <parameter>id</parameter> in the global list of key data klasses.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the key data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyData">struct xmlSecKeyData</title>
-<indexterm><primary>xmlSecKeyData</primary></indexterm><programlisting>struct xmlSecKeyData {
-
+<refsect2 id="xmlSecKeyData" role="struct">
+<title>struct xmlSecKeyData</title>
+<indexterm zone="xmlSecKeyData"><primary sortas="xmlSecKeyData">xmlSecKeyData</primary></indexterm><programlisting>struct xmlSecKeyData {
     xmlSecKeyDataId			id;
     void*				reserved0;
     void*				reserved1;
@@ -551,600 +505,565 @@ Registers <parameter>id</parameter> in the global list of key data klasses.</par
 <para>
 The key data: key value (crypto material), x509 data, pgp data, etc.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <structfield>id</structfield></term>
+<term><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>&#160;<structfield>id</structfield>;</term>
 <listitem><simpara> 		the data id (<link linkend="xmlSecKeyDataId"><type>xmlSecKeyDataId</type></link>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara> 		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara> 		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataCreate">xmlSecKeyDataCreate ()</title>
-<indexterm><primary>xmlSecKeyDataCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecKeyDataCreate        (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
+<refsect2 id="xmlSecKeyDataCreate" role="function">
+<title>xmlSecKeyDataCreate ()</title>
+<indexterm zone="xmlSecKeyDataCreate"><primary sortas="xmlSecKeyDataCreate">xmlSecKeyDataCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecKeyDataCreate                 (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id);</programlisting>
 <para>
 Allocates and initializes new key data of the specified type <parameter>id</parameter>.
 Caller is responsible for destroing returend object with 
 <link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated key data structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate ()</title>
-<indexterm><primary>xmlSecKeyDataDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link> xmlSecKeyDataDuplicate     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataDuplicate" role="function">
+<title>xmlSecKeyDataDuplicate ()</title>
+<indexterm zone="xmlSecKeyDataDuplicate"><primary sortas="xmlSecKeyDataDuplicate">xmlSecKeyDataDuplicate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataPtr">xmlSecKeyDataPtr</link>    xmlSecKeyDataDuplicate              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Creates a duplicate of the given <parameter>data</parameter>. Caller is responsible for 
 destroing returend object with <link linkend="xmlSecKeyDataDestroy"><type>xmlSecKeyDataDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated key data structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy ()</title>
-<indexterm><primary>xmlSecKeyDataDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataDestroy            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataDestroy" role="function">
+<title>xmlSecKeyDataDestroy ()</title>
+<indexterm zone="xmlSecKeyDataDestroy"><primary sortas="xmlSecKeyDataDestroy">xmlSecKeyDataDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDestroy                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Destroys the data and frees all allocated memory.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate ()</title>
-<indexterm><primary>xmlSecKeyDataGenerate</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataGenerate           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecKeyDataGenerate" role="function">
+<title>xmlSecKeyDataGenerate ()</title>
+<indexterm zone="xmlSecKeyDataGenerate"><primary sortas="xmlSecKeyDataGenerate">xmlSecKeyDataGenerate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataGenerate               (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Generates new key data of given size and type.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sizeBits</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
 <listitem><simpara> 		the desired key data size (in bits).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetType">xmlSecKeyDataGetType ()</title>
-<indexterm><primary>xmlSecKeyDataGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> xmlSecKeyDataGetType      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetType" role="function">
+<title>xmlSecKeyDataGetType ()</title>
+<indexterm zone="xmlSecKeyDataGetType"><primary sortas="xmlSecKeyDataGetType">xmlSecKeyDataGetType</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   xmlSecKeyDataGetType                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets key data type.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data type.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize ()</title>
-<indexterm><primary>xmlSecKeyDataGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecKeyDataGetSize            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetSize" role="function">
+<title>xmlSecKeyDataGetSize ()</title>
+<indexterm zone="xmlSecKeyDataGetSize"><primary sortas="xmlSecKeyDataGetSize">xmlSecKeyDataGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecKeyDataGetSize                (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets key data size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data size (in bits).
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data size (in bits).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier ()</title>
-<indexterm><primary>xmlSecKeyDataGetIdentifier</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* xmlSecKeyDataGetIdentifier   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetIdentifier" role="function">
+<title>xmlSecKeyDataGetIdentifier ()</title>
+<indexterm zone="xmlSecKeyDataGetIdentifier"><primary sortas="xmlSecKeyDataGetIdentifier">xmlSecKeyDataGetIdentifier</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecKeyDataGetIdentifier          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets key data identifier string.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data id string.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data id string.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump ()</title>
-<indexterm><primary>xmlSecKeyDataDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataDebugDump          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataDebugDump" role="function">
+<title>xmlSecKeyDataDebugDump ()</title>
+<indexterm zone="xmlSecKeyDataDebugDump"><primary sortas="xmlSecKeyDataDebugDump">xmlSecKeyDataDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDebugDump              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints key data debug info.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyDataDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataDebugXmlDump       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataDebugXmlDump" role="function">
+<title>xmlSecKeyDataDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyDataDebugXmlDump"><primary sortas="xmlSecKeyDataDebugXmlDump">xmlSecKeyDataDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataDebugXmlDump           (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints key data debug info in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead ()</title>
-<indexterm><primary>xmlSecKeyDataXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataXmlRead            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataXmlRead" role="function">
+<title>xmlSecKeyDataXmlRead ()</title>
+<indexterm zone="xmlSecKeyDataXmlRead"><primary sortas="xmlSecKeyDataXmlRead">xmlSecKeyDataXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataXmlRead                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads the key data of klass <parameter>id</parameter> from XML <parameter>node</parameter> and adds them to <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the destination key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite ()</title>
-<indexterm><primary>xmlSecKeyDataXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataXmlWrite           (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataXmlWrite" role="function">
+<title>xmlSecKeyDataXmlWrite ()</title>
+<indexterm zone="xmlSecKeyDataXmlWrite"><primary sortas="xmlSecKeyDataXmlWrite">xmlSecKeyDataXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataXmlWrite               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Writes the key data of klass <parameter>id</parameter> from <parameter>key</parameter> to an XML <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the source key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead ()</title>
-<indexterm><primary>xmlSecKeyDataBinRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinRead            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinRead" role="function">
+<title>xmlSecKeyDataBinRead ()</title>
+<indexterm zone="xmlSecKeyDataBinRead"><primary sortas="xmlSecKeyDataBinRead">xmlSecKeyDataBinRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinRead                (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads the key data of klass <parameter>id</parameter> from binary buffer <parameter>buf</parameter> to <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the destination key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the input binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite ()</title>
-<indexterm><primary>xmlSecKeyDataBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinWrite           (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinWrite" role="function">
+<title>xmlSecKeyDataBinWrite ()</title>
+<indexterm zone="xmlSecKeyDataBinWrite"><primary sortas="xmlSecKeyDataBinWrite">xmlSecKeyDataBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinWrite               (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Writes the key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to a binary buffer <parameter>buf</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the source key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the output binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetName">xmlSecKeyDataGetName()</title>
-<indexterm><primary>xmlSecKeyDataGetName</primary></indexterm><programlisting>#define     xmlSecKeyDataGetName(data)</programlisting>
+<refsect2 id="xmlSecKeyDataGetName" role="macro">
+<title>xmlSecKeyDataGetName()</title>
+<indexterm zone="xmlSecKeyDataGetName"><primary sortas="xmlSecKeyDataGetName">xmlSecKeyDataGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataGetName(data)</programlisting>
 <para>
 Macro. Returns the key data name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid()</title>
-<indexterm><primary>xmlSecKeyDataIsValid</primary></indexterm><programlisting>#define     xmlSecKeyDataIsValid(data)</programlisting>
+<refsect2 id="xmlSecKeyDataIsValid" role="macro">
+<title>xmlSecKeyDataIsValid()</title>
+<indexterm zone="xmlSecKeyDataIsValid"><primary sortas="xmlSecKeyDataIsValid">xmlSecKeyDataIsValid</primary></indexterm><programlisting>#define             xmlSecKeyDataIsValid(data)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is not NULL and <parameter>data</parameter>-&gt;id is not NULL
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId()</title>
-<indexterm><primary>xmlSecKeyDataCheckId</primary></indexterm><programlisting>#define     xmlSecKeyDataCheckId(data, dataId)</programlisting>
+<refsect2 id="xmlSecKeyDataCheckId" role="macro">
+<title>xmlSecKeyDataCheckId()</title>
+<indexterm zone="xmlSecKeyDataCheckId"><primary sortas="xmlSecKeyDataCheckId">xmlSecKeyDataCheckId</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckId(data, dataId)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s id is equal to <parameter>dataId</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara> 		the data Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage()</title>
-<indexterm><primary>xmlSecKeyDataCheckUsage</primary></indexterm><programlisting>#define     xmlSecKeyDataCheckUsage(data, usg)</programlisting>
+<refsect2 id="xmlSecKeyDataCheckUsage" role="macro">
+<title>xmlSecKeyDataCheckUsage()</title>
+<indexterm zone="xmlSecKeyDataCheckUsage"><primary sortas="xmlSecKeyDataCheckUsage">xmlSecKeyDataCheckUsage</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckUsage(data, usg)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is valid and could be used for <parameter>usg</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usg</parameter>&#160;:</term>
 <listitem><simpara> 		the data usage.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize()</title>
-<indexterm><primary>xmlSecKeyDataCheckSize</primary></indexterm><programlisting>#define     xmlSecKeyDataCheckSize(data, size)</programlisting>
+<refsect2 id="xmlSecKeyDataCheckSize" role="macro">
+<title>xmlSecKeyDataCheckSize()</title>
+<indexterm zone="xmlSecKeyDataCheckSize"><primary sortas="xmlSecKeyDataCheckSize">xmlSecKeyDataCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyDataCheckSize(data, size)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>data</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</title>
-<indexterm><primary>xmlSecKeyDataIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataIdUnknown 			((xmlSecKeyDataId)NULL)
+<refsect2 id="xmlSecKeyDataIdUnknown" role="macro">
+<title>xmlSecKeyDataIdUnknown</title>
+<indexterm zone="xmlSecKeyDataIdUnknown"><primary sortas="xmlSecKeyDataIdUnknown">xmlSecKeyDataIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataIdUnknown 			((xmlSecKeyDataId)NULL)
 </programlisting>
 <para>
 The "unknown" id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod ()</title>
-<indexterm><primary>xmlSecKeyDataInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataInitMethod)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataInitMethod" role="function">
+<title>xmlSecKeyDataInitMethod ()</title>
+<indexterm zone="xmlSecKeyDataInitMethod"><primary sortas="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataInitMethod)          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Key data specific initialization method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod ()</title>
-<indexterm><primary>xmlSecKeyDataDuplicateMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataDuplicateMethod) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
+<refsect2 id="xmlSecKeyDataDuplicateMethod" role="function">
+<title>xmlSecKeyDataDuplicateMethod ()</title>
+<indexterm zone="xmlSecKeyDataDuplicateMethod"><primary sortas="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataDuplicateMethod)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
 <para>
 Key data specific duplication (copy) method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to destination key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara> 		the poiniter to source key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod ()</title>
-<indexterm><primary>xmlSecKeyDataFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecKeyDataFinalizeMethod)  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataFinalizeMethod" role="function">
+<title>xmlSecKeyDataFinalizeMethod ()</title>
+<indexterm zone="xmlSecKeyDataFinalizeMethod"><primary sortas="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataFinalizeMethod)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Key data specific finalization method. All the objects and resources allocated
 by the key data object must be freed inside this method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod ()</title>
-<indexterm><primary>xmlSecKeyDataXmlReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataXmlReadMethod)   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataXmlReadMethod" role="function">
+<title>xmlSecKeyDataXmlReadMethod ()</title>
+<indexterm zone="xmlSecKeyDataXmlReadMethod"><primary sortas="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataXmlReadMethod)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Key data specific method for reading XML node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data's value XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod ()</title>
-<indexterm><primary>xmlSecKeyDataXmlWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataXmlWriteMethod)  (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataXmlWriteMethod" role="function">
+<title>xmlSecKeyDataXmlWriteMethod ()</title>
+<indexterm zone="xmlSecKeyDataXmlWriteMethod"><primary sortas="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataXmlWriteMethod)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Key data specific method for writing XML node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to data's value XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the &lt;dsig:KeyInfo&gt; node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod ()</title>
-<indexterm><primary>xmlSecKeyDataBinReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataBinReadMethod)   (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinReadMethod" role="function">
+<title>xmlSecKeyDataBinReadMethod ()</title>
+<indexterm zone="xmlSecKeyDataBinReadMethod"><primary sortas="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataBinReadMethod)       (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Key data specific method for reading binary buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod ()</title>
-<indexterm><primary>xmlSecKeyDataBinWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataBinWriteMethod)  (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinWriteMethod" role="function">
+<title>xmlSecKeyDataBinWriteMethod ()</title>
+<indexterm zone="xmlSecKeyDataBinWriteMethod"><primary sortas="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataBinWriteMethod)      (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Key data specific method for reading binary buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the output buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara> 		the buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod ()</title>
-<indexterm><primary>xmlSecKeyDataGenerateMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataGenerateMethod)  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecKeyDataGenerateMethod" role="function">
+<title>xmlSecKeyDataGenerateMethod ()</title>
+<indexterm zone="xmlSecKeyDataGenerateMethod"><primary sortas="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataGenerateMethod)      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> sizeBits,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Key data specific method for generating new key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>sizeBits</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>sizeBits</parameter>&#160;:</term>
 <listitem><simpara> 		the key data specific size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the required key type (session/permanent, etc.)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod ()</title>
-<indexterm><primary>xmlSecKeyDataGetTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> (*xmlSecKeyDataGetTypeMethod)
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetTypeMethod" role="function">
+<title>xmlSecKeyDataGetTypeMethod ()</title>
+<indexterm zone="xmlSecKeyDataGetTypeMethod"><primary sortas="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link>   (*xmlSecKeyDataGetTypeMethod)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Key data specific method to get the key type.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		 the data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the key type.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod ()</title>
-<indexterm><primary>xmlSecKeyDataGetSizeMethod</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  (*xmlSecKeyDataGetSizeMethod)   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetSizeMethod" role="function">
+<title>xmlSecKeyDataGetSizeMethod ()</title>
+<indexterm zone="xmlSecKeyDataGetSizeMethod"><primary sortas="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          (*xmlSecKeyDataGetSizeMethod)       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Key data specific method to get the key size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the key size in bits.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key size in bits.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod ()</title>
-<indexterm><primary>xmlSecKeyDataGetIdentifierMethod</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* (*xmlSecKeyDataGetIdentifierMethod)
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataGetIdentifierMethod" role="function">
+<title>xmlSecKeyDataGetIdentifierMethod ()</title>
+<indexterm zone="xmlSecKeyDataGetIdentifierMethod"><primary sortas="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link> *     (*xmlSecKeyDataGetIdentifierMethod) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Key data specific method to get the key data identifier string (for example,
 X509 data identifier is the subject of the verified cert).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the identifier string or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the identifier string or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod ()</title>
-<indexterm><primary>xmlSecKeyDataDebugDumpMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecKeyDataDebugDumpMethod) (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataDebugDumpMethod" role="function">
+<title>xmlSecKeyDataDebugDumpMethod ()</title>
+<indexterm zone="xmlSecKeyDataDebugDumpMethod"><primary sortas="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataDebugDumpMethod)     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Key data specific method for printing debug info.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the FILE to print debug info (should be open for writing).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataKlass">struct xmlSecKeyDataKlass</title>
-<indexterm><primary>xmlSecKeyDataKlass</primary></indexterm><programlisting>struct xmlSecKeyDataKlass {
-
+<refsect2 id="xmlSecKeyDataKlass" role="struct">
+<title>struct xmlSecKeyDataKlass</title>
+<indexterm zone="xmlSecKeyDataKlass"><primary sortas="xmlSecKeyDataKlass">xmlSecKeyDataKlass</primary></indexterm><programlisting>struct xmlSecKeyDataKlass {
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -1184,556 +1103,519 @@ Key data specific method for printing debug info.</para>
 <para>
 The data id (klass).</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>klassSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
 <listitem><simpara>		the klass size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>objSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
 <listitem><simpara>		the object size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara>		the object name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> <structfield>usage</structfield></term>
+<term><link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link>&#160;<structfield>usage</structfield>;</term>
 <listitem><simpara>		the allowed data usage.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>href</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>href</structfield>;</term>
 <listitem><simpara>		the identification string (href).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>dataNodeName</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>dataNodeName</structfield>;</term>
 <listitem><simpara>	the data's XML node name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>dataNodeNs</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>dataNodeNs</structfield>;</term>
 <listitem><simpara>		the data's XML node namespace.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</link> <structfield>initialize</structfield></term>
+<term><link linkend="xmlSecKeyDataInitMethod">xmlSecKeyDataInitMethod</link>&#160;<structfield>initialize</structfield>;</term>
 <listitem><simpara>		the initialization method.  
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</link> <structfield>duplicate</structfield></term>
+<term><link linkend="xmlSecKeyDataDuplicateMethod">xmlSecKeyDataDuplicateMethod</link>&#160;<structfield>duplicate</structfield>;</term>
 <listitem><simpara>		the duplicate (copy) method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</link> <structfield>finalize</structfield></term>
+<term><link linkend="xmlSecKeyDataFinalizeMethod">xmlSecKeyDataFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
 <listitem><simpara>		the finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</link> <structfield>generate</structfield></term>
+<term><link linkend="xmlSecKeyDataGenerateMethod">xmlSecKeyDataGenerateMethod</link>&#160;<structfield>generate</structfield>;</term>
 <listitem><simpara>		the new data generation method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</link> <structfield>getType</structfield></term>
+<term><link linkend="xmlSecKeyDataGetTypeMethod">xmlSecKeyDataGetTypeMethod</link>&#160;<structfield>getType</structfield>;</term>
 <listitem><simpara>		the method to access data's type information.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</link> <structfield>getSize</structfield></term>
+<term><link linkend="xmlSecKeyDataGetSizeMethod">xmlSecKeyDataGetSizeMethod</link>&#160;<structfield>getSize</structfield>;</term>
 <listitem><simpara>		the method to access data's size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</link> <structfield>getIdentifier</structfield></term>
+<term><link linkend="xmlSecKeyDataGetIdentifierMethod">xmlSecKeyDataGetIdentifierMethod</link>&#160;<structfield>getIdentifier</structfield>;</term>
 <listitem><simpara>	the method to access data's string identifier.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</link> <structfield>xmlRead</structfield></term>
+<term><link linkend="xmlSecKeyDataXmlReadMethod">xmlSecKeyDataXmlReadMethod</link>&#160;<structfield>xmlRead</structfield>;</term>
 <listitem><simpara>		the method for reading data from XML node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</link> <structfield>xmlWrite</structfield></term>
+<term><link linkend="xmlSecKeyDataXmlWriteMethod">xmlSecKeyDataXmlWriteMethod</link>&#160;<structfield>xmlWrite</structfield>;</term>
 <listitem><simpara>		the method for writing data to XML node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</link> <structfield>binRead</structfield></term>
+<term><link linkend="xmlSecKeyDataBinReadMethod">xmlSecKeyDataBinReadMethod</link>&#160;<structfield>binRead</structfield>;</term>
 <listitem><simpara>		the method for reading data from a binary buffer.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</link> <structfield>binWrite</structfield></term>
+<term><link linkend="xmlSecKeyDataBinWriteMethod">xmlSecKeyDataBinWriteMethod</link>&#160;<structfield>binWrite</structfield>;</term>
 <listitem><simpara>		the method for writing data to binary buffer.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link> <structfield>debugDump</structfield></term>
+<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link>&#160;<structfield>debugDump</structfield>;</term>
 <listitem><simpara> 		the method for printing debug data information.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link> <structfield>debugXmlDump</structfield></term>
+<term><link linkend="xmlSecKeyDataDebugDumpMethod">xmlSecKeyDataDebugDumpMethod</link>&#160;<structfield>debugXmlDump</structfield>;</term>
 <listitem><simpara>	the method for printing debug data information in XML format.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName()</title>
-<indexterm><primary>xmlSecKeyDataKlassGetName</primary></indexterm><programlisting>#define     xmlSecKeyDataKlassGetName(klass)</programlisting>
+<refsect2 id="xmlSecKeyDataKlassGetName" role="macro">
+<title>xmlSecKeyDataKlassGetName()</title>
+<indexterm zone="xmlSecKeyDataKlassGetName"><primary sortas="xmlSecKeyDataKlassGetName">xmlSecKeyDataKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataKlassGetName(klass)</programlisting>
 <para>
 Macro. Returns data klass name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>klass</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataListId">xmlSecKeyDataListId</title>
-<indexterm><primary>xmlSecKeyDataListId</primary></indexterm><programlisting>#define xmlSecKeyDataListId	xmlSecKeyDataListGetKlass()
+<refsect2 id="xmlSecKeyDataListId" role="macro">
+<title>xmlSecKeyDataListId</title>
+<indexterm zone="xmlSecKeyDataListId"><primary sortas="xmlSecKeyDataListId">xmlSecKeyDataListId</primary></indexterm><programlisting>#define xmlSecKeyDataListId	xmlSecKeyDataListGetKlass()
 </programlisting>
 <para>
 The key data klasses list klass id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecKeyDataListGetKlass   (void);</programlisting>
+<refsect2 id="xmlSecKeyDataListGetKlass" role="function">
+<title>xmlSecKeyDataListGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataListGetKlass"><primary sortas="xmlSecKeyDataListGetKlass">xmlSecKeyDataListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataListGetKlass           (void);</programlisting>
 <para>
 The key data list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key data list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</title>
-<indexterm><primary>xmlSecKeyDataIdListId</primary></indexterm><programlisting>#define xmlSecKeyDataIdListId	xmlSecKeyDataIdListGetKlass()
+<refsect2 id="xmlSecKeyDataIdListId" role="macro">
+<title>xmlSecKeyDataIdListId</title>
+<indexterm zone="xmlSecKeyDataIdListId"><primary sortas="xmlSecKeyDataIdListId">xmlSecKeyDataIdListId</primary></indexterm><programlisting>#define xmlSecKeyDataIdListId	xmlSecKeyDataIdListGetKlass()
 </programlisting>
 <para>
 The key data list klass id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecKeyDataIdListGetKlass (void);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListGetKlass" role="function">
+<title>xmlSecKeyDataIdListGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataIdListGetKlass"><primary sortas="xmlSecKeyDataIdListGetKlass">xmlSecKeyDataIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataIdListGetKlass         (void);</programlisting>
 <para>
 The key data id list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key data id list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key data id list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind ()</title>
-<indexterm><primary>xmlSecKeyDataIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataIdListFind         (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListFind" role="function">
+<title>xmlSecKeyDataIdListFind ()</title>
+<indexterm zone="xmlSecKeyDataIdListFind"><primary sortas="xmlSecKeyDataIdListFind">xmlSecKeyDataIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataIdListFind             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> dataId);</programlisting>
 <para>
 Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara>		the key data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
 value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode ()</title>
-<indexterm><primary>xmlSecKeyDataIdListFindByNode</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataIdListFindByNode
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListFindByNode" role="function">
+<title>xmlSecKeyDataIdListFindByNode ()</title>
+<indexterm zone="xmlSecKeyDataIdListFindByNode"><primary sortas="xmlSecKeyDataIdListFindByNode">xmlSecKeyDataIdListFindByNode</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByNode       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>nodeName</parameter>, <parameter>nodeNs</parameter> and 
 <parameter>usage</parameter> in the <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data klass XML node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeNs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data klass XML node namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data usage.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data klass is found and NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref ()</title>
-<indexterm><primary>xmlSecKeyDataIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataIdListFindByHref
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListFindByHref" role="function">
+<title>xmlSecKeyDataIdListFindByHref ()</title>
+<indexterm zone="xmlSecKeyDataIdListFindByHref"><primary sortas="xmlSecKeyDataIdListFindByHref">xmlSecKeyDataIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByHref       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>href</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>href</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data klass href.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data usage.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data klass is found and NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName ()</title>
-<indexterm><primary>xmlSecKeyDataIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecKeyDataIdListFindByName
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListFindByName" role="function">
+<title>xmlSecKeyDataIdListFindByName ()</title>
+<indexterm zone="xmlSecKeyDataIdListFindByName"><primary sortas="xmlSecKeyDataIdListFindByName">xmlSecKeyDataIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecKeyDataIdListFindByName       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyDataUsage">xmlSecKeyDataUsage</link> usage);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data klass name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the desired key data usage.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data klass is found and NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump ()</title>
-<indexterm><primary>xmlSecKeyDataIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataIdListDebugDump    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListDebugDump" role="function">
+<title>xmlSecKeyDataIdListDebugDump ()</title>
+<indexterm zone="xmlSecKeyDataIdListDebugDump"><primary sortas="xmlSecKeyDataIdListDebugDump">xmlSecKeyDataIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdListDebugDump        (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary key data debug information to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyDataIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataIdListDebugXmlDump (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataIdListDebugXmlDump" role="function">
+<title>xmlSecKeyDataIdListDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyDataIdListDebugXmlDump"><primary sortas="xmlSecKeyDataIdListDebugXmlDump">xmlSecKeyDataIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataIdListDebugXmlDump     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary key data debug information to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key data ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</title>
-<indexterm><primary>xmlSecKeyDataBinarySize</primary></indexterm><programlisting>#define     xmlSecKeyDataBinarySize</programlisting>
+<refsect2 id="xmlSecKeyDataBinarySize" role="macro">
+<title>xmlSecKeyDataBinarySize</title>
+<indexterm zone="xmlSecKeyDataBinarySize"><primary sortas="xmlSecKeyDataBinarySize">xmlSecKeyDataBinarySize</primary></indexterm><programlisting>#define             xmlSecKeyDataBinarySize</programlisting>
 <para>
 The binary key data object size.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueInitialize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueInitialize" role="function">
+<title>xmlSecKeyDataBinaryValueInitialize ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueInitialize"><primary sortas="xmlSecKeyDataBinaryValueInitialize">xmlSecKeyDataBinaryValueInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueInitialize  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Initializes key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueDuplicate
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueDuplicate" role="function">
+<title>xmlSecKeyDataBinaryValueDuplicate ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueDuplicate"><primary sortas="xmlSecKeyDataBinaryValueDuplicate">xmlSecKeyDataBinaryValueDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueDuplicate   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
 <para>
 Copies binary key data from <parameter>src</parameter> to <parameter>dst</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to destination binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to source binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataBinaryValueFinalize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueFinalize" role="function">
+<title>xmlSecKeyDataBinaryValueFinalize ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueFinalize"><primary sortas="xmlSecKeyDataBinaryValueFinalize">xmlSecKeyDataBinaryValueFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueFinalize    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Cleans up binary key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueXmlRead (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueXmlRead" role="function">
+<title>xmlSecKeyDataBinaryValueXmlRead ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueXmlRead"><primary sortas="xmlSecKeyDataBinaryValueXmlRead">xmlSecKeyDataBinaryValueXmlRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueXmlRead     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads binary key data from <parameter>node</parameter> to the key by base64 decoding the <parameter>node</parameter> content.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueXmlWrite
-                                            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueXmlWrite" role="function">
+<title>xmlSecKeyDataBinaryValueXmlWrite ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueXmlWrite"><primary sortas="xmlSecKeyDataBinaryValueXmlWrite">xmlSecKeyDataBinaryValueXmlWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueXmlWrite    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Base64 encodes binary key data of klass <parameter>id</parameter> from the <parameter>key</parameter> and 
 sets to the <parameter>node</parameter> content.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueBinRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueBinRead (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueBinRead" role="function">
+<title>xmlSecKeyDataBinaryValueBinRead ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueBinRead"><primary sortas="xmlSecKeyDataBinaryValueBinRead">xmlSecKeyDataBinaryValueBinRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueBinRead     (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads binary key data of the klass <parameter>id</parameter> from <parameter>buf</parameter> to the <parameter>key</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the source binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the source binary buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueBinWrite
-                                            (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> **buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueBinWrite" role="function">
+<title>xmlSecKeyDataBinaryValueBinWrite ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueBinWrite"><primary sortas="xmlSecKeyDataBinaryValueBinWrite">xmlSecKeyDataBinaryValueBinWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueBinWrite    (<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> id,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> **buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *bufSize,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Writes binary key data of klass <parameter>id</parameter> from the <parameter>key</parameter> to <parameter>buf</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the data klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the destination binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the destination binary buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataBinaryValueDebugDump
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueDebugDump" role="function">
+<title>xmlSecKeyDataBinaryValueDebugDump ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueDebugDump"><primary sortas="xmlSecKeyDataBinaryValueDebugDump">xmlSecKeyDataBinaryValueDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueDebugDump   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary key data debug information to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataBinaryValueDebugXmlDump
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueDebugXmlDump" role="function">
+<title>xmlSecKeyDataBinaryValueDebugXmlDump ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueDebugXmlDump"><primary sortas="xmlSecKeyDataBinaryValueDebugXmlDump">xmlSecKeyDataBinaryValueDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataBinaryValueDebugXmlDump
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary key data debug information to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecKeyDataBinaryValueGetSize (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueGetSize" role="function">
+<title>xmlSecKeyDataBinaryValueGetSize ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueGetSize"><primary sortas="xmlSecKeyDataBinaryValueGetSize">xmlSecKeyDataBinaryValueGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecKeyDataBinaryValueGetSize     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the binary key data size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>binary key data size in bits.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> binary key data size in bits.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecKeyDataBinaryValueGetBuffer
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueGetBuffer" role="function">
+<title>xmlSecKeyDataBinaryValueGetBuffer ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueGetBuffer"><primary sortas="xmlSecKeyDataBinaryValueGetBuffer">xmlSecKeyDataBinaryValueGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecKeyDataBinaryValueGetBuffer   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the binary key data buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to binary key data buffer.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to binary key data buffer.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer ()</title>
-<indexterm><primary>xmlSecKeyDataBinaryValueSetBuffer</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeyDataBinaryValueSetBuffer
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecKeyDataBinaryValueSetBuffer" role="function">
+<title>xmlSecKeyDataBinaryValueSetBuffer ()</title>
+<indexterm zone="xmlSecKeyDataBinaryValueSetBuffer"><primary sortas="xmlSecKeyDataBinaryValueSetBuffer">xmlSecKeyDataBinaryValueSetBuffer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeyDataBinaryValueSetBuffer   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of <parameter>data</parameter> to <parameter>buf</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the binary buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStore">struct xmlSecKeyDataStore</title>
-<indexterm><primary>xmlSecKeyDataStore</primary></indexterm><programlisting>struct xmlSecKeyDataStore {
-
+<refsect2 id="xmlSecKeyDataStore" role="struct">
+<title>struct xmlSecKeyDataStore</title>
+<indexterm zone="xmlSecKeyDataStore"><primary sortas="xmlSecKeyDataStore">xmlSecKeyDataStore</primary></indexterm><programlisting>struct xmlSecKeyDataStore {
     xmlSecKeyDataStoreId		id;
 
     /* for the future */
@@ -1746,150 +1628,137 @@ The key data store. Key data store holds common key data specific information
 required for key data processing. For example, X509 data store may hold 
 information about trusted (root) certificates.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> <structfield>id</structfield></term>
+<term><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>&#160;<structfield>id</structfield>;</term>
 <listitem><simpara> 		the store id (<link linkend="xmlSecKeyDataStoreId"><type>xmlSecKeyDataStoreId</type></link>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate ()</title>
-<indexterm><primary>xmlSecKeyDataStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> xmlSecKeyDataStoreCreate
-                                            (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
+<refsect2 id="xmlSecKeyDataStoreCreate" role="function">
+<title>xmlSecKeyDataStoreCreate ()</title>
+<indexterm zone="xmlSecKeyDataStoreCreate"><primary sortas="xmlSecKeyDataStoreCreate">xmlSecKeyDataStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link>  xmlSecKeyDataStoreCreate         (<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
 <para>
 Creates new key data store of the specified klass <parameter>id</parameter>. Caller is responsible
 for freeng returned object with <link linkend="xmlSecKeyDataStoreDestroy"><type>xmlSecKeyDataStoreDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the store id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated key data store structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated key data store structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy ()</title>
-<indexterm><primary>xmlSecKeyDataStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyDataStoreDestroy       (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyDataStoreDestroy" role="function">
+<title>xmlSecKeyDataStoreDestroy ()</title>
+<indexterm zone="xmlSecKeyDataStoreDestroy"><primary sortas="xmlSecKeyDataStoreDestroy">xmlSecKeyDataStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyDataStoreDestroy           (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
 <para>
 Destroys the key data store created with <link linkend="xmlSecKeyDataStoreCreate"><type>xmlSecKeyDataStoreCreate</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the key data store..
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName()</title>
-<indexterm><primary>xmlSecKeyDataStoreGetName</primary></indexterm><programlisting>#define     xmlSecKeyDataStoreGetName(store)</programlisting>
+<refsect2 id="xmlSecKeyDataStoreGetName" role="macro">
+<title>xmlSecKeyDataStoreGetName()</title>
+<indexterm zone="xmlSecKeyDataStoreGetName"><primary sortas="xmlSecKeyDataStoreGetName">xmlSecKeyDataStoreGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreGetName(store)</programlisting>
 <para>
 Macro. Returns key data store name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid()</title>
-<indexterm><primary>xmlSecKeyDataStoreIsValid</primary></indexterm><programlisting>#define     xmlSecKeyDataStoreIsValid(store)</programlisting>
+<refsect2 id="xmlSecKeyDataStoreIsValid" role="macro">
+<title>xmlSecKeyDataStoreIsValid()</title>
+<indexterm zone="xmlSecKeyDataStoreIsValid"><primary sortas="xmlSecKeyDataStoreIsValid">xmlSecKeyDataStoreIsValid</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreIsValid(store)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is not NULL and <parameter>store</parameter>-&gt;id is not NULL
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId()</title>
-<indexterm><primary>xmlSecKeyDataStoreCheckId</primary></indexterm><programlisting>#define     xmlSecKeyDataStoreCheckId(store, storeId)</programlisting>
+<refsect2 id="xmlSecKeyDataStoreCheckId" role="macro">
+<title>xmlSecKeyDataStoreCheckId()</title>
+<indexterm zone="xmlSecKeyDataStoreCheckId"><primary sortas="xmlSecKeyDataStoreCheckId">xmlSecKeyDataStoreCheckId</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreCheckId(store, storeId)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>storeId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>storeId</parameter>&#160;:</term>
 <listitem><simpara> 		the store Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize()</title>
-<indexterm><primary>xmlSecKeyDataStoreCheckSize</primary></indexterm><programlisting>#define     xmlSecKeyDataStoreCheckSize(store, size)</programlisting>
+<refsect2 id="xmlSecKeyDataStoreCheckSize" role="macro">
+<title>xmlSecKeyDataStoreCheckSize()</title>
+<indexterm zone="xmlSecKeyDataStoreCheckSize"><primary sortas="xmlSecKeyDataStoreCheckSize">xmlSecKeyDataStoreCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreCheckSize(store, size)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>data</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</title>
-<indexterm><primary>xmlSecKeyDataStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataStoreIdUnknown 			NULL
+<refsect2 id="xmlSecKeyDataStoreIdUnknown" role="macro">
+<title>xmlSecKeyDataStoreIdUnknown</title>
+<indexterm zone="xmlSecKeyDataStoreIdUnknown"><primary sortas="xmlSecKeyDataStoreIdUnknown">xmlSecKeyDataStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyDataStoreIdUnknown 			NULL
 </programlisting>
 <para>
 The "unknown" id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod ()</title>
-<indexterm><primary>xmlSecKeyDataStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyDataStoreInitializeMethod)
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyDataStoreInitializeMethod" role="function">
+<title>xmlSecKeyDataStoreInitializeMethod ()</title>
+<indexterm zone="xmlSecKeyDataStoreInitializeMethod"><primary sortas="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyDataStoreInitializeMethod)
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
 <para>
 Key data store specific initialization method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the data store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod ()</title>
-<indexterm><primary>xmlSecKeyDataStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecKeyDataStoreFinalizeMethod)
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyDataStoreFinalizeMethod" role="function">
+<title>xmlSecKeyDataStoreFinalizeMethod ()</title>
+<indexterm zone="xmlSecKeyDataStoreFinalizeMethod"><primary sortas="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyDataStoreFinalizeMethod) (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
 <para>
 Key data store specific finalization (destroy) method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the data store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreKlass">struct xmlSecKeyDataStoreKlass</title>
-<indexterm><primary>xmlSecKeyDataStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyDataStoreKlass {
-
+<refsect2 id="xmlSecKeyDataStoreKlass" role="struct">
+<title>struct xmlSecKeyDataStoreKlass</title>
+<indexterm zone="xmlSecKeyDataStoreKlass"><primary sortas="xmlSecKeyDataStoreKlass">xmlSecKeyDataStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyDataStoreKlass {
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -1908,75 +1777,70 @@ Key data store specific finalization (destroy) method.</para>
 <para>
 The data store id (klass).</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>klassSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
 <listitem><simpara>		the data store klass size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>objSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
 <listitem><simpara>		the data store obj size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara>		the store's name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</link> <structfield>initialize</structfield></term>
+<term><link linkend="xmlSecKeyDataStoreInitializeMethod">xmlSecKeyDataStoreInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
 <listitem><simpara>		the store's initialization method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</link> <structfield>finalize</structfield></term>
+<term><link linkend="xmlSecKeyDataStoreFinalizeMethod">xmlSecKeyDataStoreFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
 <listitem><simpara>		the store's finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName()</title>
-<indexterm><primary>xmlSecKeyDataStoreKlassGetName</primary></indexterm><programlisting>#define     xmlSecKeyDataStoreKlassGetName(klass)</programlisting>
+<refsect2 id="xmlSecKeyDataStoreKlassGetName" role="macro">
+<title>xmlSecKeyDataStoreKlassGetName()</title>
+<indexterm zone="xmlSecKeyDataStoreKlassGetName"><primary sortas="xmlSecKeyDataStoreKlassGetName">xmlSecKeyDataStoreKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyDataStoreKlassGetName(klass)</programlisting>
 <para>
 Macro. Returns store klass name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>klass</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</title>
-<indexterm><primary>xmlSecKeyDataStorePtrListId</primary></indexterm><programlisting>#define xmlSecKeyDataStorePtrListId	xmlSecKeyDataStorePtrListGetKlass()
+<refsect2 id="xmlSecKeyDataStorePtrListId" role="macro">
+<title>xmlSecKeyDataStorePtrListId</title>
+<indexterm zone="xmlSecKeyDataStorePtrListId"><primary sortas="xmlSecKeyDataStorePtrListId">xmlSecKeyDataStorePtrListId</primary></indexterm><programlisting>#define xmlSecKeyDataStorePtrListId	xmlSecKeyDataStorePtrListGetKlass()
 </programlisting>
 <para>
 The data store list id (klass).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass ()</title>
-<indexterm><primary>xmlSecKeyDataStorePtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecKeyDataStorePtrListGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecKeyDataStorePtrListGetKlass" role="function">
+<title>xmlSecKeyDataStorePtrListGetKlass ()</title>
+<indexterm zone="xmlSecKeyDataStorePtrListGetKlass"><primary sortas="xmlSecKeyDataStorePtrListGetKlass">xmlSecKeyDataStorePtrListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecKeyDataStorePtrListGetKlass   (void);</programlisting>
 <para>
 Key data stores list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>key data stores list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> key data stores list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/keysmngr.sgml b/docs/api/sgml/keysmngr.sgml
index 628f851..0bb8334 100644
--- a/docs/api/sgml/keysmngr.sgml
+++ b/docs/api/sgml/keysmngr.sgml
@@ -1,71 +1,65 @@
 <refentry id="xmlsec-keysmngr">
 <refmeta>
-<refentrytitle>keysmngr</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-keysmngr.top_of_page">keysmngr</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keysmngr</refname><refpurpose>Keys manager object support.</refpurpose>
+<refname>keysmngr</refname>
+<refpurpose>Keys manager object support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-keysmngr.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> <link linkend="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</link>      (void);
-<link linkend="void">void</link>        <link linkend="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</link>           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> <link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</link>    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> <link linkend="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</link>    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
-<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> <link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> (<link linkend="xmlSecGetKeyCallback">*xmlSecGetKeyCallback</link>)        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-struct      <link linkend="xmlSecKeysMngr">xmlSecKeysMngr</link>;
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> <link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link>           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-struct      <link linkend="xmlSecKeyStore">xmlSecKeyStore</link>;
-<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> <link linkend="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</link>      (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);
-<link linkend="void">void</link>        <link linkend="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</link>           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> <link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</link>          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-#define     <link linkend="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</link>           (store)
-#define     <link linkend="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</link>           (store)
-#define     <link linkend="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</link>           (store, storeId)
-#define     <link linkend="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</link>         (store, size)
-#define     <link linkend="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</link>
-<link linkend="int">int</link>         (<link linkend="xmlSecKeyStoreInitializeMethod">*xmlSecKeyStoreInitializeMethod</link>)
-                                            (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="void">void</link>        (<link linkend="xmlSecKeyStoreFinalizeMethod">*xmlSecKeyStoreFinalizeMethod</link>) (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
-<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> (<link linkend="xmlSecKeyStoreFindKeyMethod">*xmlSecKeyStoreFindKeyMethod</link>) (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
-struct      <link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link>;
-#define     <link linkend="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</link>      (klass)
-#define     <link linkend="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> <link linkend="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</link>   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</link>       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>         <link linkend="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</link>       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</link>
-                                            (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>   <link linkend="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</link>                (void);
+<link linkend="void">void</link>                <link linkend="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="xmlSecKeyStorePtr">xmlSecKeyStorePtr</link>   <link linkend="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);
+<link linkend="xmlSecKeyDataStorePtr">xmlSecKeyDataStorePtr</link>  <link linkend="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</link>       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (<link linkend="xmlSecGetKeyCallback">*xmlSecGetKeyCallback</link>)             (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+struct              <link linkend="xmlSecKeysMngr">xmlSecKeysMngr</link>;
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</link>                (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+struct              <link linkend="xmlSecKeyStore">xmlSecKeyStore</link>;
+<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>   <link linkend="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</link>                (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);
+<link linkend="void">void</link>                <link linkend="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</link>               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        <link linkend="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</link>               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+#define             <link linkend="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</link>               (store)
+#define             <link linkend="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</link>               (store)
+#define             <link linkend="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</link>               (store, storeId)
+#define             <link linkend="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</link>             (store, size)
+#define             <link linkend="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</link>
+<link linkend="int">int</link>                 (<link linkend="xmlSecKeyStoreInitializeMethod">*xmlSecKeyStoreInitializeMethod</link>)   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="void">void</link>                (<link linkend="xmlSecKeyStoreFinalizeMethod">*xmlSecKeyStoreFinalizeMethod</link>)     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
+<link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (<link linkend="xmlSecKeyStoreFindKeyMethod">*xmlSecKeyStoreFindKeyMethod</link>)      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+struct              <link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link>;
+#define             <link linkend="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</link>          (klass)
+#define             <link linkend="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</link>
+<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</link>       (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</link>       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</link>           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</link>           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    <link linkend="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</link>        (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);
 </synopsis>
 </refsynopsisdiv>
 
@@ -77,158 +71,147 @@ struct      <link linkend="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-keysmngr.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Keys manager object support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate ()</title>
-<indexterm><primary>xmlSecKeysMngrCreate</primary></indexterm><programlisting><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> xmlSecKeysMngrCreate      (void);</programlisting>
+<refsect1 id="xmlsec-keysmngr.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecKeysMngrCreate" role="function">
+<title>xmlSecKeysMngrCreate ()</title>
+<indexterm zone="xmlSecKeysMngrCreate"><primary sortas="xmlSecKeysMngrCreate">xmlSecKeysMngrCreate</primary></indexterm><programlisting><link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link>   xmlSecKeysMngrCreate                (void);</programlisting>
 <para>
 Creates new keys manager. Caller is responsible for freeing it with 
 <link linkend="xmlSecKeysMngrDestroy"><type>xmlSecKeysMngrDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated keys manager or NULL if 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated keys manager or NULL if 
 an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy ()</title>
-<indexterm><primary>xmlSecKeysMngrDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeysMngrDestroy           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecKeysMngrDestroy" role="function">
+<title>xmlSecKeysMngrDestroy ()</title>
+<indexterm zone="xmlSecKeysMngrDestroy"><primary sortas="xmlSecKeysMngrDestroy">xmlSecKeysMngrDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeysMngrDestroy               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Destroys keys manager created with <link linkend="xmlSecKeysMngrCreate"><type>xmlSecKeysMngrCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey ()</title>
-<indexterm><primary>xmlSecKeysMngrFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> xmlSecKeysMngrFindKey          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeysMngrFindKey" role="function">
+<title>xmlSecKeysMngrFindKey ()</title>
+<indexterm zone="xmlSecKeysMngrFindKey"><primary sortas="xmlSecKeysMngrFindKey">xmlSecKeysMngrFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeysMngrFindKey               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Lookups key in the keys manager keys store. The caller is responsible 
 for destroying the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the desired key name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to a key or NULL if key is not found or an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore ()</title>
-<indexterm><primary>xmlSecKeysMngrAdoptKeysStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeysMngrAdoptKeysStore    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeysMngrAdoptKeysStore" role="function">
+<title>xmlSecKeysMngrAdoptKeysStore ()</title>
+<indexterm zone="xmlSecKeysMngrAdoptKeysStore"><primary sortas="xmlSecKeysMngrAdoptKeysStore">xmlSecKeysMngrAdoptKeysStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeysMngrAdoptKeysStore        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
 <para>
 Adopts keys store in the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore ()</title>
-<indexterm><primary>xmlSecKeysMngrGetKeysStore</primary></indexterm><programlisting><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> xmlSecKeysMngrGetKeysStore
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecKeysMngrGetKeysStore" role="function">
+<title>xmlSecKeysMngrGetKeysStore ()</title>
+<indexterm zone="xmlSecKeysMngrGetKeysStore"><primary sortas="xmlSecKeysMngrGetKeysStore">xmlSecKeysMngrGetKeysStore</primary></indexterm><programlisting><link linkend="xmlSecKeyStorePtr">xmlSecKeyStorePtr</link>   xmlSecKeysMngrGetKeysStore          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Gets the keys store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the keys store in the keys manager <parameter>mngr</parameter> or NULL if 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the keys store in the keys manager <parameter>mngr</parameter> or NULL if 
 there is no store or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore ()</title>
-<indexterm><primary>xmlSecKeysMngrAdoptDataStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecKeysMngrAdoptDataStore    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeysMngrAdoptDataStore" role="function">
+<title>xmlSecKeysMngrAdoptDataStore ()</title>
+<indexterm zone="xmlSecKeysMngrAdoptDataStore"><primary sortas="xmlSecKeysMngrAdoptDataStore">xmlSecKeysMngrAdoptDataStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecKeysMngrAdoptDataStore        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store);</programlisting>
 <para>
 Adopts data store in the keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to data store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore ()</title>
-<indexterm><primary>xmlSecKeysMngrGetDataStore</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> xmlSecKeysMngrGetDataStore
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
+<refsect2 id="xmlSecKeysMngrGetDataStore" role="function">
+<title>xmlSecKeysMngrGetDataStore ()</title>
+<indexterm zone="xmlSecKeysMngrGetDataStore"><primary sortas="xmlSecKeysMngrGetDataStore">xmlSecKeysMngrGetDataStore</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStorePtr">xmlSecKeyDataStorePtr</link>  xmlSecKeysMngrGetDataStore       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> id);</programlisting>
 <para>
 Lookups the data store of given klass <parameter>id</parameter> in the keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the desired data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to data store or NULL if it is not found or an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to data store or NULL if it is not found or an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGetKeyCallback">xmlSecGetKeyCallback ()</title>
-<indexterm><primary>xmlSecGetKeyCallback</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> (*xmlSecGetKeyCallback)        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecGetKeyCallback" role="function">
+<title>xmlSecGetKeyCallback ()</title>
+<indexterm zone="xmlSecGetKeyCallback"><primary sortas="xmlSecGetKeyCallback">xmlSecGetKeyCallback</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (*xmlSecGetKeyCallback)             (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to key or NULL if the key is not found or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to key or NULL if the key is not found or 
 an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngr">struct xmlSecKeysMngr</title>
-<indexterm><primary>xmlSecKeysMngr</primary></indexterm><programlisting>struct xmlSecKeysMngr {
-	
+<refsect2 id="xmlSecKeysMngr" role="struct">
+<title>struct xmlSecKeysMngr</title>
+<indexterm zone="xmlSecKeysMngr"><primary sortas="xmlSecKeysMngr">xmlSecKeysMngr</primary></indexterm><programlisting>struct xmlSecKeysMngr {
     xmlSecKeyStorePtr		keysStore;	
     xmlSecPtrList		storesList;	
     xmlSecGetKeyCallback	getKey;		
@@ -237,47 +220,44 @@ an error occurs.
 <para>
 The keys manager structure.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> <structfield>keysStore</structfield></term>
+<term><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>&#160;<structfield>keysStore</structfield>;</term>
 <listitem><simpara>			the key store (list of keys known to keys manager).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>storesList</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>storesList</structfield>;</term>
 <listitem><simpara>			the list of key data stores known to keys manager.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecGetKeyCallback">xmlSecGetKeyCallback</link> <structfield>getKey</structfield></term>
+<term><link linkend="xmlSecGetKeyCallback">xmlSecGetKeyCallback</link>&#160;<structfield>getKey</structfield>;</term>
 <listitem><simpara> 			the callback used to read <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey ()</title>
-<indexterm><primary>xmlSecKeysMngrGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> xmlSecKeysMngrGetKey           (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeysMngrGetKey" role="function">
+<title>xmlSecKeysMngrGetKey ()</title>
+<indexterm zone="xmlSecKeysMngrGetKey"><primary sortas="xmlSecKeysMngrGetKey">xmlSecKeysMngrGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeysMngrGetKey                (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter> and extracts the key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.	
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to key or NULL if the key is not found or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to key or NULL if the key is not found or 
 an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStore">struct xmlSecKeyStore</title>
-<indexterm><primary>xmlSecKeyStore</primary></indexterm><programlisting>struct xmlSecKeyStore {
-
+<refsect2 id="xmlSecKeyStore" role="struct">
+<title>struct xmlSecKeyStore</title>
+<indexterm zone="xmlSecKeyStore"><primary sortas="xmlSecKeyStore">xmlSecKeyStore</primary></indexterm><programlisting>struct xmlSecKeyStore {
     xmlSecKeyStoreId			id;
 
     /* for the future */
@@ -288,192 +268,178 @@ an error occurs.
 <para>
 The keys store.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> <structfield>id</structfield></term>
+<term><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>&#160;<structfield>id</structfield>;</term>
 <listitem><simpara> 		the store id (<link linkend="xmlSecKeyStoreId"><type>xmlSecKeyStoreId</type></link>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate ()</title>
-<indexterm><primary>xmlSecKeyStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> xmlSecKeyStoreCreate      (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);</programlisting>
+<refsect2 id="xmlSecKeyStoreCreate" role="function">
+<title>xmlSecKeyStoreCreate ()</title>
+<indexterm zone="xmlSecKeyStoreCreate"><primary sortas="xmlSecKeyStoreCreate">xmlSecKeyStoreCreate</primary></indexterm><programlisting><link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link>   xmlSecKeyStoreCreate                (<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> id);</programlisting>
 <para>
 Creates new store of the specified klass <parameter>klass</parameter>. Caller is responsible
 for freeing the returned store by calling <link linkend="xmlSecKeyStoreDestroy"><type>xmlSecKeyStoreDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the key store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly allocated keys store or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly allocated keys store or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy ()</title>
-<indexterm><primary>xmlSecKeyStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecKeyStoreDestroy           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyStoreDestroy" role="function">
+<title>xmlSecKeyStoreDestroy ()</title>
+<indexterm zone="xmlSecKeyStoreDestroy"><primary sortas="xmlSecKeyStoreDestroy">xmlSecKeyStoreDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecKeyStoreDestroy               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
 <para>
 Destroys the store created with <link linkend="xmlSecKeyStoreCreate"><type>xmlSecKeyStoreCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys store. 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey ()</title>
-<indexterm><primary>xmlSecKeyStoreFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> xmlSecKeyStoreFindKey          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyStoreFindKey" role="function">
+<title>xmlSecKeyStoreFindKey ()</title>
+<indexterm zone="xmlSecKeyStoreFindKey"><primary sortas="xmlSecKeyStoreFindKey">xmlSecKeyStoreFindKey</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        xmlSecKeyStoreFindKey               (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Lookups key in the store. The caller is responsible for destroying 
 the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the desired key name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to a key or NULL if key is not found or an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName()</title>
-<indexterm><primary>xmlSecKeyStoreGetName</primary></indexterm><programlisting>#define     xmlSecKeyStoreGetName(store)</programlisting>
+<refsect2 id="xmlSecKeyStoreGetName" role="macro">
+<title>xmlSecKeyStoreGetName()</title>
+<indexterm zone="xmlSecKeyStoreGetName"><primary sortas="xmlSecKeyStoreGetName">xmlSecKeyStoreGetName</primary></indexterm><programlisting>#define             xmlSecKeyStoreGetName(store)</programlisting>
 <para>
 Macro. Returns key store name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid()</title>
-<indexterm><primary>xmlSecKeyStoreIsValid</primary></indexterm><programlisting>#define     xmlSecKeyStoreIsValid(store)</programlisting>
+<refsect2 id="xmlSecKeyStoreIsValid" role="macro">
+<title>xmlSecKeyStoreIsValid()</title>
+<indexterm zone="xmlSecKeyStoreIsValid"><primary sortas="xmlSecKeyStoreIsValid">xmlSecKeyStoreIsValid</primary></indexterm><programlisting>#define             xmlSecKeyStoreIsValid(store)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is not NULL and <parameter>store</parameter>-&gt;id is not NULL
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId()</title>
-<indexterm><primary>xmlSecKeyStoreCheckId</primary></indexterm><programlisting>#define     xmlSecKeyStoreCheckId(store, storeId)</programlisting>
+<refsect2 id="xmlSecKeyStoreCheckId" role="macro">
+<title>xmlSecKeyStoreCheckId()</title>
+<indexterm zone="xmlSecKeyStoreCheckId"><primary sortas="xmlSecKeyStoreCheckId">xmlSecKeyStoreCheckId</primary></indexterm><programlisting>#define             xmlSecKeyStoreCheckId(store, storeId)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>store</parameter>'s id is equal to <parameter>storeId</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>storeId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>storeId</parameter>&#160;:</term>
 <listitem><simpara> 		the store Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize()</title>
-<indexterm><primary>xmlSecKeyStoreCheckSize</primary></indexterm><programlisting>#define     xmlSecKeyStoreCheckSize(store, size)</programlisting>
+<refsect2 id="xmlSecKeyStoreCheckSize" role="macro">
+<title>xmlSecKeyStoreCheckSize()</title>
+<indexterm zone="xmlSecKeyStoreCheckSize"><primary sortas="xmlSecKeyStoreCheckSize">xmlSecKeyStoreCheckSize</primary></indexterm><programlisting>#define             xmlSecKeyStoreCheckSize(store, size)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>store</parameter> is valid and <parameter>stores</parameter>'s object has at least <parameter>size</parameter> bytes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the expected size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</title>
-<indexterm><primary>xmlSecKeyStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyStoreIdUnknown 			((xmlSecKeyDataStoreId)NULL)
+<refsect2 id="xmlSecKeyStoreIdUnknown" role="macro">
+<title>xmlSecKeyStoreIdUnknown</title>
+<indexterm zone="xmlSecKeyStoreIdUnknown"><primary sortas="xmlSecKeyStoreIdUnknown">xmlSecKeyStoreIdUnknown</primary></indexterm><programlisting>#define xmlSecKeyStoreIdUnknown 			((xmlSecKeyDataStoreId)NULL)
 </programlisting>
 <para>
 The "unknown" id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod ()</title>
-<indexterm><primary>xmlSecKeyStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecKeyStoreInitializeMethod)
-                                            (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyStoreInitializeMethod" role="function">
+<title>xmlSecKeyStoreInitializeMethod ()</title>
+<indexterm zone="xmlSecKeyStoreInitializeMethod"><primary sortas="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecKeyStoreInitializeMethod)   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
 <para>
 Keys store specific initialization method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod ()</title>
-<indexterm><primary>xmlSecKeyStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecKeyStoreFinalizeMethod) (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecKeyStoreFinalizeMethod" role="function">
+<title>xmlSecKeyStoreFinalizeMethod ()</title>
+<indexterm zone="xmlSecKeyStoreFinalizeMethod"><primary sortas="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecKeyStoreFinalizeMethod)     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
 <para>
 Keys store specific finalization (destroy) method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the store.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod ()</title>
-<indexterm><primary>xmlSecKeyStoreFindKeyMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link> (*xmlSecKeyStoreFindKeyMethod) (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecKeyStoreFindKeyMethod" role="function">
+<title>xmlSecKeyStoreFindKeyMethod ()</title>
+<indexterm zone="xmlSecKeyStoreFindKeyMethod"><primary sortas="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyPtr">xmlSecKeyPtr</link>        (*xmlSecKeyStoreFindKeyMethod)      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Keys store specific find method. The caller is responsible for destroying 
 the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</type></link> method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> 		the store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the desired key name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to key info context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to a key or NULL if key is not found or an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to a key or NULL if key is not found or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreKlass">struct xmlSecKeyStoreKlass</title>
-<indexterm><primary>xmlSecKeyStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyStoreKlass {
-
+<refsect2 id="xmlSecKeyStoreKlass" role="struct">
+<title>struct xmlSecKeyStoreKlass</title>
+<indexterm zone="xmlSecKeyStoreKlass"><primary sortas="xmlSecKeyStoreKlass">xmlSecKeyStoreKlass</primary></indexterm><programlisting>struct xmlSecKeyStoreKlass {
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -493,157 +459,147 @@ the returned key using <link linkend="xmlSecKeyDestroy"><type>xmlSecKeyDestroy</
 <para>
 The keys store id (klass).</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>klassSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
 <listitem><simpara>		the store klass size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>objSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
 <listitem><simpara>		the store obj size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara>		the store's name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</link> <structfield>initialize</structfield></term>
+<term><link linkend="xmlSecKeyStoreInitializeMethod">xmlSecKeyStoreInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
 <listitem><simpara>		the store's initialization method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</link> <structfield>finalize</structfield></term>
+<term><link linkend="xmlSecKeyStoreFinalizeMethod">xmlSecKeyStoreFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
 <listitem><simpara>		the store's finalization (destroy) method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</link> <structfield>findKey</structfield></term>
+<term><link linkend="xmlSecKeyStoreFindKeyMethod">xmlSecKeyStoreFindKeyMethod</link>&#160;<structfield>findKey</structfield>;</term>
 <listitem><simpara>		the store's find method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName()</title>
-<indexterm><primary>xmlSecKeyStoreKlassGetName</primary></indexterm><programlisting>#define     xmlSecKeyStoreKlassGetName(klass)</programlisting>
+<refsect2 id="xmlSecKeyStoreKlassGetName" role="macro">
+<title>xmlSecKeyStoreKlassGetName()</title>
+<indexterm zone="xmlSecKeyStoreKlassGetName"><primary sortas="xmlSecKeyStoreKlassGetName">xmlSecKeyStoreKlassGetName</primary></indexterm><programlisting>#define             xmlSecKeyStoreKlassGetName(klass)</programlisting>
 <para>
 Macro. Returns store klass name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>klass</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</title>
-<indexterm><primary>xmlSecSimpleKeysStoreId</primary></indexterm><programlisting>#define xmlSecSimpleKeysStoreId		xmlSecSimpleKeysStoreGetKlass()
+<refsect2 id="xmlSecSimpleKeysStoreId" role="macro">
+<title>xmlSecSimpleKeysStoreId</title>
+<indexterm zone="xmlSecSimpleKeysStoreId"><primary sortas="xmlSecSimpleKeysStoreId">xmlSecSimpleKeysStoreId</primary></indexterm><programlisting>#define xmlSecSimpleKeysStoreId		xmlSecSimpleKeysStoreGetKlass()
 </programlisting>
 <para>
 A simple keys store klass id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass ()</title>
-<indexterm><primary>xmlSecSimpleKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> xmlSecSimpleKeysStoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecSimpleKeysStoreGetKlass" role="function">
+<title>xmlSecSimpleKeysStoreGetKlass ()</title>
+<indexterm zone="xmlSecSimpleKeysStoreGetKlass"><primary sortas="xmlSecSimpleKeysStoreGetKlass">xmlSecSimpleKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecSimpleKeysStoreGetKlass       (void);</programlisting>
 <para>
 The simple list based keys store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>simple list based keys store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> simple list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey ()</title>
-<indexterm><primary>xmlSecSimpleKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecSimpleKeysStoreAdoptKey   (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecSimpleKeysStoreAdoptKey" role="function">
+<title>xmlSecSimpleKeysStoreAdoptKey ()</title>
+<indexterm zone="xmlSecSimpleKeysStoreAdoptKey"><primary sortas="xmlSecSimpleKeysStoreAdoptKey">xmlSecSimpleKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreAdoptKey       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to simple keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad ()</title>
-<indexterm><primary>xmlSecSimpleKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecSimpleKeysStoreLoad       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecSimpleKeysStoreLoad" role="function">
+<title>xmlSecSimpleKeysStoreLoad ()</title>
+<indexterm zone="xmlSecSimpleKeysStoreLoad"><primary sortas="xmlSecSimpleKeysStoreLoad">xmlSecSimpleKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreLoad           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Reads keys from an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to simple keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to associated keys manager. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave ()</title>
-<indexterm><primary>xmlSecSimpleKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecSimpleKeysStoreSave       (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecSimpleKeysStoreSave" role="function">
+<title>xmlSecSimpleKeysStoreSave ()</title>
+<indexterm zone="xmlSecSimpleKeysStoreSave"><primary sortas="xmlSecSimpleKeysStoreSave">xmlSecSimpleKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSimpleKeysStoreSave           (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Writes keys from <parameter>store</parameter> to an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to simple keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys ()</title>
-<indexterm><primary>xmlSecSimpleKeysStoreGetKeys</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecSimpleKeysStoreGetKeys
-                                            (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
+<refsect2 id="xmlSecSimpleKeysStoreGetKeys" role="function">
+<title>xmlSecSimpleKeysStoreGetKeys ()</title>
+<indexterm zone="xmlSecSimpleKeysStoreGetKeys"><primary sortas="xmlSecSimpleKeysStoreGetKeys">xmlSecSimpleKeysStoreGetKeys</primary></indexterm><programlisting><link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    xmlSecSimpleKeysStoreGetKeys        (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store);</programlisting>
 <para>
 Gets list of keys from simple keys store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to simple keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the list of keys stored in the keys store or NULL
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the list of keys stored in the keys store or NULL
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/list.sgml b/docs/api/sgml/list.sgml
index 7288d9f..0f65165 100644
--- a/docs/api/sgml/list.sgml
+++ b/docs/api/sgml/list.sgml
@@ -1,59 +1,57 @@
 <refentry id="xmlsec-list">
 <refmeta>
-<refentrytitle>list</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-list.top_of_page">list</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>list</refname><refpurpose>Generic list structure implementation.</refpurpose>
+<refname>list</refname>
+<refpurpose>Generic list structure implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-list.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-struct      <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</link>
-                                            (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
-<link linkend="int">int</link>         <link linkend="xmlSecPtrListInitialize">xmlSecPtrListInitialize</link>         (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListFinalize">xmlSecPtrListFinalize</link>           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecPtrListCreate">xmlSecPtrListCreate</link>        (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListDestroy">xmlSecPtrListDestroy</link>            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListEmpty">xmlSecPtrListEmpty</link>              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="int">int</link>         <link linkend="xmlSecPtrListCopy">xmlSecPtrListCopy</link>               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
-                                             <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);
-<link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link> <link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecPtrListGetSize">xmlSecPtrListGetSize</link>            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
-<link linkend="xmlSecPtr">xmlSecPtr</link>   <link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</link>            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="int">int</link>         <link linkend="xmlSecPtrListAdd">xmlSecPtrListAdd</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSec">xmlSecPtr</link> item);
-<link linkend="int">int</link>         <link linkend="xmlSecPtrListSet">xmlSecPtrListSet</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSec">xmlSecPtr</link> item,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="int">int</link>         <link linkend="xmlSecPtrListRemove">xmlSecPtrListRemove</link>             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</link>          (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecPtrListGetName">xmlSecPtrListGetName</link>            (list)
-#define     <link linkend="xmlSecPtrListIsValid">xmlSecPtrListIsValid</link>            (list)
-#define     <link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link>            (list, dataId)
-#define     <link linkend="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</link>
-<link linkend="xmlSecPtr">xmlSecPtr</link>   (<link linkend="xmlSecPtrDuplicateItemMethod">*xmlSecPtrDuplicateItemMethod</link>) (<link linkend="xmlSec">xmlSecPtr</link> ptr);
-<link linkend="void">void</link>        (<link linkend="xmlSecPtrDestroyItemMethod">*xmlSecPtrDestroyItemMethod</link>)   (<link linkend="xmlSec">xmlSecPtr</link> ptr);
-<link linkend="void">void</link>        (<link linkend="xmlSecPtrDebugDumpItemMethod">*xmlSecPtrDebugDumpItemMethod</link>) (<link linkend="xmlSec">xmlSecPtr</link> ptr,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-struct      <link linkend="xmlSecPtrListKlass">xmlSecPtrListKlass</link>;
-#define     <link linkend="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</link>       (klass)
-#define     <link linkend="xmlSecStringListId">xmlSecStringListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecStringListGetKlass">xmlSecStringListGetKlass</link>    (void);
+struct              <link linkend="xmlSecPtrList">xmlSecPtrList</link>;
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</link>    (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecPtrListInitialize">xmlSecPtrListInitialize</link>             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListFinalize">xmlSecPtrListFinalize</link>               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecPtrListCreate">xmlSecPtrListCreate</link>                 (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListDestroy">xmlSecPtrListDestroy</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListEmpty">xmlSecPtrListEmpty</link>                  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<link linkend="int">int</link>                 <link linkend="xmlSecPtrListCopy">xmlSecPtrListCopy</link>                   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
+                                                         <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);
+<link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    <link linkend="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</link>              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecPtrListGetSize">xmlSecPtrListGetSize</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);
+<link linkend="xmlSecPtr">xmlSecPtr</link>           <link linkend="xmlSecPtrListGetItem">xmlSecPtrListGetItem</link>                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="int">int</link>                 <link linkend="xmlSecPtrListAdd">xmlSecPtrListAdd</link>                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSec">xmlSecPtr</link> item);
+<link linkend="int">int</link>                 <link linkend="xmlSecPtrListSet">xmlSecPtrListSet</link>                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSec">xmlSecPtr</link> item,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="int">int</link>                 <link linkend="xmlSecPtrListRemove">xmlSecPtrListRemove</link>                 (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</link>              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</link>           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecPtrListGetName">xmlSecPtrListGetName</link>                (list)
+#define             <link linkend="xmlSecPtrListIsValid">xmlSecPtrListIsValid</link>                (list)
+#define             <link linkend="xmlSecPtrListCheckId">xmlSecPtrListCheckId</link>                (list, dataId)
+#define             <link linkend="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</link>
+<link linkend="xmlSecPtr">xmlSecPtr</link>           (<link linkend="xmlSecPtrDuplicateItemMethod">*xmlSecPtrDuplicateItemMethod</link>)     (<link linkend="xmlSec">xmlSecPtr</link> ptr);
+<link linkend="void">void</link>                (<link linkend="xmlSecPtrDestroyItemMethod">*xmlSecPtrDestroyItemMethod</link>)       (<link linkend="xmlSec">xmlSecPtr</link> ptr);
+<link linkend="void">void</link>                (<link linkend="xmlSecPtrDebugDumpItemMethod">*xmlSecPtrDebugDumpItemMethod</link>)     (<link linkend="xmlSec">xmlSecPtr</link> ptr,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+struct              <link linkend="xmlSecPtrListKlass">xmlSecPtrListKlass</link>;
+#define             <link linkend="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</link>           (klass)
+#define             <link linkend="xmlSecStringListId">xmlSecStringListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecStringListGetKlass">xmlSecStringListGetKlass</link>            (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -65,19 +63,18 @@ struct      <link linkend="xmlSecPtrListKlass">xmlSecPtrListKlass</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-list.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Generic list structure implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecPtrList">struct xmlSecPtrList</title>
-<indexterm><primary>xmlSecPtrList</primary></indexterm><programlisting>struct xmlSecPtrList {
-
+<refsect1 id="xmlsec-list.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecPtrList" role="struct">
+<title>struct xmlSecPtrList</title>
+<indexterm zone="xmlSecPtrList"><primary sortas="xmlSecPtrList">xmlSecPtrList</primary></indexterm><programlisting>struct xmlSecPtrList {
     xmlSecPtrListId		id;        
 
     xmlSecPtr*			data;
@@ -89,375 +86,350 @@ Generic list structure implementation.
 <para>
 The pointers list.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <structfield>id</structfield></term>
+<term><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>&#160;<structfield>id</structfield>;</term>
 <listitem><simpara>				the list items description.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSec">xmlSecPtr</link> *<structfield>data</structfield></term>
+<term><link linkend="xmlSec">xmlSecPtr</link>&#160;*<structfield>data</structfield>;</term>
 <listitem><simpara>			the list data.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>use</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>use</structfield>;</term>
 <listitem><simpara>			the current list size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>max</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>max</structfield>;</term>
 <listitem><simpara>			the max (allocated) list size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link> <structfield>allocMode</structfield></term>
+<term><link linkend="xmlSecAllocMode">xmlSecAllocMode</link>&#160;<structfield>allocMode</structfield>;</term>
 <listitem><simpara>			the memory allocation mode.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode ()</title>
-<indexterm><primary>xmlSecPtrListSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListSetDefaultAllocMode
-                                            (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
+<refsect2 id="xmlSecPtrListSetDefaultAllocMode" role="function">
+<title>xmlSecPtrListSetDefaultAllocMode ()</title>
+<indexterm zone="xmlSecPtrListSetDefaultAllocMode"><primary sortas="xmlSecPtrListSetDefaultAllocMode">xmlSecPtrListSetDefaultAllocMode</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListSetDefaultAllocMode    (<link linkend="xmlSecAllocMode">xmlSecAllocMode</link> defAllocMode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> defInitialSize);</programlisting>
 <para>
 Sets new default allocation mode and minimal initial list size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>defAllocMode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>defAllocMode</parameter>&#160;:</term>
 <listitem><simpara>	the new default memory allocation mode.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>defInitialSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>defInitialSize</parameter>&#160;:</term>
 <listitem><simpara>	the new default minimal initial size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListInitialize">xmlSecPtrListInitialize ()</title>
-<indexterm><primary>xmlSecPtrListInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecPtrListInitialize         (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
+<refsect2 id="xmlSecPtrListInitialize" role="function">
+<title>xmlSecPtrListInitialize ()</title>
+<indexterm zone="xmlSecPtrListInitialize"><primary sortas="xmlSecPtrListInitialize">xmlSecPtrListInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListInitialize             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
 <para>
 Initializes the list of given klass. Caller is responsible 
 for cleaning up by calling <link linkend="xmlSecPtrListFinalize"><type>xmlSecPtrListFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the list klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListFinalize">xmlSecPtrListFinalize ()</title>
-<indexterm><primary>xmlSecPtrListFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListFinalize           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<refsect2 id="xmlSecPtrListFinalize" role="function">
+<title>xmlSecPtrListFinalize ()</title>
+<indexterm zone="xmlSecPtrListFinalize"><primary sortas="xmlSecPtrListFinalize">xmlSecPtrListFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListFinalize               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
 <para>
 Cleans up the list initialized with <link linkend="xmlSecPtrListInitialize"><type>xmlSecPtrListInitialize</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListCreate">xmlSecPtrListCreate ()</title>
-<indexterm><primary>xmlSecPtrListCreate</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecPtrListCreate        (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
+<refsect2 id="xmlSecPtrListCreate" role="function">
+<title>xmlSecPtrListCreate ()</title>
+<indexterm zone="xmlSecPtrListCreate"><primary sortas="xmlSecPtrListCreate">xmlSecPtrListCreate</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecPtrListCreate                 (<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> id);</programlisting>
 <para>
 Creates new list object. Caller is responsible for freeing returned list
 by calling <link linkend="xmlSecPtrListDestroy"><type>xmlSecPtrListDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the list klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated list or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated list or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListDestroy">xmlSecPtrListDestroy ()</title>
-<indexterm><primary>xmlSecPtrListDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListDestroy            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<refsect2 id="xmlSecPtrListDestroy" role="function">
+<title>xmlSecPtrListDestroy ()</title>
+<indexterm zone="xmlSecPtrListDestroy"><primary sortas="xmlSecPtrListDestroy">xmlSecPtrListDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDestroy                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
 <para>
 Destroys <parameter>list</parameter> created with <link linkend="xmlSecPtrListCreate"><type>xmlSecPtrListCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListEmpty">xmlSecPtrListEmpty ()</title>
-<indexterm><primary>xmlSecPtrListEmpty</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListEmpty              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<refsect2 id="xmlSecPtrListEmpty" role="function">
+<title>xmlSecPtrListEmpty ()</title>
+<indexterm zone="xmlSecPtrListEmpty"><primary sortas="xmlSecPtrListEmpty">xmlSecPtrListEmpty</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListEmpty                  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
 <para>
 Remove all items from <parameter>list</parameter> (if any).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListCopy">xmlSecPtrListCopy ()</title>
-<indexterm><primary>xmlSecPtrListCopy</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecPtrListCopy               (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
-                                             <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);</programlisting>
+<refsect2 id="xmlSecPtrListCopy" role="function">
+<title>xmlSecPtrListCopy ()</title>
+<indexterm zone="xmlSecPtrListCopy"><primary sortas="xmlSecPtrListCopy">xmlSecPtrListCopy</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListCopy                   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> dst,
+                                                         <link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> src);</programlisting>
 <para>
 Copies <parameter>src</parameter> list items to <parameter>dst</parameter> list using <link linkend="duplicateItem"><type>duplicateItem</type></link> method
 of the list klass. If <link linkend="duplicateItem"><type>duplicateItem</type></link> method is NULL then 
 we jsut copy pointers to items.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate ()</title>
-<indexterm><primary>xmlSecPtrListDuplicate</primary></indexterm><programlisting><link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link> xmlSecPtrListDuplicate     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<refsect2 id="xmlSecPtrListDuplicate" role="function">
+<title>xmlSecPtrListDuplicate ()</title>
+<indexterm zone="xmlSecPtrListDuplicate"><primary sortas="xmlSecPtrListDuplicate">xmlSecPtrListDuplicate</primary></indexterm><programlisting><link linkend="xmlSecPtrListPtr">xmlSecPtrListPtr</link>    xmlSecPtrListDuplicate              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
 <para>
 Creates a new copy of <parameter>list</parameter> and all its items.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated list or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated list or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListGetSize">xmlSecPtrListGetSize ()</title>
-<indexterm><primary>xmlSecPtrListGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecPtrListGetSize            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
+<refsect2 id="xmlSecPtrListGetSize" role="function">
+<title>xmlSecPtrListGetSize ()</title>
+<indexterm zone="xmlSecPtrListGetSize"><primary sortas="xmlSecPtrListGetSize">xmlSecPtrListGetSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecPtrListGetSize                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list);</programlisting>
 <para>
 Gets list size.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of itmes in <parameter>list</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of itmes in <parameter>list</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListGetItem">xmlSecPtrListGetItem ()</title>
-<indexterm><primary>xmlSecPtrListGetItem</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>   xmlSecPtrListGetItem            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecPtrListGetItem" role="function">
+<title>xmlSecPtrListGetItem ()</title>
+<indexterm zone="xmlSecPtrListGetItem"><primary sortas="xmlSecPtrListGetItem">xmlSecPtrListGetItem</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>           xmlSecPtrListGetItem                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets item from the list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the item position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the list item at position <parameter>pos</parameter> or NULL if <parameter>pos</parameter> is greater
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the list item at position <parameter>pos</parameter> or NULL if <parameter>pos</parameter> is greater
 than the number of items in the list or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListAdd">xmlSecPtrListAdd ()</title>
-<indexterm><primary>xmlSecPtrListAdd</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecPtrListAdd                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSec">xmlSecPtr</link> item);</programlisting>
+<refsect2 id="xmlSecPtrListAdd" role="function">
+<title>xmlSecPtrListAdd ()</title>
+<indexterm zone="xmlSecPtrListAdd"><primary sortas="xmlSecPtrListAdd">xmlSecPtrListAdd</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListAdd                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSec">xmlSecPtr</link> item);</programlisting>
 <para>
 Adds <parameter>item</parameter> to the end of the <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>item</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
 <listitem><simpara>		the item.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListSet">xmlSecPtrListSet ()</title>
-<indexterm><primary>xmlSecPtrListSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecPtrListSet                (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSec">xmlSecPtr</link> item,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecPtrListSet" role="function">
+<title>xmlSecPtrListSet ()</title>
+<indexterm zone="xmlSecPtrListSet"><primary sortas="xmlSecPtrListSet">xmlSecPtrListSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListSet                    (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSec">xmlSecPtr</link> item,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Sets the value of list item at position <parameter>pos</parameter>. The old value
 is destroyed.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>item</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>item</parameter>&#160;:</term>
 <listitem><simpara>		the item.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the pos.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListRemove">xmlSecPtrListRemove ()</title>
-<indexterm><primary>xmlSecPtrListRemove</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecPtrListRemove             (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecPtrListRemove" role="function">
+<title>xmlSecPtrListRemove ()</title>
+<indexterm zone="xmlSecPtrListRemove"><primary sortas="xmlSecPtrListRemove">xmlSecPtrListRemove</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPtrListRemove                 (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Destroys list item at the position <parameter>pos</parameter> and sets it value to NULL.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump ()</title>
-<indexterm><primary>xmlSecPtrListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListDebugDump          (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecPtrListDebugDump" role="function">
+<title>xmlSecPtrListDebugDump ()</title>
+<indexterm zone="xmlSecPtrListDebugDump"><primary sortas="xmlSecPtrListDebugDump">xmlSecPtrListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDebugDump              (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump ()</title>
-<indexterm><primary>xmlSecPtrListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecPtrListDebugXmlDump       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecPtrListDebugXmlDump" role="function">
+<title>xmlSecPtrListDebugXmlDump ()</title>
+<indexterm zone="xmlSecPtrListDebugXmlDump"><primary sortas="xmlSecPtrListDebugXmlDump">xmlSecPtrListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecPtrListDebugXmlDump           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>list</parameter> to the <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListGetName">xmlSecPtrListGetName()</title>
-<indexterm><primary>xmlSecPtrListGetName</primary></indexterm><programlisting>#define     xmlSecPtrListGetName(list)</programlisting>
+<refsect2 id="xmlSecPtrListGetName" role="macro">
+<title>xmlSecPtrListGetName()</title>
+<indexterm zone="xmlSecPtrListGetName"><primary sortas="xmlSecPtrListGetName">xmlSecPtrListGetName</primary></indexterm><programlisting>#define             xmlSecPtrListGetName(list)</programlisting>
 <para>
 Macro. Returns lists's name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara> 		the ponter to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListIsValid">xmlSecPtrListIsValid()</title>
-<indexterm><primary>xmlSecPtrListIsValid</primary></indexterm><programlisting>#define     xmlSecPtrListIsValid(list)</programlisting>
+<refsect2 id="xmlSecPtrListIsValid" role="macro">
+<title>xmlSecPtrListIsValid()</title>
+<indexterm zone="xmlSecPtrListIsValid"><primary sortas="xmlSecPtrListIsValid">xmlSecPtrListIsValid</primary></indexterm><programlisting>#define             xmlSecPtrListIsValid(list)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>list</parameter> is not NULL and <parameter>list</parameter>-&gt;id is not NULL
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to list.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListCheckId">xmlSecPtrListCheckId()</title>
-<indexterm><primary>xmlSecPtrListCheckId</primary></indexterm><programlisting>#define     xmlSecPtrListCheckId(list, dataId)</programlisting>
+<refsect2 id="xmlSecPtrListCheckId" role="macro">
+<title>xmlSecPtrListCheckId()</title>
+<indexterm zone="xmlSecPtrListCheckId"><primary sortas="xmlSecPtrListCheckId">xmlSecPtrListCheckId</primary></indexterm><programlisting>#define             xmlSecPtrListCheckId(list, dataId)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>list</parameter> is valid and <parameter>list</parameter>'s id is equal to <parameter>dataId</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataId</parameter>&#160;:</term>
 <listitem><simpara> 		the list Id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</title>
-<indexterm><primary>xmlSecPtrListIdUnknown</primary></indexterm><programlisting>#define xmlSecPtrListIdUnknown 			NULL
+<refsect2 id="xmlSecPtrListIdUnknown" role="macro">
+<title>xmlSecPtrListIdUnknown</title>
+<indexterm zone="xmlSecPtrListIdUnknown"><primary sortas="xmlSecPtrListIdUnknown">xmlSecPtrListIdUnknown</primary></indexterm><programlisting>#define xmlSecPtrListIdUnknown 			NULL
 </programlisting>
 <para>
 The "unknown" id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod ()</title>
-<indexterm><primary>xmlSecPtrDuplicateItemMethod</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>   (*xmlSecPtrDuplicateItemMethod) (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
+<refsect2 id="xmlSecPtrDuplicateItemMethod" role="function">
+<title>xmlSecPtrDuplicateItemMethod ()</title>
+<indexterm zone="xmlSecPtrDuplicateItemMethod"><primary sortas="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</primary></indexterm><programlisting><link linkend="xmlSecPtr">xmlSecPtr</link>           (*xmlSecPtrDuplicateItemMethod)     (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
 <para>
 Duplicates item <parameter>ptr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ptr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ptr</parameter>&#160;:</term>
 <listitem><simpara>		the poinetr to list item.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to new item copy or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new item copy or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod ()</title>
-<indexterm><primary>xmlSecPtrDestroyItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecPtrDestroyItemMethod)   (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
+<refsect2 id="xmlSecPtrDestroyItemMethod" role="function">
+<title>xmlSecPtrDestroyItemMethod ()</title>
+<indexterm zone="xmlSecPtrDestroyItemMethod"><primary sortas="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecPtrDestroyItemMethod)       (<link linkend="xmlSec">xmlSecPtr</link> ptr);</programlisting>
 <para>
 Destroys list item <parameter>ptr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ptr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ptr</parameter>&#160;:</term>
 <listitem><simpara>		the poinetr to list item.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod ()</title>
-<indexterm><primary>xmlSecPtrDebugDumpItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecPtrDebugDumpItemMethod) (<link linkend="xmlSec">xmlSecPtr</link> ptr,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecPtrDebugDumpItemMethod" role="function">
+<title>xmlSecPtrDebugDumpItemMethod ()</title>
+<indexterm zone="xmlSecPtrDebugDumpItemMethod"><primary sortas="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecPtrDebugDumpItemMethod)     (<link linkend="xmlSec">xmlSecPtr</link> ptr,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>item</parameter> to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ptr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ptr</parameter>&#160;:</term>
 <listitem><simpara>		the poinetr to list item.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListKlass">struct xmlSecPtrListKlass</title>
-<indexterm><primary>xmlSecPtrListKlass</primary></indexterm><programlisting>struct xmlSecPtrListKlass {
-
+<refsect2 id="xmlSecPtrListKlass" role="struct">
+<title>struct xmlSecPtrListKlass</title>
+<indexterm zone="xmlSecPtrListKlass"><primary sortas="xmlSecPtrListKlass">xmlSecPtrListKlass</primary></indexterm><programlisting>struct xmlSecPtrListKlass {
     const xmlChar*			name;
     xmlSecPtrDuplicateItemMethod	duplicateItem;
     xmlSecPtrDestroyItemMethod		destroyItem;
@@ -468,64 +440,60 @@ Prints debug information about <parameter>item</parameter> to <parameter>output<
 <para>
 List klass.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara>		the list klass name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</link> <structfield>duplicateItem</structfield></term>
+<term><link linkend="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</link>&#160;<structfield>duplicateItem</structfield>;</term>
 <listitem><simpara>	the duplciate item method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</link> <structfield>destroyItem</structfield></term>
+<term><link linkend="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</link>&#160;<structfield>destroyItem</structfield>;</term>
 <listitem><simpara>	the destroy item method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link> <structfield>debugDumpItem</structfield></term>
+<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link>&#160;<structfield>debugDumpItem</structfield>;</term>
 <listitem><simpara>	the debug dump item method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link> <structfield>debugXmlDumpItem</structfield></term>
+<term><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link>&#160;<structfield>debugXmlDumpItem</structfield>;</term>
 <listitem><simpara>	the debug dump item in xml format method.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName()</title>
-<indexterm><primary>xmlSecPtrListKlassGetName</primary></indexterm><programlisting>#define     xmlSecPtrListKlassGetName(klass)</programlisting>
+<refsect2 id="xmlSecPtrListKlassGetName" role="macro">
+<title>xmlSecPtrListKlassGetName()</title>
+<indexterm zone="xmlSecPtrListKlassGetName"><primary sortas="xmlSecPtrListKlassGetName">xmlSecPtrListKlassGetName</primary></indexterm><programlisting>#define             xmlSecPtrListKlassGetName(klass)</programlisting>
 <para>
 Macro. Returns the list klass name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>klass</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
 <listitem><simpara>		the list klass.
 2
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecStringListId">xmlSecStringListId</title>
-<indexterm><primary>xmlSecStringListId</primary></indexterm><programlisting>#define     xmlSecStringListId</programlisting>
+<refsect2 id="xmlSecStringListId" role="macro">
+<title>xmlSecStringListId</title>
+<indexterm zone="xmlSecStringListId"><primary sortas="xmlSecStringListId">xmlSecStringListId</primary></indexterm><programlisting>#define             xmlSecStringListId</programlisting>
 <para>
 Strings list klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecStringListGetKlass">xmlSecStringListGetKlass ()</title>
-<indexterm><primary>xmlSecStringListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecStringListGetKlass    (void);</programlisting>
+<refsect2 id="xmlSecStringListGetKlass" role="function">
+<title>xmlSecStringListGetKlass ()</title>
+<indexterm zone="xmlSecStringListGetKlass"><primary sortas="xmlSecStringListGetKlass">xmlSecStringListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecStringListGetKlass            (void);</programlisting>
 <para>
 The strins list class.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>strings list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> strings list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/membuf.sgml b/docs/api/sgml/membuf.sgml
index 8ffc32f..99ca839 100644
--- a/docs/api/sgml/membuf.sgml
+++ b/docs/api/sgml/membuf.sgml
@@ -1,25 +1,22 @@
 <refentry id="xmlsec-membuf">
 <refmeta>
-<refentrytitle>membuf</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-membuf.top_of_page">membuf</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>membuf</refname><refpurpose>Memory buffer transform implementation.</refpurpose>
+<refname>membuf</refname>
+<refpurpose>Memory buffer transform implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-membuf.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecTransformMemBufId">xmlSecTransformMemBufId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</link>
-                                            (void);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+#define             <link linkend="xmlSecTransformMemBufId">xmlSecTransformMemBufId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</link>       (void);
+<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
 </synopsis>
 </refsynopsisdiv>
 
@@ -31,48 +28,43 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-membuf.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Memory buffer transform implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecTransformMemBufId">xmlSecTransformMemBufId</title>
-<indexterm><primary>xmlSecTransformMemBufId</primary></indexterm><programlisting>#define     xmlSecTransformMemBufId</programlisting>
+<refsect1 id="xmlsec-membuf.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecTransformMemBufId" role="macro">
+<title>xmlSecTransformMemBufId</title>
+<indexterm zone="xmlSecTransformMemBufId"><primary sortas="xmlSecTransformMemBufId">xmlSecTransformMemBufId</primary></indexterm><programlisting>#define             xmlSecTransformMemBufId</programlisting>
 <para>
 The Memory Buffer transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass ()</title>
-<indexterm><primary>xmlSecTransformMemBufGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformMemBufGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformMemBufGetKlass" role="function">
+<title>xmlSecTransformMemBufGetKlass ()</title>
+<indexterm zone="xmlSecTransformMemBufGetKlass"><primary sortas="xmlSecTransformMemBufGetKlass">xmlSecTransformMemBufGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformMemBufGetKlass       (void);</programlisting>
 <para>
 The memory buffer transorm (used to store the data that go through it).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>memory buffer transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> memory buffer transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer ()</title>
-<indexterm><primary>xmlSecTransformMemBufGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecTransformMemBufGetBuffer
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformMemBufGetBuffer" role="function">
+<title>xmlSecTransformMemBufGetBuffer ()</title>
+<indexterm zone="xmlSecTransformMemBufGetBuffer"><primary sortas="xmlSecTransformMemBufGetBuffer">xmlSecTransformMemBufGetBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecTransformMemBufGetBuffer      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 Gets the pointer to memory buffer transform buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to memory buffer transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the transform's <link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link>. 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the transform's <link linkend="xmlSecBuffer"><type>xmlSecBuffer</type></link>. 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/mscrypto/app.sgml b/docs/api/sgml/mscrypto/app.sgml
index 07eff49..206f3bf 100644
--- a/docs/api/sgml/mscrypto/app.sgml
+++ b/docs/api/sgml/mscrypto/app.sgml
@@ -1,96 +1,91 @@
 <refentry id="xmlsec-mscrypto-app">
 <refmeta>
-<refentrytitle>app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-mscrypto-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>app</refname><refpurpose>Application functions implementation for MS Crypto.</refpurpose>
+<refname>app</refname>
+<refpurpose>Application functions implementation for MS Crypto.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-mscrypto-app.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</link>           (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</link>       (void);
-const <link linkend="char">char</link>* <link linkend="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> keyStore);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> trustedStore);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> untrustedStore);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</link>       (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</link> (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</link>    (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</link>
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</link>    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</link>
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*       <link linkend="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</link>               (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</link>           (void);
+const <link linkend="char">char</link>*         <link linkend="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</link>   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</link>   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</link>            (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</link>      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</link>         (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</link>   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</link>        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</link>  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="void">void</link>*               <link linkend="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</link>
+                                                        (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -102,490 +97,467 @@ const <link linkend="char">char</link>* <link linkend="xmlSecMSCryptoAppGetCertS
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-mscrypto-app.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Application functions implementation for MS Crypto.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit ()</title>
-<indexterm><primary>xmlSecMSCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppInit           (const <link linkend="char">char</link> *config);</programlisting>
+<refsect1 id="xmlsec-mscrypto-app.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecMSCryptoAppInit" role="function">
+<title>xmlSecMSCryptoAppInit ()</title>
+<indexterm zone="xmlSecMSCryptoAppInit"><primary sortas="xmlSecMSCryptoAppInit">xmlSecMSCryptoAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppInit               (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the name of another then the default ms certificate store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown ()</title>
-<indexterm><primary>xmlSecMSCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppShutdown       (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppShutdown" role="function">
+<title>xmlSecMSCryptoAppShutdown ()</title>
+<indexterm zone="xmlSecMSCryptoAppShutdown"><primary sortas="xmlSecMSCryptoAppShutdown">xmlSecMSCryptoAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppShutdown           (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName ()</title>
-<indexterm><primary>xmlSecMSCryptoAppGetCertStoreName</primary></indexterm><programlisting>const <link linkend="char">char</link>* xmlSecMSCryptoAppGetCertStoreName
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppGetCertStoreName" role="function">
+<title>xmlSecMSCryptoAppGetCertStoreName ()</title>
+<indexterm zone="xmlSecMSCryptoAppGetCertStoreName"><primary sortas="xmlSecMSCryptoAppGetCertStoreName">xmlSecMSCryptoAppGetCertStoreName</primary></indexterm><programlisting>const <link linkend="char">char</link>*         xmlSecMSCryptoAppGetCertStoreName   (void);</programlisting>
 <para>
 Gets the MS Crypto certs store name set by <parameter>xmlSecMSCryptoAppInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the MS Crypto certs name used by xmlsec-mscrypto.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the MS Crypto certs name used by xmlsec-mscrypto.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrInit
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrInit" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrInit"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrInit">xmlSecMSCryptoAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrInit
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
 and a default MSCrypto crypto key data stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptKey">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit"><type>xmlSecMSCryptoAppDefaultKeysMngrInit</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrLoad">xmlSecMSCryptoAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created 
 with <link linkend="xmlSecMSCryptoAppDefaultKeysMngrInit"><type>xmlSecMSCryptoAppDefaultKeysMngrInit</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrSave
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrSave" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSave"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrSave">xmlSecMSCryptoAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrSave
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>   the destination filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
 <para>
 Adds private key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>hKey</parameter>&#160;:</term>
 <listitem><simpara>       the key handle.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
 <para>
 Adds public key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>hKey</parameter>&#160;:</term>
 <listitem><simpara>       the key handle.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link> hKey);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link> hKey);</programlisting>
 <para>
 Adds symmetric key <parameter>hKey</parameter> to the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>hKey</parameter>&#160;:</term>
 <listitem><simpara>       the key handle.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> keyStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);</programlisting>
 <para>
 Adds <parameter>keyStore</parameter> to the list of key stores in the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		        the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyStore</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> trustedStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);</programlisting>
 <para>
 Adds <parameter>trustedStore</parameter> to the list of trusted cert stores in the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		        the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>trustedStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>trustedStore</parameter>&#160;:</term>
 <listitem><simpara>       the pointer to certs store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</title>
-<indexterm><primary>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore" role="function">
+<title>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</title>
+<indexterm zone="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore"><primary sortas="xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
 <para>
 Adds <parameter>trustedStore</parameter> to the list of un-trusted cert stores in the keys manager <parameter>mngr</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		        the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>untrustedStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>untrustedStore</parameter>&#160;:</term>
 <listitem><simpara>     the pointer to certs store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppKeysMngrCertLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeysMngrCertLoad" role="function">
+<title>xmlSecMSCryptoAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoad"><primary sortas="xmlSecMSCryptoAppKeysMngrCertLoad">xmlSecMSCryptoAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter> (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppKeysMngrCertLoadMemory
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeysMngrCertLoadMemory"><primary sortas="xmlSecMSCryptoAppKeysMngrCertLoadMemory">xmlSecMSCryptoAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the binary certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>           size of binary certificate (data)
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecMSCryptoAppKeyLoad       (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeyLoad" role="function">
+<title>xmlSecMSCryptoAppKeyLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeyLoad"><primary sortas="xmlSecMSCryptoAppKeyLoad">xmlSecMSCryptoAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppKeyLoad            (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecMSCryptoAppKeyLoadMemory (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeyLoadMemory" role="function">
+<title>xmlSecMSCryptoAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeyLoadMemory"><primary sortas="xmlSecMSCryptoAppKeyLoadMemory">xmlSecMSCryptoAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppKeyLoadMemory      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load ()</title>
-<indexterm><primary>xmlSecMSCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecMSCryptoAppPkcs12Load    (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppPkcs12Load" role="function">
+<title>xmlSecMSCryptoAppPkcs12Load ()</title>
+<indexterm zone="xmlSecMSCryptoAppPkcs12Load"><primary sortas="xmlSecMSCryptoAppPkcs12Load">xmlSecMSCryptoAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppPkcs12Load         (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory ()</title>
-<indexterm><primary>xmlSecMSCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecMSCryptoAppPkcs12LoadMemory
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppPkcs12LoadMemory" role="function">
+<title>xmlSecMSCryptoAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecMSCryptoAppPkcs12LoadMemory"><primary sortas="xmlSecMSCryptoAppPkcs12LoadMemory">xmlSecMSCryptoAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecMSCryptoAppPkcs12LoadMemory   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 binary</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary PKCS12 key in data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>           size of binary pkcs12 data
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppKeyCertLoad    (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeyCertLoad" role="function">
+<title>xmlSecMSCryptoAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeyCertLoad"><primary sortas="xmlSecMSCryptoAppKeyCertLoad">xmlSecMSCryptoAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeyCertLoad        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory ()</title>
-<indexterm><primary>xmlSecMSCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoAppKeyCertLoadMemory
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppKeyCertLoadMemory" role="function">
+<title>xmlSecMSCryptoAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecMSCryptoAppKeyCertLoadMemory"><primary sortas="xmlSecMSCryptoAppKeyCertLoadMemory">xmlSecMSCryptoAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>data</parameter> and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>           size of certificate binary (data)
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback ()</title>
-<indexterm><primary>xmlSecMSCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*       xmlSecMSCryptoAppGetDefaultPwdCallback
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoAppGetDefaultPwdCallback" role="function">
+<title>xmlSecMSCryptoAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecMSCryptoAppGetDefaultPwdCallback"><primary sortas="xmlSecMSCryptoAppGetDefaultPwdCallback">xmlSecMSCryptoAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecMSCryptoAppGetDefaultPwdCallback
+                                                        (void);</programlisting>
 <para>
 Gets default password callback.</para>
 <para>
-
-</para></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/mscrypto/certkeys.sgml b/docs/api/sgml/mscrypto/certkeys.sgml
index 927b976..cc1e64a 100644
--- a/docs/api/sgml/mscrypto/certkeys.sgml
+++ b/docs/api/sgml/mscrypto/certkeys.sgml
@@ -1,28 +1,26 @@
 <refentry id="xmlsec-mscrypto-certkeys">
 <refmeta>
-<refentrytitle>certkeys</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-mscrypto-certkeys.top_of_page">certkeys</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>certkeys</refname><refpurpose>MS Crypto certificates helper functions.</refpurpose>
+<refname>certkeys</refname>
+<refpurpose>MS Crypto certificates helper functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-mscrypto-certkeys.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link>   <link linkend="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link>   <link linkend="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</link>        (<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> pCert);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</link>    (<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> pCert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           <link linkend="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           <link linkend="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</link>               (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert);
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</link>             (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
 </synopsis>
 </refsynopsisdiv>
 
@@ -34,96 +32,90 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-mscrypto-certkeys.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 MS Crypto certificates helper functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataGetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoKeyDataGetCert (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect1 id="xmlsec-mscrypto-certkeys.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecMSCryptoKeyDataGetCert" role="function">
+<title>xmlSecMSCryptoKeyDataGetCert ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataGetCert"><primary sortas="xmlSecMSCryptoKeyDataGetCert">xmlSecMSCryptoKeyDataGetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataGetCert        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Native MSCrypto certificate retrieval from xmlsec keydata. The 
 returned PCCERT_CONTEXT must not be released by the caller.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key data to retrieve certificate from.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>PCCERT_CONTEXT on success or NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> PCCERT_CONTEXT on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataGetKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link>   xmlSecMSCryptoKeyDataGetKey     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataGetKey" role="function">
+<title>xmlSecMSCryptoKeyDataGetKey ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataGetKey"><primary sortas="xmlSecMSCryptoKeyDataGetKey">xmlSecMSCryptoKeyDataGetKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           xmlSecMSCryptoKeyDataGetKey         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Native MSCrypto key retrieval from xmlsec keydata. The 
 returned HKEY must not be destroyed by the caller.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key data to retrieve certificate from.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>              type of key requested (public/private)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HKEY on success or NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HKEY on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataGetDecryptKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY-CAPS">HCRYPTKEY</link>   xmlSecMSCryptoKeyDataGetDecryptKey
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataGetDecryptKey" role="function">
+<title>xmlSecMSCryptoKeyDataGetDecryptKey ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataGetDecryptKey"><primary sortas="xmlSecMSCryptoKeyDataGetDecryptKey">xmlSecMSCryptoKeyDataGetDecryptKey</primary></indexterm><programlisting><link linkend="HCRYPTKEY--CAPS">HCRYPTKEY</link>           xmlSecMSCryptoKeyDataGetDecryptKey  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Native MSCrypto decrypt key retrieval from xmlsec keydata. The
 returned HKEY must not be destroyed by the caller.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 	the key data pointer
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HKEY on success or NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HKEY on success or NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup ()</title>
-<indexterm><primary>xmlSecMSCryptoCertDup</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoCertDup        (<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> pCert);</programlisting>
+<refsect2 id="xmlSecMSCryptoCertDup" role="function">
+<title>xmlSecMSCryptoCertDup ()</title>
+<indexterm zone="xmlSecMSCryptoCertDup"><primary sortas="xmlSecMSCryptoCertDup">xmlSecMSCryptoCertDup</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoCertDup               (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert);</programlisting>
 <para>
 Duplicates the <parameter>pCert</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pCert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pCert</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to cert.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created PCCERT_CONTEXT object or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created PCCERT_CONTEXT object or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt ()</title>
-<indexterm><primary>xmlSecMSCryptoCertAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecMSCryptoCertAdopt    (<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> pCert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoCertAdopt" role="function">
+<title>xmlSecMSCryptoCertAdopt ()</title>
+<indexterm zone="xmlSecMSCryptoCertAdopt"><primary sortas="xmlSecMSCryptoCertAdopt">xmlSecMSCryptoCertAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecMSCryptoCertAdopt             (<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> pCert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Creates key data value from the cert.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pCert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pCert</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to cert.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the expected key type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created xmlsec key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created xmlsec key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/mscrypto/crypto.sgml b/docs/api/sgml/mscrypto/crypto.sgml
index f0404f0..f0e8c20 100644
--- a/docs/api/sgml/mscrypto/crypto.sgml
+++ b/docs/api/sgml/mscrypto/crypto.sgml
@@ -1,87 +1,80 @@
 <refentry id="xmlsec-mscrypto-crypto">
 <refmeta>
-<refentrytitle>crypto</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-mscrypto-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>crypto</refname><refpurpose>Crypto transforms implementation for MS Crypto.</refpurpose>
+<refname>crypto</refname>
+<refpurpose>Crypto transforms implementation for MS Crypto.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-mscrypto-crypto.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoGetFunctions-mscrypto">xmlSecCryptoGetFunctions_mscrypto</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoInit">xmlSecMSCryptoInit</link>              (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</link>          (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</link>      (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</link>    (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="size-t">size_t</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</link>
-                                            (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);
-<link linkend="BYTE-CAPS">BYTE</link>*       <link linkend="xmlSecMSCryptoCertStrToName">xmlSecMSCryptoCertStrToName</link>     (<link linkend="DWORD-CAPS">DWORD</link> dwCertEncodingType,
-                                             <link linkend="LPCTSTR-CAPS">LPCTSTR</link> pszX500,
-                                             <link linkend="DWORD-CAPS">DWORD</link> dwStrType,
-                                             <link linkend="DWORD-CAPS">DWORD</link> *len);
-#define     <link linkend="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformGostR3411-94Id">xmlSecMSCryptoTransformGostR3411_94Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformGostR3411-94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</link>
-                                            (void);
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-mscrypto">xmlSecCryptoGetFunctions_mscrypto</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoInit">xmlSecMSCryptoInit</link>                  (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</link>              (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</link>        (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="size-t">size_t</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</link> (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);
+<link linkend="BYTE--CAPS">BYTE</link>*               <link linkend="xmlSecMSCryptoCertStrToName">xmlSecMSCryptoCertStrToName</link>         (<link linkend="DWORD--CAPS">DWORD</link> dwCertEncodingType,
+                                                         <link linkend="LPCTSTR--CAPS">LPCTSTR</link> pszX500,
+                                                         <link linkend="DWORD--CAPS">DWORD</link> dwStrType,
+                                                         <link linkend="DWORD--CAPS">DWORD</link> *len);
+#define             <link linkend="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</link>    (void);
+#define             <link linkend="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</link>    (void);
+#define             <link linkend="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</link> (void);
+#define             <link linkend="xmlSecMSCryptoTransformGostR3411-94Id">xmlSecMSCryptoTransformGostR3411_94Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformGostR3411-94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</link>    (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</link>    (void);
+#define             <link linkend="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</link>
+                                                        (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -93,465 +86,421 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-mscrypto-crypto.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for MS Crypto.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoGetFunctions-mscrypto">xmlSecCryptoGetFunctions_mscrypto ()</title>
-<indexterm><primary>xmlSecCryptoGetFunctions_mscrypto</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoGetFunctions_mscrypto
-                                            (void);</programlisting>
+<refsect1 id="xmlsec-mscrypto-crypto.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoGetFunctions-mscrypto" role="function">
+<title>xmlSecCryptoGetFunctions_mscrypto ()</title>
+<indexterm zone="xmlSecCryptoGetFunctions-mscrypto"><primary sortas="xmlSecCryptoGetFunctions_mscrypto">xmlSecCryptoGetFunctions_mscrypto</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_mscrypto
+                                                        (void);</programlisting>
 <para>
 Gets MSCrypto specific functions table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>xmlsec-mscrypto functions table.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> xmlsec-mscrypto functions table.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoInit">xmlSecMSCryptoInit ()</title>
-<indexterm><primary>xmlSecMSCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoInit              (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoInit" role="function">
+<title>xmlSecMSCryptoInit ()</title>
+<indexterm zone="xmlSecMSCryptoInit"><primary sortas="xmlSecMSCryptoInit">xmlSecMSCryptoInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoInit                  (void);</programlisting>
 <para>
 XMLSec library specific crypto engine initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown ()</title>
-<indexterm><primary>xmlSecMSCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoShutdown          (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoShutdown" role="function">
+<title>xmlSecMSCryptoShutdown ()</title>
+<indexterm zone="xmlSecMSCryptoShutdown"><primary sortas="xmlSecMSCryptoShutdown">xmlSecMSCryptoShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoShutdown              (void);</programlisting>
 <para>
 XMLSec library specific crypto engine shutdown.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit ()</title>
-<indexterm><primary>xmlSecMSCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeysMngrInit      (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeysMngrInit" role="function">
+<title>xmlSecMSCryptoKeysMngrInit ()</title>
+<indexterm zone="xmlSecMSCryptoKeysMngrInit"><primary sortas="xmlSecMSCryptoKeysMngrInit">xmlSecMSCryptoKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysMngrInit          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Adds MSCrypto specific key data stores in keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom ()</title>
-<indexterm><primary>xmlSecMSCryptoGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoGenerateRandom    (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="size-t">size_t</link> size);</programlisting>
+<refsect2 id="xmlSecMSCryptoGenerateRandom" role="function">
+<title>xmlSecMSCryptoGenerateRandom ()</title>
+<indexterm zone="xmlSecMSCryptoGenerateRandom"><primary sortas="xmlSecMSCryptoGenerateRandom">xmlSecMSCryptoGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoGenerateRandom        (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="size-t">size_t</link> size);</programlisting>
 <para>
 Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>
 (not implemented yet).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara>		the destination buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the numer of bytes to generate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback ()</title>
-<indexterm><primary>xmlSecMSCryptoErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecMSCryptoErrorsDefaultCallback
-                                            (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);</programlisting>
+<refsect2 id="xmlSecMSCryptoErrorsDefaultCallback" role="function">
+<title>xmlSecMSCryptoErrorsDefaultCallback ()</title>
+<indexterm zone="xmlSecMSCryptoErrorsDefaultCallback"><primary sortas="xmlSecMSCryptoErrorsDefaultCallback">xmlSecMSCryptoErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecMSCryptoErrorsDefaultCallback (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);</programlisting>
 <para>
 The default errors reporting callback function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>		the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara>		the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara>		the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara>		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara>		the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoCertStrToName">xmlSecMSCryptoCertStrToName ()</title>
-<indexterm><primary>xmlSecMSCryptoCertStrToName</primary></indexterm><programlisting><link linkend="BYTE-CAPS">BYTE</link>*       xmlSecMSCryptoCertStrToName     (<link linkend="DWORD-CAPS">DWORD</link> dwCertEncodingType,
-                                             <link linkend="LPCTSTR-CAPS">LPCTSTR</link> pszX500,
-                                             <link linkend="DWORD-CAPS">DWORD</link> dwStrType,
-                                             <link linkend="DWORD-CAPS">DWORD</link> *len);</programlisting>
+<refsect2 id="xmlSecMSCryptoCertStrToName" role="function">
+<title>xmlSecMSCryptoCertStrToName ()</title>
+<indexterm zone="xmlSecMSCryptoCertStrToName"><primary sortas="xmlSecMSCryptoCertStrToName">xmlSecMSCryptoCertStrToName</primary></indexterm><programlisting><link linkend="BYTE--CAPS">BYTE</link>*               xmlSecMSCryptoCertStrToName         (<link linkend="DWORD--CAPS">DWORD</link> dwCertEncodingType,
+                                                         <link linkend="LPCTSTR--CAPS">LPCTSTR</link> pszX500,
+                                                         <link linkend="DWORD--CAPS">DWORD</link> dwStrType,
+                                                         <link linkend="DWORD--CAPS">DWORD</link> *len);</programlisting>
 <para>
 Converts input string to name by calling <parameter>CertStrToName</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dwCertEncodingType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dwCertEncodingType</parameter>&#160;:</term>
 <listitem><simpara>		the encoding used.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pszX500</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pszX500</parameter>&#160;:</term>
 <listitem><simpara>			the string to convert.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dwStrType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dwStrType</parameter>&#160;:</term>
 <listitem><simpara>			the string type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>len</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>len</parameter>&#160;:</term>
 <listitem><simpara>			the result len.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to newly allocated string or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to newly allocated string or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataDsaId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataDsaId</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataDsaId" role="macro">
+<title>xmlSecMSCryptoKeyDataDsaId</title>
+<indexterm zone="xmlSecMSCryptoKeyDataDsaId"><primary sortas="xmlSecMSCryptoKeyDataDsaId">xmlSecMSCryptoKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataDsaId</programlisting>
 <para>
 The DSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataDsaGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataDsaGetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataDsaGetKlass"><primary sortas="xmlSecMSCryptoKeyDataDsaGetKlass">xmlSecMSCryptoKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataDsaGetKlass    (void);</programlisting>
 <para>
 The DSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to DSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformDsaSha1Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformDsaSha1Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformDsaSha1Id" role="macro">
+<title>xmlSecMSCryptoTransformDsaSha1Id</title>
+<indexterm zone="xmlSecMSCryptoTransformDsaSha1Id"><primary sortas="xmlSecMSCryptoTransformDsaSha1Id">xmlSecMSCryptoTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformDsaSha1Id</programlisting>
 <para>
 The DSA SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformDsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformDsaSha1GetKlass" role="function">
+<title>xmlSecMSCryptoTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformDsaSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformDsaSha1GetKlass">xmlSecMSCryptoTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformDsaSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The DSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataGost2001Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataGost2001Id</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataGost2001Id" role="macro">
+<title>xmlSecMSCryptoKeyDataGost2001Id</title>
+<indexterm zone="xmlSecMSCryptoKeyDataGost2001Id"><primary sortas="xmlSecMSCryptoKeyDataGost2001Id">xmlSecMSCryptoKeyDataGost2001Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataGost2001Id</programlisting>
 <para>
 The GOST2001 key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataGost2001GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataGost2001GetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataGost2001GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataGost2001GetKlass"><primary sortas="xmlSecMSCryptoKeyDataGost2001GetKlass">xmlSecMSCryptoKeyDataGost2001GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataGost2001GetKlass
+                                                        (void);</programlisting>
 <para>
 The GOST2001 key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to GOST2001 key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOST2001 key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformGost2001GostR3411-94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformGost2001GostR3411_94Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformGost2001GostR3411-94Id" role="macro">
+<title>xmlSecMSCryptoTransformGost2001GostR3411_94Id</title>
+<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94Id"><primary sortas="xmlSecMSCryptoTransformGost2001GostR3411_94Id">xmlSecMSCryptoTransformGost2001GostR3411_94Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformGost2001GostR3411_94Id</programlisting>
 <para>
 The GOST2001 GOSTR3411_94 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass" role="function">
+<title>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformGost2001GostR3411-94GetKlass"><primary sortas="xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
+                                                        (void);</programlisting>
 <para>
 The GOST2001-GOSTR3411_94 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>GOST2001-GOSTR3411_94 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> GOST2001-GOSTR3411_94 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataRsaId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataRsaId</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataRsaId" role="macro">
+<title>xmlSecMSCryptoKeyDataRsaId</title>
+<indexterm zone="xmlSecMSCryptoKeyDataRsaId"><primary sortas="xmlSecMSCryptoKeyDataRsaId">xmlSecMSCryptoKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataRsaId</programlisting>
 <para>
 The RSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataRsaGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataRsaGetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataRsaGetKlass"><primary sortas="xmlSecMSCryptoKeyDataRsaGetKlass">xmlSecMSCryptoKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataRsaGetKlass    (void);</programlisting>
 <para>
 The MSCrypto RSA CertKey data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to MSCrypto RSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MSCrypto RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformRsaSha1Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformRsaSha1Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformRsaSha1Id" role="macro">
+<title>xmlSecMSCryptoTransformRsaSha1Id</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha1Id"><primary sortas="xmlSecMSCryptoTransformRsaSha1Id">xmlSecMSCryptoTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaSha1Id</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformRsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformRsaSha1GetKlass" role="function">
+<title>xmlSecMSCryptoTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaSha1GetKlass">xmlSecMSCryptoTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformRsaPkcs1Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformRsaPkcs1Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformRsaPkcs1Id" role="macro">
+<title>xmlSecMSCryptoTransformRsaPkcs1Id</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1Id"><primary sortas="xmlSecMSCryptoTransformRsaPkcs1Id">xmlSecMSCryptoTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformRsaPkcs1Id</programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformRsaPkcs1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformRsaPkcs1GetKlass" role="function">
+<title>xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformRsaPkcs1GetKlass"><primary sortas="xmlSecMSCryptoTransformRsaPkcs1GetKlass">xmlSecMSCryptoTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-PKCS1 key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-PKCS1 key transport transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformSha1Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformSha1Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformSha1Id" role="macro">
+<title>xmlSecMSCryptoTransformSha1Id</title>
+<indexterm zone="xmlSecMSCryptoTransformSha1Id"><primary sortas="xmlSecMSCryptoTransformSha1Id">xmlSecMSCryptoTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformSha1Id</programlisting>
 <para>
 The SHA1 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformSha1GetKlass" role="function">
+<title>xmlSecMSCryptoTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformSha1GetKlass"><primary sortas="xmlSecMSCryptoTransformSha1GetKlass">xmlSecMSCryptoTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformSha1GetKlass (void);</programlisting>
 <para>
 SHA-1 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-1 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformGostR3411-94Id">xmlSecMSCryptoTransformGostR3411_94Id</title>
-<indexterm><primary>xmlSecMSCryptoTransformGostR3411_94Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformGostR3411_94Id</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformGostR3411-94Id" role="macro">
+<title>xmlSecMSCryptoTransformGostR3411_94Id</title>
+<indexterm zone="xmlSecMSCryptoTransformGostR3411-94Id"><primary sortas="xmlSecMSCryptoTransformGostR3411_94Id">xmlSecMSCryptoTransformGostR3411_94Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformGostR3411_94Id</programlisting>
 <para>
 The GOSTR3411_94 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformGostR3411-94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformGostR3411_94GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformGostR3411-94GetKlass" role="function">
+<title>xmlSecMSCryptoTransformGostR3411_94GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformGostR3411-94GetKlass"><primary sortas="xmlSecMSCryptoTransformGostR3411_94GetKlass">xmlSecMSCryptoTransformGostR3411_94GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformGostR3411_94GetKlass
+                                                        (void);</programlisting>
 <para>
 GOSTR3411_94 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to GOSTR3411_94 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to GOSTR3411_94 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataAesId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataAesId</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataAesId" role="macro">
+<title>xmlSecMSCryptoKeyDataAesId</title>
+<indexterm zone="xmlSecMSCryptoKeyDataAesId"><primary sortas="xmlSecMSCryptoKeyDataAesId">xmlSecMSCryptoKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataAesId</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataAesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataAesGetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataAesGetKlass"><primary sortas="xmlSecMSCryptoKeyDataAesGetKlass">xmlSecMSCryptoKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataAesGetKlass    (void);</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeyDataAesSet     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataAesSet" role="function">
+<title>xmlSecMSCryptoKeyDataAesSet ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataAesSet"><primary sortas="xmlSecMSCryptoKeyDataAesSet">xmlSecMSCryptoKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataAesSet         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of AES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to AES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes128CbcId</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformAes128CbcId</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes128CbcId" role="macro">
+<title>xmlSecMSCryptoTransformAes128CbcId</title>
+<indexterm zone="xmlSecMSCryptoTransformAes128CbcId"><primary sortas="xmlSecMSCryptoTransformAes128CbcId">xmlSecMSCryptoTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes128CbcId</programlisting>
 <para>
 The AES128 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformAes128CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes128CbcGetKlass" role="function">
+<title>xmlSecMSCryptoTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformAes128CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes128CbcGetKlass">xmlSecMSCryptoTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes128CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 128 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 128 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes192CbcId</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformAes192CbcId</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes192CbcId" role="macro">
+<title>xmlSecMSCryptoTransformAes192CbcId</title>
+<indexterm zone="xmlSecMSCryptoTransformAes192CbcId"><primary sortas="xmlSecMSCryptoTransformAes192CbcId">xmlSecMSCryptoTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes192CbcId</programlisting>
 <para>
 The AES192 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformAes192CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes192CbcGetKlass" role="function">
+<title>xmlSecMSCryptoTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformAes192CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes192CbcGetKlass">xmlSecMSCryptoTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes192CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 192 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 192 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes256CbcId</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformAes256CbcId</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes256CbcId" role="macro">
+<title>xmlSecMSCryptoTransformAes256CbcId</title>
+<indexterm zone="xmlSecMSCryptoTransformAes256CbcId"><primary sortas="xmlSecMSCryptoTransformAes256CbcId">xmlSecMSCryptoTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformAes256CbcId</programlisting>
 <para>
 The AES256 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformAes256CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformAes256CbcGetKlass" role="function">
+<title>xmlSecMSCryptoTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformAes256CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformAes256CbcGetKlass">xmlSecMSCryptoTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformAes256CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 256 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 256 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataDesId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataDesId</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataDesId" role="macro">
+<title>xmlSecMSCryptoKeyDataDesId</title>
+<indexterm zone="xmlSecMSCryptoKeyDataDesId"><primary sortas="xmlSecMSCryptoKeyDataDesId">xmlSecMSCryptoKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataDesId</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataDesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataDesGetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataDesGetKlass"><primary sortas="xmlSecMSCryptoKeyDataDesGetKlass">xmlSecMSCryptoKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataDesGetKlass    (void);</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</title>
-<indexterm><primary>xmlSecMSCryptoTransformDes3CbcId</primary></indexterm><programlisting>#define     xmlSecMSCryptoTransformDes3CbcId</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformDes3CbcId" role="macro">
+<title>xmlSecMSCryptoTransformDes3CbcId</title>
+<indexterm zone="xmlSecMSCryptoTransformDes3CbcId"><primary sortas="xmlSecMSCryptoTransformDes3CbcId">xmlSecMSCryptoTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecMSCryptoTransformDes3CbcId</programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecMSCryptoTransformDes3CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoTransformDes3CbcGetKlass" role="function">
+<title>xmlSecMSCryptoTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoTransformDes3CbcGetKlass"><primary sortas="xmlSecMSCryptoTransformDes3CbcGetKlass">xmlSecMSCryptoTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecMSCryptoTransformDes3CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 Triple DES CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Triple DES encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/mscrypto/keysstore.sgml b/docs/api/sgml/mscrypto/keysstore.sgml
index b4fd7a0..d559148 100644
--- a/docs/api/sgml/mscrypto/keysstore.sgml
+++ b/docs/api/sgml/mscrypto/keysstore.sgml
@@ -1,31 +1,29 @@
 <refentry id="xmlsec-mscrypto-keysstore">
 <refmeta>
-<refentrytitle>keysstore</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-mscrypto-keysstore.top_of_page">keysstore</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keysstore</refname><refpurpose>Keys store implementation for MS Crypto.</refpurpose>
+<refname>keysstore</refname>
+<refpurpose>Keys store implementation for MS Crypto.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-mscrypto-keysstore.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> <link linkend="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</link> (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</link>     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</link>     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+#define             <link linkend="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</link>
+<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</link>     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</link>         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</link>         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
 </synopsis>
 </refsynopsisdiv>
 
@@ -37,96 +35,90 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-mscrypto-keysstore.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Keys store implementation for MS Crypto.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</title>
-<indexterm><primary>xmlSecMSCryptoKeysStoreId</primary></indexterm><programlisting>#define xmlSecMSCryptoKeysStoreId	xmlSecMSCryptoKeysStoreGetKlass()
+<refsect1 id="xmlsec-mscrypto-keysstore.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecMSCryptoKeysStoreId" role="macro">
+<title>xmlSecMSCryptoKeysStoreId</title>
+<indexterm zone="xmlSecMSCryptoKeysStoreId"><primary sortas="xmlSecMSCryptoKeysStoreId">xmlSecMSCryptoKeysStoreId</primary></indexterm><programlisting>#define xmlSecMSCryptoKeysStoreId	xmlSecMSCryptoKeysStoreGetKlass()
 </programlisting>
 <para>
 A MSCrypto keys store klass id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> xmlSecMSCryptoKeysStoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeysStoreGetKlass" role="function">
+<title>xmlSecMSCryptoKeysStoreGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeysStoreGetKlass"><primary sortas="xmlSecMSCryptoKeysStoreGetKlass">xmlSecMSCryptoKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecMSCryptoKeysStoreGetKlass     (void);</programlisting>
 <para>
 The MSCrypto list based keys store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>MSCrypto list based keys store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> MSCrypto list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey ()</title>
-<indexterm><primary>xmlSecMSCryptoKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeysStoreAdoptKey (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeysStoreAdoptKey" role="function">
+<title>xmlSecMSCryptoKeysStoreAdoptKey ()</title>
+<indexterm zone="xmlSecMSCryptoKeysStoreAdoptKey"><primary sortas="xmlSecMSCryptoKeysStoreAdoptKey">xmlSecMSCryptoKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreAdoptKey     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad ()</title>
-<indexterm><primary>xmlSecMSCryptoKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeysStoreLoad     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeysStoreLoad" role="function">
+<title>xmlSecMSCryptoKeysStoreLoad ()</title>
+<indexterm zone="xmlSecMSCryptoKeysStoreLoad"><primary sortas="xmlSecMSCryptoKeysStoreLoad">xmlSecMSCryptoKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreLoad         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Reads keys from an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to associated keys manager. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave ()</title>
-<indexterm><primary>xmlSecMSCryptoKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeysStoreSave     (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeysStoreSave" role="function">
+<title>xmlSecMSCryptoKeysStoreSave ()</title>
+<indexterm zone="xmlSecMSCryptoKeysStoreSave"><primary sortas="xmlSecMSCryptoKeysStoreSave">xmlSecMSCryptoKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeysStoreSave         (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Writes keys from <parameter>store</parameter> to an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCrypto keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/mscrypto/x509.sgml b/docs/api/sgml/mscrypto/x509.sgml
index c6099d1..b76bef2 100644
--- a/docs/api/sgml/mscrypto/x509.sgml
+++ b/docs/api/sgml/mscrypto/x509.sgml
@@ -1,77 +1,66 @@
 <refentry id="xmlsec-mscrypto-x509">
 <refmeta>
-<refentrytitle>x509</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-mscrypto-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-MSCRYPTO Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>x509</refname><refpurpose>X509 certificates support implementation for MS Crypto.</refpurpose>
+<refname>x509</refname>
+<refpurpose>X509 certificates support implementation for MS Crypto.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-mscrypto-x509.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</link>
-                                            (void);
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert);
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCRL-CONTEXT-CAPS">PCCRL_CONTEXT</link> crl);
-<link linkend="PCCRL-CONTEXT-CAPS">PCCRL_CONTEXT</link> <link linkend="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-#define     <link linkend="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> <link linkend="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</link>
-                                            (void);
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoX509StoreFindCert">xmlSecMSCryptoX509StoreFindCert</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> <link linkend="xmlSecMSCryptoX509StoreVerify">xmlSecMSCryptoX509StoreVerify</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> certs,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> keyStore);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> trustedStore);
-<link linkend="int">int</link>         <link linkend="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> untrustedStore);
-<link linkend="void">void</link>        <link linkend="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="int">int</link> val);
+#define             <link linkend="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</link>   (void);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link> crl);
+<link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link>       <link linkend="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+#define             <link linkend="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</link>
+<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</link>   (void);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoX509StoreFindCert">xmlSecMSCryptoX509StoreFindCert</link>     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      <link linkend="xmlSecMSCryptoX509StoreVerify">xmlSecMSCryptoX509StoreVerify</link>       (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> certs,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</link>    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</link>
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</link>
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);
+<link linkend="int">int</link>                 <link linkend="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</link>
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);
+<link linkend="void">void</link>                <link linkend="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</link>
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="int">int</link> val);
 </synopsis>
 </refsynopsisdiv>
 
@@ -83,371 +72,340 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-mscrypto-x509.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for MS Crypto.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509Id</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataX509Id</programlisting>
+<refsect1 id="xmlsec-mscrypto-x509.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecMSCryptoKeyDataX509Id" role="macro">
+<title>xmlSecMSCryptoKeyDataX509Id</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509Id"><primary sortas="xmlSecMSCryptoKeyDataX509Id">xmlSecMSCryptoKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataX509Id</programlisting>
 <para>
 The MSCrypto X509 data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataX509GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetKlass"><primary sortas="xmlSecMSCryptoKeyDataX509GetKlass">xmlSecMSCryptoKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataX509GetKlass   (void);</programlisting>
 <para>
 The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the X509 data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoKeyDataX509GetKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetKeyCert" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetKeyCert ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetKeyCert"><primary sortas="xmlSecMSCryptoKeyDataX509GetKeyCert">xmlSecMSCryptoKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataX509GetKeyCert (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the certificate from which the key was extracted.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the key's certificate or NULL if key data was not used for key
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeyDataX509AdoptKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509AdoptKeyCert" role="function">
+<title>xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptKeyCert"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptKeyCert">xmlSecMSCryptoKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
 <para>
 Sets the key's certificate in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCRYPTO X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeyDataX509AdoptCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509AdoptCert" role="function">
+<title>xmlSecMSCryptoKeyDataX509AdoptCert ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCert"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptCert">xmlSecMSCryptoKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert);</programlisting>
 <para>
 Adds certificate to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCRYPTO X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoKeyDataX509GetCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetCert" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetCert ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCert"><primary sortas="xmlSecMSCryptoKeyDataX509GetCert">xmlSecMSCryptoKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoKeyDataX509GetCert    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a certificate from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
 number of certificates in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecMSCryptoKeyDataX509GetCertsSize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetCertsSize" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetCertsSize ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCertsSize"><primary sortas="xmlSecMSCryptoKeyDataX509GetCertsSize">xmlSecMSCryptoKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecMSCryptoKeyDataX509GetCertsSize
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of certificates in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of certificates in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoKeyDataX509AdoptCrl
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="PCCRL-CONTEXT-CAPS">PCCRL_CONTEXT</link> crl);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509AdoptCrl" role="function">
+<title>xmlSecMSCryptoKeyDataX509AdoptCrl ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509AdoptCrl"><primary sortas="xmlSecMSCryptoKeyDataX509AdoptCrl">xmlSecMSCryptoKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link> crl);</programlisting>
 <para>
 Adds CRL to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>crl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to MSCrypto X509 CRL.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="PCCRL-CONTEXT-CAPS">PCCRL_CONTEXT</link> xmlSecMSCryptoKeyDataX509GetCrl
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetCrl" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetCrl ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrl"><primary sortas="xmlSecMSCryptoKeyDataX509GetCrl">xmlSecMSCryptoKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="PCCRL-CONTEXT--CAPS">PCCRL_CONTEXT</link>       xmlSecMSCryptoKeyDataX509GetCrl     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a CRL from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>                the desired CRL position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
 number of CRLs in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecMSCryptoKeyDataX509GetCrlsSize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataX509GetCrlsSize" role="function">
+<title>xmlSecMSCryptoKeyDataX509GetCrlsSize ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataX509GetCrlsSize"><primary sortas="xmlSecMSCryptoKeyDataX509GetCrlsSize">xmlSecMSCryptoKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecMSCryptoKeyDataX509GetCrlsSize
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of CRLs in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of CRLs in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataRawX509CertId</primary></indexterm><programlisting>#define     xmlSecMSCryptoKeyDataRawX509CertId</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataRawX509CertId" role="macro">
+<title>xmlSecMSCryptoKeyDataRawX509CertId</title>
+<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertId"><primary sortas="xmlSecMSCryptoKeyDataRawX509CertId">xmlSecMSCryptoKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecMSCryptoKeyDataRawX509CertId</programlisting>
 <para>
 The MSCrypto raw X509 certificate klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecMSCryptoKeyDataRawX509CertGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoKeyDataRawX509CertGetKlass" role="function">
+<title>xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoKeyDataRawX509CertGetKlass"><primary sortas="xmlSecMSCryptoKeyDataRawX509CertGetKlass">xmlSecMSCryptoKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
+                                                        (void);</programlisting>
 <para>
 The raw X509 certificates key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>raw X509 certificates key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreId</primary></indexterm><programlisting>#define     xmlSecMSCryptoX509StoreId</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreId" role="macro">
+<title>xmlSecMSCryptoX509StoreId</title>
+<indexterm zone="xmlSecMSCryptoX509StoreId"><primary sortas="xmlSecMSCryptoX509StoreId">xmlSecMSCryptoX509StoreId</primary></indexterm><programlisting>#define             xmlSecMSCryptoX509StoreId</programlisting>
 <para>
 The MSCrypto X509 store klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> xmlSecMSCryptoX509StoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreGetKlass" role="function">
+<title>xmlSecMSCryptoX509StoreGetKlass ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreGetKlass"><primary sortas="xmlSecMSCryptoX509StoreGetKlass">xmlSecMSCryptoX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecMSCryptoX509StoreGetKlass   (void);</programlisting>
 <para>
 The MSCrypto X509 certificates key data store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to MSCrypto X509 certificates key data store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MSCrypto X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreFindCert">xmlSecMSCryptoX509StoreFindCert ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreFindCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoX509StoreFindCert
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreFindCert" role="function">
+<title>xmlSecMSCryptoX509StoreFindCert ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreFindCert"><primary sortas="xmlSecMSCryptoX509StoreFindCert">xmlSecMSCryptoX509StoreFindCert</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoX509StoreFindCert     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Searches <parameter>store</parameter> for a certificate that matches given criteria.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subjectName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subjectName</parameter>&#160;:</term>
 <listitem><simpara>    the desired certificate name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
 <listitem><simpara>     the desired certificate issuer name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerSerial</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerSerial</parameter>&#160;:</term>
 <listitem><simpara>   the desired certificate issuer serial number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ski</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ski</parameter>&#160;:</term>
 <listitem><simpara>            the desired certificate SKI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>     the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to found certificate or NULL if certificate is not found
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to found certificate or NULL if certificate is not found
 or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreVerify">xmlSecMSCryptoX509StoreVerify ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreVerify</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> xmlSecMSCryptoX509StoreVerify
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> certs,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreVerify" role="function">
+<title>xmlSecMSCryptoX509StoreVerify ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreVerify"><primary sortas="xmlSecMSCryptoX509StoreVerify">xmlSecMSCryptoX509StoreVerify</primary></indexterm><programlisting><link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link>      xmlSecMSCryptoX509StoreVerify       (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> certs,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Verifies <parameter>certs</parameter> list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>        the pointer to X509 certificate context store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>certs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>certs</parameter>&#160;:</term>
 <listitem><simpara>        the untrusted certificates stack.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>        the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the first verified certificate from <parameter>certs</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the first verified certificate from <parameter>certs</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoX509StoreAdoptCert
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="PCCERT-CONTEXT-CAPS">PCCERT_CONTEXT</link> cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreAdoptCert" role="function">
+<title>xmlSecMSCryptoX509StoreAdoptCert ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptCert"><primary sortas="xmlSecMSCryptoX509StoreAdoptCert">xmlSecMSCryptoX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptCert    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="PCCERT-CONTEXT--CAPS">PCCERT_CONTEXT</link> cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Adds trusted (root) or untrusted certificate to the store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to PCCERT_CONTEXT X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>               the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoX509StoreAdoptKeyStore
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> keyStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreAdoptKeyStore" role="function">
+<title>xmlSecMSCryptoX509StoreAdoptKeyStore ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptKeyStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptKeyStore">xmlSecMSCryptoX509StoreAdoptKeyStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptKeyStore
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> keyStore);</programlisting>
 <para>
 Adds <parameter>keyStore</parameter> to the list of key stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyStore</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoX509StoreAdoptTrustedStore
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> trustedStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreAdoptTrustedStore" role="function">
+<title>xmlSecMSCryptoX509StoreAdoptTrustedStore ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptTrustedStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptTrustedStore">xmlSecMSCryptoX509StoreAdoptTrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> trustedStore);</programlisting>
 <para>
 Adds <parameter>trustedStore</parameter> to the list of trusted certs stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>trustedStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>trustedStore</parameter>&#160;:</term>
 <listitem><simpara>       the pointer to certs store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecMSCryptoX509StoreAdoptUntrustedStore
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="HCERTSTORE-CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreAdoptUntrustedStore" role="function">
+<title>xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreAdoptUntrustedStore"><primary sortas="xmlSecMSCryptoX509StoreAdoptUntrustedStore">xmlSecMSCryptoX509StoreAdoptUntrustedStore</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="HCERTSTORE--CAPS">HCERTSTORE</link> untrustedStore);</programlisting>
 <para>
 Adds <parameter>trustedStore</parameter> to the list of un-trusted certs stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>untrustedStore</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>untrustedStore</parameter>&#160;:</term>
 <listitem><simpara>     the pointer to certs store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</title>
-<indexterm><primary>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="int">int</link> val);</programlisting>
+<refsect2 id="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts" role="function">
+<title>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</title>
+<indexterm zone="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts"><primary sortas="xmlSecMSCryptoX509StoreEnableSystemTrustedCerts">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
+                                                        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="int">int</link> val);</programlisting>
 <para>
 Enables/disables the system trusted certs.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>val</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>val</parameter>&#160;:</term>
 <listitem><simpara>                the enable/disable flag
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom
index 06af2e3..33e4387 100644
--- a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom
+++ b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.bottom
@@ -1,5 +1,5 @@
-    &xmlsec-mscrypto-app;
-    &xmlsec-mscrypto-certkeys;
-    &xmlsec-mscrypto-crypto;
     &xmlsec-mscrypto-keysstore;
     &xmlsec-mscrypto-x509;
+    &xmlsec-mscrypto-app;
+    &xmlsec-mscrypto-crypto;
+    &xmlsec-mscrypto-certkeys;
diff --git a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top
index 868c083..576760c 100644
--- a/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top
+++ b/docs/api/sgml/mscrypto/xmlsec-mscrypto-doc.top
@@ -1,5 +1,5 @@
-<!ENTITY xmlsec-mscrypto-app SYSTEM "sgml/app.sgml">
-<!ENTITY xmlsec-mscrypto-certkeys SYSTEM "sgml/certkeys.sgml">
-<!ENTITY xmlsec-mscrypto-crypto SYSTEM "sgml/crypto.sgml">
 <!ENTITY xmlsec-mscrypto-keysstore SYSTEM "sgml/keysstore.sgml">
 <!ENTITY xmlsec-mscrypto-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-mscrypto-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-mscrypto-crypto SYSTEM "sgml/crypto.sgml">
+<!ENTITY xmlsec-mscrypto-certkeys SYSTEM "sgml/certkeys.sgml">
diff --git a/docs/api/sgml/nodeset.sgml b/docs/api/sgml/nodeset.sgml
index bb73f15..d36c9a3 100644
--- a/docs/api/sgml/nodeset.sgml
+++ b/docs/api/sgml/nodeset.sgml
@@ -1,52 +1,51 @@
 <refentry id="xmlsec-nodeset">
 <refmeta>
-<refentrytitle>nodeset</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nodeset.top_of_page">nodeset</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>nodeset</refname><refpurpose>Nodeset object implementation.</refpurpose>
+<refname>nodeset</refname>
+<refpurpose>Nodeset object implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nodeset.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-enum        <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>;
-enum        <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link>;
-struct      <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
-<link linkend="int">int</link>         (<link linkend="xmlSecNodeSetWalkCallback">*xmlSecNodeSetWalkCallback</link>)    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="void">void</link> *data);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link>        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);
-<link linkend="void">void</link>        <link linkend="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</link>            (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
-<link linkend="void">void</link>        <link linkend="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</link>         (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
-<link linkend="int">int</link>         <link linkend="xmlSecNodeSetContains">xmlSecNodeSetContains</link>           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> parent);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link>           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                             <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link>       (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                             <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
-<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> <link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link>   (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="int">int</link> withComments,
-                                             <link linkend="int">int</link> invert);
-<link linkend="int">int</link>         <link linkend="xmlSecNodeSetWalk">xmlSecNodeSetWalk</link>               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
-                                             <link linkend="void">void</link> *data);
-<link linkend="int">int</link>         <link linkend="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</link>      (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);
-<link linkend="void">void</link>        <link linkend="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</link>          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
+enum                <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>;
+enum                <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link>;
+struct              <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
+<link linkend="int">int</link>                 (<link linkend="xmlSecNodeSetWalkCallback">*xmlSecNodeSetWalkCallback</link>)        (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="void">void</link> *data);
+<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetCreate">xmlSecNodeSetCreate</link>                 (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);
+<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</link>                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
+<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</link>             (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);
+<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetContains">xmlSecNodeSetContains</link>               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> parent);
+<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetAdd">xmlSecNodeSetAdd</link>                    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
+                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
+<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetAddList">xmlSecNodeSetAddList</link>                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
+                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);
+<link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    <link linkend="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</link>            (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="int">int</link> withComments,
+                                                         <link linkend="int">int</link> invert);
+<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetWalk">xmlSecNodeSetWalk</link>                   (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
+                                                         <link linkend="void">void</link> *data);
+<link linkend="int">int</link>                 <link linkend="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</link>          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);
+<link linkend="void">void</link>                <link linkend="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</link>              (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
 </synopsis>
 </refsynopsisdiv>
 
@@ -58,18 +57,18 @@ struct      <link linkend="xmlSecNodeSet">xmlSecNodeSet</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nodeset.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Nodeset object implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNodeSetType">enum xmlSecNodeSetType</title>
-<indexterm><primary>xmlSecNodeSetType</primary></indexterm><programlisting>typedef enum {
+<refsect1 id="xmlsec-nodeset.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNodeSetType" role="enum">
+<title>enum xmlSecNodeSetType</title>
+<indexterm zone="xmlSecNodeSetType"><primary sortas="xmlSecNodeSetType">xmlSecNodeSetType</primary></indexterm><programlisting>typedef enum {
     xmlSecNodeSetNormal = 0,
     xmlSecNodeSetInvert,
     xmlSecNodeSetTree,
@@ -82,51 +81,50 @@ Nodeset object implementation.
 <para>
 The basic nodes sets types.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecNodeSetNormal" role="constant">
 <term><literal>xmlSecNodeSetNormal</literal></term>
 <listitem><simpara> 	nodes set = nodes in the list.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetInvert" role="constant">
 <term><literal>xmlSecNodeSetInvert</literal></term>
 <listitem><simpara>  	nodes set = all document nodes minus nodes in the list.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetTree" role="constant">
 <term><literal>xmlSecNodeSetTree</literal></term>
 <listitem><simpara> 		nodes set = nodes in the list and all their subtress.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetTreeWithoutComments" role="constant">
 <term><literal>xmlSecNodeSetTreeWithoutComments</literal></term>
 <listitem><simpara> 		nodes set = nodes in the list and 
 			all their subtress but no comment nodes.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetTreeInvert" role="constant">
 <term><literal>xmlSecNodeSetTreeInvert</literal></term>
 <listitem><simpara> 	nodes set = all document nodes minus nodes in the 
 				list and all their subtress.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetTreeWithoutCommentsInvert" role="constant">
 <term><literal>xmlSecNodeSetTreeWithoutCommentsInvert</literal></term>
 <listitem><simpara> 	nodes set = all document nodes 
 				minus (nodes in the list and all their subtress 
 			plus all comment nodes).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetList" role="constant">
 <term><literal>xmlSecNodeSetList</literal></term>
 <listitem><simpara> 		nodes set = all nodes in the chidren list of nodes sets.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetOp">enum xmlSecNodeSetOp</title>
-<indexterm><primary>xmlSecNodeSetOp</primary></indexterm><programlisting>typedef enum {
+<refsect2 id="xmlSecNodeSetOp" role="enum">
+<title>enum xmlSecNodeSetOp</title>
+<indexterm zone="xmlSecNodeSetOp"><primary sortas="xmlSecNodeSetOp">xmlSecNodeSetOp</primary></indexterm><programlisting>typedef enum {
     xmlSecNodeSetIntersection = 0,
     xmlSecNodeSetSubtraction,
     xmlSecNodeSetUnion
@@ -135,28 +133,26 @@ The basic nodes sets types.</para>
 <para>
 The simple nodes sets operations.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecNodeSetIntersection" role="constant">
 <term><literal>xmlSecNodeSetIntersection</literal></term>
 <listitem><simpara> 	intersection.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetSubtraction" role="constant">
 <term><literal>xmlSecNodeSetSubtraction</literal></term>
 <listitem><simpara> 	subtraction.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecNodeSetUnion" role="constant">
 <term><literal>xmlSecNodeSetUnion</literal></term>
 <listitem><simpara> 	union.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSet">struct xmlSecNodeSet</title>
-<indexterm><primary>xmlSecNodeSet</primary></indexterm><programlisting>struct xmlSecNodeSet {
-
+<refsect2 id="xmlSecNodeSet" role="struct">
+<title>struct xmlSecNodeSet</title>
+<indexterm zone="xmlSecNodeSet"><primary sortas="xmlSecNodeSet">xmlSecNodeSet</primary></indexterm><programlisting>struct xmlSecNodeSet {
     xmlNodeSetPtr	nodes;
     xmlDocPtr		doc;
     int			destroyDoc;
@@ -170,200 +166,192 @@ The simple nodes sets operations.</para>
 <para>
 The enchanced nodes set.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlNodeSet">xmlNodeSetPtr</link> <structfield>nodes</structfield></term>
+<term><link linkend="xmlNodeSet">xmlNodeSetPtr</link>&#160;<structfield>nodes</structfield>;</term>
 <listitem><simpara> 			the nodes list.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlDoc">xmlDocPtr</link> <structfield>doc</structfield></term>
+<term><link linkend="xmlDoc">xmlDocPtr</link>&#160;<structfield>doc</structfield>;</term>
 <listitem><simpara> 			the parent XML document.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>destroyDoc</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>destroyDoc</structfield>;</term>
 <listitem><simpara>			the flag: if set to 1 then <parameter>doc</parameter> will
 			be destroyed when node set is destroyed.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> <structfield>type</structfield></term>
+<term><link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link>&#160;<structfield>type</structfield>;</term>
 <listitem><simpara> 			the nodes set type.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> <structfield>op</structfield></term>
+<term><link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link>&#160;<structfield>op</structfield>;</term>
 <listitem><simpara> 			the operation type.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <structfield>next</structfield></term>
+<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>next</structfield>;</term>
 <listitem><simpara> 			the next nodes set.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <structfield>prev</structfield></term>
+<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>prev</structfield>;</term>
 <listitem><simpara> 			the previous nodes set.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <structfield>children</structfield></term>
+<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>children</structfield>;</term>
 <listitem><simpara> 			the children list (valid only if type 
 			equal to <link linkend="xmlSecNodeSetList"><type>xmlSecNodeSetList</type></link>).
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback ()</title>
-<indexterm><primary>xmlSecNodeSetWalkCallback</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecNodeSetWalkCallback)    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="void">void</link> *data);</programlisting>
+<refsect2 id="xmlSecNodeSetWalkCallback" role="function">
+<title>xmlSecNodeSetWalkCallback ()</title>
+<indexterm zone="xmlSecNodeSetWalkCallback"><primary sortas="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecNodeSetWalkCallback)        (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="void">void</link> *data);</programlisting>
 <para>
 The callback function called once per each node in the nodes set.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 			the pointer to <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> 			the pointer current XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 			the pointer to the <parameter>cur</parameter> parent node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 			the pointer to application specific data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs
 an walk procedure should be interrupted.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetCreate">xmlSecNodeSetCreate ()</title>
-<indexterm><primary>xmlSecNodeSetCreate</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> xmlSecNodeSetCreate        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);</programlisting>
+<refsect2 id="xmlSecNodeSetCreate" role="function">
+<title>xmlSecNodeSetCreate ()</title>
+<indexterm zone="xmlSecNodeSetCreate"><primary sortas="xmlSecNodeSetCreate">xmlSecNodeSetCreate</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetCreate                 (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlNodeSet">xmlNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> type);</programlisting>
 <para>
 Creates new nodes set. Caller is responsible for freeng returend object
 by calling <link linkend="xmlSecNodeSetDestroy"><type>xmlSecNodeSetDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to parent XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara> 		the list of nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the nodes set type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated node set or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated node set or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy ()</title>
-<indexterm><primary>xmlSecNodeSetDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecNodeSetDestroy            (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
+<refsect2 id="xmlSecNodeSetDestroy" role="function">
+<title>xmlSecNodeSetDestroy ()</title>
+<indexterm zone="xmlSecNodeSetDestroy"><primary sortas="xmlSecNodeSetDestroy">xmlSecNodeSetDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDestroy                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
 <para>
 Destroys the nodes set created with <link linkend="xmlSecNodeSetCreate"><type>xmlSecNodeSetCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy ()</title>
-<indexterm><primary>xmlSecNodeSetDocDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecNodeSetDocDestroy         (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
+<refsect2 id="xmlSecNodeSetDocDestroy" role="function">
+<title>xmlSecNodeSetDocDestroy ()</title>
+<indexterm zone="xmlSecNodeSetDocDestroy"><primary sortas="xmlSecNodeSetDocDestroy">xmlSecNodeSetDocDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDocDestroy             (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset);</programlisting>
 <para>
 Instructs node set to destroy nodes parent doc when node set is destroyed.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetContains">xmlSecNodeSetContains ()</title>
-<indexterm><primary>xmlSecNodeSetContains</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNodeSetContains           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> parent);</programlisting>
+<refsect2 id="xmlSecNodeSetContains" role="function">
+<title>xmlSecNodeSetContains ()</title>
+<indexterm zone="xmlSecNodeSetContains"><primary sortas="xmlSecNodeSetContains">xmlSecNodeSetContains</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetContains               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> parent);</programlisting>
 <para>
 Checks whether the <parameter>node</parameter> is in the nodes set or not.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to XML node to check.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <parameter>node</parameter> parent node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if the <parameter>node</parameter> is in the nodes set <parameter>nset</parameter>, 0 if it is not
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the <parameter>node</parameter> is in the nodes set <parameter>nset</parameter>, 0 if it is not
 and a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetAdd">xmlSecNodeSetAdd ()</title>
-<indexterm><primary>xmlSecNodeSetAdd</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> xmlSecNodeSetAdd           (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                             <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
+<refsect2 id="xmlSecNodeSetAdd" role="function">
+<title>xmlSecNodeSetAdd ()</title>
+<indexterm zone="xmlSecNodeSetAdd"><primary sortas="xmlSecNodeSetAdd">xmlSecNodeSetAdd</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetAdd                    (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
+                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
 <para>
 Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> using operation <parameter>op</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to currrent nodes set (or NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNSet</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNSet</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to new nodes set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>op</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>op</parameter>&#160;:</term>
 <listitem><simpara> 		the operation type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to combined nodes set or NULL if an error 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to combined nodes set or NULL if an error 
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetAddList">xmlSecNodeSetAddList ()</title>
-<indexterm><primary>xmlSecNodeSetAddList</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> xmlSecNodeSetAddList       (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
-                                             <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
+<refsect2 id="xmlSecNodeSetAddList" role="function">
+<title>xmlSecNodeSetAddList ()</title>
+<indexterm zone="xmlSecNodeSetAddList"><primary sortas="xmlSecNodeSetAddList">xmlSecNodeSetAddList</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetAddList                (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> newNSet,
+                                                         <link linkend="xmlSecNodeSetOp">xmlSecNodeSetOp</link> op);</programlisting>
 <para>
 Adds <parameter>newNSet</parameter> to the <parameter>nset</parameter> as child using operation <parameter>op</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to currrent nodes set (or NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNSet</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNSet</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to new nodes set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>op</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>op</parameter>&#160;:</term>
 <listitem><simpara> 		the operation type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to combined nodes set or NULL if an error 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to combined nodes set or NULL if an error 
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren ()</title>
-<indexterm><primary>xmlSecNodeSetGetChildren</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link> xmlSecNodeSetGetChildren   (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="int">int</link> withComments,
-                                             <link linkend="int">int</link> invert);</programlisting>
+<refsect2 id="xmlSecNodeSetGetChildren" role="function">
+<title>xmlSecNodeSetGetChildren ()</title>
+<indexterm zone="xmlSecNodeSetGetChildren"><primary sortas="xmlSecNodeSetGetChildren">xmlSecNodeSetGetChildren</primary></indexterm><programlisting><link linkend="xmlSecNodeSetPtr">xmlSecNodeSetPtr</link>    xmlSecNodeSetGetChildren            (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="int">int</link> withComments,
+                                                         <link linkend="int">int</link> invert);</programlisting>
 <para>
 Creates a new nodes set that contains:
  - if <parameter>withComments</parameter> is not 0 and <parameter>invert</parameter> is 0:
@@ -376,79 +364,75 @@ Creates a new nodes set that contains:
    all nodes in the <parameter>doc</parameter> except nodes in the <parameter>parent</parameter> subtree 
    and comment nodes.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara>	 	the pointer to parent XML node or NULL if we want to include all document nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>withComments</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>withComments</parameter>&#160;:</term>
 <listitem><simpara> 	the flag include  comments or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>invert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>invert</parameter>&#160;:</term>
 <listitem><simpara> 		the "invert" flag.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the newly created <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the newly created <link linkend="xmlSecNodeSet"><type>xmlSecNodeSet</type></link> structure
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetWalk">xmlSecNodeSetWalk ()</title>
-<indexterm><primary>xmlSecNodeSetWalk</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNodeSetWalk               (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
-                                             <link linkend="void">void</link> *data);</programlisting>
+<refsect2 id="xmlSecNodeSetWalk" role="function">
+<title>xmlSecNodeSetWalk ()</title>
+<indexterm zone="xmlSecNodeSetWalk"><primary sortas="xmlSecNodeSetWalk">xmlSecNodeSetWalk</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetWalk                   (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlSecNodeSetWalkCallback">xmlSecNodeSetWalkCallback</link> walkFunc,
+                                                         <link linkend="void">void</link> *data);</programlisting>
 <para>
 Calls the function <parameter>walkFunc</parameter> once per each node in the nodes set <parameter>nset</parameter>.
 If the <parameter>walkFunc</parameter> returns a negative value, then the walk procedure 
 is interrupted.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>walkFunc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>walkFunc</parameter>&#160;:</term>
 <listitem><simpara> 		the callback functions.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara> 		the application specific data passed to the <parameter>walkFunc</parameter>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes ()</title>
-<indexterm><primary>xmlSecNodeSetDumpTextNodes</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNodeSetDumpTextNodes      (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);</programlisting>
+<refsect2 id="xmlSecNodeSetDumpTextNodes" role="function">
+<title>xmlSecNodeSetDumpTextNodes ()</title>
+<indexterm zone="xmlSecNodeSetDumpTextNodes"><primary sortas="xmlSecNodeSetDumpTextNodes">xmlSecNodeSetDumpTextNodes</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeSetDumpTextNodes          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> out);</programlisting>
 <para>
 Dumps content of all the text nodes from <parameter>nset</parameter> to <parameter>out</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>out</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>out</parameter>&#160;:</term>
 <listitem><simpara>		the output buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump ()</title>
-<indexterm><primary>xmlSecNodeSetDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecNodeSetDebugDump          (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecNodeSetDebugDump" role="function">
+<title>xmlSecNodeSetDebugDump ()</title>
+<indexterm zone="xmlSecNodeSetDebugDump"><primary sortas="xmlSecNodeSetDebugDump">xmlSecNodeSetDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNodeSetDebugDump              (<link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nset,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints information about <parameter>nset</parameter> to the <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>nset</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nset</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to node set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/nss/app.sgml b/docs/api/sgml/nss/app.sgml
index 95271d8..a913ebb 100644
--- a/docs/api/sgml/nss/app.sgml
+++ b/docs/api/sgml/nss/app.sgml
@@ -1,90 +1,84 @@
 <refentry id="xmlsec-nss-app">
 <refmeta>
-<refentrytitle>app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>app</refname><refpurpose>Application functions implementation for NSS.</refpurpose>
+<refname>app</refname>
+<refpurpose>Application functions implementation for NSS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-app.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppInit">xmlSecNssAppInit</link>                (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppShutdown">xmlSecNssAppShutdown</link>            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</link>    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</link>            (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</link>      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</link>     (<link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</link>         (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</link>   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</link>  (<link linkend="SECItem">SECItem</link> *secItem,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</link>         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</link>   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</link>  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</link>
-                                            (<link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*       <link linkend="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppInit">xmlSecNssAppInit</link>                    (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppShutdown">xmlSecNssAppShutdown</link>                (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</link>     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</link>  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</link>                 (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</link>           (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</link>          (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</link>              (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</link>        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</link>       (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</link>             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</link>       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</link>  (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="void">void</link>*               <link linkend="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</link>   (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -96,487 +90,465 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-app.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Application functions implementation for NSS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNssAppInit">xmlSecNssAppInit ()</title>
-<indexterm><primary>xmlSecNssAppInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppInit                (const <link linkend="char">char</link> *config);</programlisting>
+<refsect1 id="xmlsec-nss-app.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNssAppInit" role="function">
+<title>xmlSecNssAppInit ()</title>
+<indexterm zone="xmlSecNssAppInit"><primary sortas="xmlSecNssAppInit">xmlSecNssAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppInit                    (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the path to NSS database files.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppShutdown">xmlSecNssAppShutdown ()</title>
-<indexterm><primary>xmlSecNssAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppShutdown            (void);</programlisting>
+<refsect2 id="xmlSecNssAppShutdown" role="function">
+<title>xmlSecNssAppShutdown ()</title>
+<indexterm zone="xmlSecNssAppShutdown"><primary sortas="xmlSecNssAppShutdown">xmlSecNssAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppShutdown                (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit ()</title>
-<indexterm><primary>xmlSecNssAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppDefaultKeysMngrInit (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecNssAppDefaultKeysMngrInit" role="function">
+<title>xmlSecNssAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrInit"><primary sortas="xmlSecNssAppDefaultKeysMngrInit">xmlSecNssAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrInit     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with NSS keys store <link linkend="xmlSecNssKeysStoreId"><type>xmlSecNssKeysStoreId</type></link>
 and a default NSS crypto key data stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm><primary>xmlSecNssAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppDefaultKeysMngrAdoptKey
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecNssAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecNssAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecNssAppDefaultKeysMngrAdoptKey">xmlSecNssAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecNssAppDefaultKeysMngrInit"><type>xmlSecNssAppDefaultKeysMngrInit</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad ()</title>
-<indexterm><primary>xmlSecNssAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppDefaultKeysMngrLoad (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecNssAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecNssAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrLoad"><primary sortas="xmlSecNssAppDefaultKeysMngrLoad">xmlSecNssAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrLoad     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created 
 with <link linkend="xmlSecNssAppDefaultKeysMngrInit"><type>xmlSecNssAppDefaultKeysMngrInit</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave ()</title>
-<indexterm><primary>xmlSecNssAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppDefaultKeysMngrSave (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssAppDefaultKeysMngrSave" role="function">
+<title>xmlSecNssAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecNssAppDefaultKeysMngrSave"><primary sortas="xmlSecNssAppDefaultKeysMngrSave">xmlSecNssAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppDefaultKeysMngrSave     (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the destination filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad ()</title>
-<indexterm><primary>xmlSecNssAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeysMngrCertLoad    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssAppKeysMngrCertLoad" role="function">
+<title>xmlSecNssAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoad"><primary sortas="xmlSecNssAppKeysMngrCertLoad">xmlSecNssAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoad        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter></para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format (PEM or DER).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory ()</title>
-<indexterm><primary>xmlSecNssAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeysMngrCertLoadMemory
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecNssAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoadMemory"><primary sortas="xmlSecNssAppKeysMngrCertLoadMemory">xmlSecNssAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoadMemory  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter></para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate format (PEM or DER).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem ()</title>
-<indexterm><primary>xmlSecNssAppKeysMngrCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeysMngrCertLoadSECItem
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssAppKeysMngrCertLoadSECItem" role="function">
+<title>xmlSecNssAppKeysMngrCertLoadSECItem ()</title>
+<indexterm zone="xmlSecNssAppKeysMngrCertLoadSECItem"><primary sortas="xmlSecNssAppKeysMngrCertLoadSECItem">xmlSecNssAppKeysMngrCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeysMngrCertLoadSECItem (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>secItem</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter></para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>secItem</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>secItem</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to SECItem.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate format (PEM or DER).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad ()</title>
-<indexterm><primary>xmlSecNssAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppKeyLoad            (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppKeyLoad" role="function">
+<title>xmlSecNssAppKeyLoad ()</title>
+<indexterm zone="xmlSecNssAppKeyLoad"><primary sortas="xmlSecNssAppKeyLoad">xmlSecNssAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoad                 (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from a file</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory ()</title>
-<indexterm><primary>xmlSecNssAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppKeyLoadMemory      (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppKeyLoadMemory" role="function">
+<title>xmlSecNssAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecNssAppKeyLoadMemory"><primary sortas="xmlSecNssAppKeyLoadMemory">xmlSecNssAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoadMemory           (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from a binary <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key data format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key data2 password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem ()</title>
-<indexterm><primary>xmlSecNssAppKeyLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppKeyLoadSECItem     (<link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppKeyLoadSECItem" role="function">
+<title>xmlSecNssAppKeyLoadSECItem ()</title>
+<indexterm zone="xmlSecNssAppKeyLoadSECItem"><primary sortas="xmlSecNssAppKeyLoadSECItem">xmlSecNssAppKeyLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyLoadSECItem          (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from a file</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>secItem</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>secItem</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to sec item.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load ()</title>
-<indexterm><primary>xmlSecNssAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppPkcs12Load         (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppPkcs12Load" role="function">
+<title>xmlSecNssAppPkcs12Load ()</title>
+<indexterm zone="xmlSecNssAppPkcs12Load"><primary sortas="xmlSecNssAppPkcs12Load">xmlSecNssAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12Load              (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory ()</title>
-<indexterm><primary>xmlSecNssAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppPkcs12LoadMemory   (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppPkcs12LoadMemory" role="function">
+<title>xmlSecNssAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecNssAppPkcs12LoadMemory"><primary sortas="xmlSecNssAppPkcs12LoadMemory">xmlSecNssAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12LoadMemory        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem ()</title>
-<indexterm><primary>xmlSecNssAppPkcs12LoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppPkcs12LoadSECItem  (<link linkend="SECItem">SECItem</link> *secItem,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecNssAppPkcs12LoadSECItem" role="function">
+<title>xmlSecNssAppPkcs12LoadSECItem ()</title>
+<indexterm zone="xmlSecNssAppPkcs12LoadSECItem"><primary sortas="xmlSecNssAppPkcs12LoadSECItem">xmlSecNssAppPkcs12LoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppPkcs12LoadSECItem       (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 SECItem.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>secItem</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>secItem</parameter>&#160;:</term>
 <listitem><simpara>		the <parameter>SECItem</parameter> object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad ()</title>
-<indexterm><primary>xmlSecNssAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeyCertLoad         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecNssAppKeyCertLoad" role="function">
+<title>xmlSecNssAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecNssAppKeyCertLoad"><primary sortas="xmlSecNssAppKeyCertLoad">xmlSecNssAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoad             (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory ()</title>
-<indexterm><primary>xmlSecNssAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeyCertLoadMemory   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecNssAppKeyCertLoadMemory" role="function">
+<title>xmlSecNssAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecNssAppKeyCertLoadMemory"><primary sortas="xmlSecNssAppKeyCertLoadMemory">xmlSecNssAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoadMemory       (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from <parameter>data</parameter> and adds it to key</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem ()</title>
-<indexterm><primary>xmlSecNssAppKeyCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssAppKeyCertLoadSECItem  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecNssAppKeyCertLoadSECItem" role="function">
+<title>xmlSecNssAppKeyCertLoadSECItem ()</title>
+<indexterm zone="xmlSecNssAppKeyCertLoadSECItem"><primary sortas="xmlSecNssAppKeyCertLoadSECItem">xmlSecNssAppKeyCertLoadSECItem</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssAppKeyCertLoadSECItem      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from <parameter>secItem</parameter> and adds it to key</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>secItem</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>secItem</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to SECItem.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem ()</title>
-<indexterm><primary>xmlSecNssAppKeyFromCertLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecNssAppKeyFromCertLoadSECItem
-                                            (<link linkend="SECItem">SECItem</link> *secItem,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecNssAppKeyFromCertLoadSECItem" role="function">
+<title>xmlSecNssAppKeyFromCertLoadSECItem ()</title>
+<indexterm zone="xmlSecNssAppKeyFromCertLoadSECItem"><primary sortas="xmlSecNssAppKeyFromCertLoadSECItem">xmlSecNssAppKeyFromCertLoadSECItem</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecNssAppKeyFromCertLoadSECItem  (<link linkend="SECItem">SECItem</link> *secItem,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Loads public key from cert.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>secItem</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>secItem</parameter>&#160;:</term>
 <listitem><simpara>		the <parameter>SECItem</parameter> object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the cert format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback ()</title>
-<indexterm><primary>xmlSecNssAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*       xmlSecNssAppGetDefaultPwdCallback
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssAppGetDefaultPwdCallback" role="function">
+<title>xmlSecNssAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecNssAppGetDefaultPwdCallback"><primary sortas="xmlSecNssAppGetDefaultPwdCallback">xmlSecNssAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecNssAppGetDefaultPwdCallback   (void);</programlisting>
 <para>
 Gets default password callback.</para>
 <para>
-
-</para></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/nss/bignum.sgml b/docs/api/sgml/nss/bignum.sgml
index 3543c6d..44bc75b 100644
--- a/docs/api/sgml/nss/bignum.sgml
+++ b/docs/api/sgml/nss/bignum.sgml
@@ -1,26 +1,25 @@
 <refentry id="xmlsec-nss-bignum">
 <refmeta>
-<refentrytitle>bignum</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-bignum.top_of_page">bignum</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>bignum</refname><refpurpose>Big numbers helper functions.</refpurpose>
+<refname>bignum</refname>
+<refpurpose>Big numbers helper functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-bignum.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="SECItem">SECItem</link>*    <link linkend="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</link>     (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
-                                             const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="SECItem">SECItem</link> *a);
-<link linkend="int">int</link>         <link linkend="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</link>     (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="SECItem">SECItem</link> *a,
-                                             <link linkend="int">int</link> addLineBreaks);
+<link linkend="SECItem">SECItem</link>*            <link linkend="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</link>         (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
+                                                         const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="SECItem">SECItem</link> *a);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</link>         (<link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="SECItem">SECItem</link> *a,
+                                                         <link linkend="int">int</link> addLineBreaks);
 </synopsis>
 </refsynopsisdiv>
 
@@ -32,46 +31,45 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-bignum.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Big numbers helper functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue ()</title>
-<indexterm><primary>xmlSecNssNodeGetBigNumValue</primary></indexterm><programlisting><link linkend="SECItem">SECItem</link>*    xmlSecNssNodeGetBigNumValue     (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
-                                             const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="SECItem">SECItem</link> *a);</programlisting>
+<refsect1 id="xmlsec-nss-bignum.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNssNodeGetBigNumValue" role="function">
+<title>xmlSecNssNodeGetBigNumValue ()</title>
+<indexterm zone="xmlSecNssNodeGetBigNumValue"><primary sortas="xmlSecNssNodeGetBigNumValue">xmlSecNssNodeGetBigNumValue</primary></indexterm><programlisting><link linkend="SECItem">SECItem</link>*            xmlSecNssNodeGetBigNumValue         (<link linkend="PRArenaPool">PRArenaPool</link> *arena,
+                                                         const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="SECItem">SECItem</link> *a);</programlisting>
 <para>
 Converts the node content from CryptoBinary format 
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>) 
 to a SECItem. If no SECItem object provided then a new
 one is created (caller is responsible for freeing it).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>arena</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>arena</parameter>&#160;:</term>
 <listitem><simpara> the arena from which to allocate memory
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> the poitner to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>a</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>a</parameter>&#160;:</term>
 <listitem><simpara> a SECItem object to hold the BigNum value
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to SECItem produced from CryptoBinary string
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to SECItem produced from CryptoBinary string
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue ()</title>
-<indexterm><primary>xmlSecNssNodeSetBigNumValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssNodeSetBigNumValue     (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="SECItem">SECItem</link> *a,
-                                             <link linkend="int">int</link> addLineBreaks);</programlisting>
+<refsect2 id="xmlSecNssNodeSetBigNumValue" role="function">
+<title>xmlSecNssNodeSetBigNumValue ()</title>
+<indexterm zone="xmlSecNssNodeSetBigNumValue"><primary sortas="xmlSecNssNodeSetBigNumValue">xmlSecNssNodeSetBigNumValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssNodeSetBigNumValue         (<link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="SECItem">SECItem</link> *a,
+                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
 <para>
 Converts SECItem to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>) 
@@ -79,20 +77,19 @@ and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added 
 before and after the CryptoBinary string.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>a</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>a</parameter>&#160;:</term>
 <listitem><simpara> a SECItem containing the BigNum value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>addLineBreaks</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
 <listitem><simpara> if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or -1 otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or -1 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/nss/crypto.sgml b/docs/api/sgml/nss/crypto.sgml
index d4d8032..616717a 100644
--- a/docs/api/sgml/nss/crypto.sgml
+++ b/docs/api/sgml/nss/crypto.sgml
@@ -1,105 +1,88 @@
 <refentry id="xmlsec-nss-crypto">
 <refmeta>
-<refentrytitle>crypto</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>crypto</refname><refpurpose>Crypto transforms implementation for NSS.</refpurpose>
+<refname>crypto</refname>
+<refpurpose>Crypto transforms implementation for NSS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-crypto.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoGetFunctions-nss">xmlSecCryptoGetFunctions_nss</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssInit">xmlSecNssInit</link>                   (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssShutdown">xmlSecNssShutdown</link>               (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</link>           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</link>         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="void">void</link>        <link linkend="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</link>  (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);
-<link linkend="PK11SlotInfo">PK11SlotInfo</link>* <link linkend="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</link>   (void);
-#define     <link linkend="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</link> (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</link> (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</link> (void);
-#define     <link linkend="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</link> (void);
-<link linkend="void">void</link>        <link linkend="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</link> (<link linkend="int">int</link> min_length);
-#define     <link linkend="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</link> (void);
-#define     <link linkend="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</link>
-                                            (void);
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-nss">xmlSecCryptoGetFunctions_nss</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssInit">xmlSecNssInit</link>                       (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssShutdown">xmlSecNssShutdown</link>                   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</link>               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</link>             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="void">void</link>                <link linkend="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</link>      (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);
+<link linkend="PK11SlotInfo">PK11SlotInfo</link> *      <link linkend="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</link>         (void);
+#define             <link linkend="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</link>         (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</link> (void);
+#define             <link linkend="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</link> (void);
+#define             <link linkend="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</link> (void);
+#define             <link linkend="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</link>  (void);
+#define             <link linkend="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</link>  (void);
+#define             <link linkend="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</link>  (void);
+#define             <link linkend="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</link>         (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</link>              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</link>   (void);
+#define             <link linkend="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</link>    (void);
+#define             <link linkend="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</link>         (void);
+#define             <link linkend="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</link>   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</link>     (void);
+<link linkend="void">void</link>                <link linkend="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</link>     (<link linkend="int">int</link> min_length);
+#define             <link linkend="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</link>        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</link>             (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</link>   (void);
+#define             <link linkend="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</link>  (void);
+#define             <link linkend="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</link>         (void);
+#define             <link linkend="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</link>   (void);
+#define             <link linkend="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</link>  (void);
+#define             <link linkend="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</link>   (void);
+#define             <link linkend="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</link>      (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -111,631 +94,561 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-crypto.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for NSS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoGetFunctions-nss">xmlSecCryptoGetFunctions_nss ()</title>
-<indexterm><primary>xmlSecCryptoGetFunctions_nss</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoGetFunctions_nss
-                                            (void);</programlisting>
+<refsect1 id="xmlsec-nss-crypto.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoGetFunctions-nss" role="function">
+<title>xmlSecCryptoGetFunctions_nss ()</title>
+<indexterm zone="xmlSecCryptoGetFunctions-nss"><primary sortas="xmlSecCryptoGetFunctions_nss">xmlSecCryptoGetFunctions_nss</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_nss
+                                                        (void);</programlisting>
 <para>
 Gets the pointer to xmlsec-nss functions table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the xmlsec-nss functions table or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-nss functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssInit">xmlSecNssInit ()</title>
-<indexterm><primary>xmlSecNssInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssInit                   (void);</programlisting>
+<refsect2 id="xmlSecNssInit" role="function">
+<title>xmlSecNssInit ()</title>
+<indexterm zone="xmlSecNssInit"><primary sortas="xmlSecNssInit">xmlSecNssInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssInit                       (void);</programlisting>
 <para>
 XMLSec library specific crypto engine initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssShutdown">xmlSecNssShutdown ()</title>
-<indexterm><primary>xmlSecNssShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssShutdown               (void);</programlisting>
+<refsect2 id="xmlSecNssShutdown" role="function">
+<title>xmlSecNssShutdown ()</title>
+<indexterm zone="xmlSecNssShutdown"><primary sortas="xmlSecNssShutdown">xmlSecNssShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssShutdown                   (void);</programlisting>
 <para>
 XMLSec library specific crypto engine shutdown.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit ()</title>
-<indexterm><primary>xmlSecNssKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeysMngrInit           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecNssKeysMngrInit" role="function">
+<title>xmlSecNssKeysMngrInit ()</title>
+<indexterm zone="xmlSecNssKeysMngrInit"><primary sortas="xmlSecNssKeysMngrInit">xmlSecNssKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysMngrInit               (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Adds NSS specific key data stores in keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom ()</title>
-<indexterm><primary>xmlSecNssGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssGenerateRandom         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecNssGenerateRandom" role="function">
+<title>xmlSecNssGenerateRandom ()</title>
+<indexterm zone="xmlSecNssGenerateRandom"><primary sortas="xmlSecNssGenerateRandom">xmlSecNssGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssGenerateRandom             (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara>		the destination buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the numer of bytes to generate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback ()</title>
-<indexterm><primary>xmlSecNssErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecNssErrorsDefaultCallback  (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);</programlisting>
+<refsect2 id="xmlSecNssErrorsDefaultCallback" role="function">
+<title>xmlSecNssErrorsDefaultCallback ()</title>
+<indexterm zone="xmlSecNssErrorsDefaultCallback"><primary sortas="xmlSecNssErrorsDefaultCallback">xmlSecNssErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNssErrorsDefaultCallback      (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);</programlisting>
 <para>
 The default errors reporting callback function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>		the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara>		the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara>		the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara>		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara>		the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot ()</title>
-<indexterm><primary>xmlSecNssGetInternalKeySlot</primary></indexterm><programlisting><link linkend="PK11SlotInfo">PK11SlotInfo</link>* xmlSecNssGetInternalKeySlot   (void);</programlisting>
+<refsect2 id="xmlSecNssGetInternalKeySlot" role="function">
+<title>xmlSecNssGetInternalKeySlot ()</title>
+<indexterm zone="xmlSecNssGetInternalKeySlot"><primary sortas="xmlSecNssGetInternalKeySlot">xmlSecNssGetInternalKeySlot</primary></indexterm><programlisting><link linkend="PK11SlotInfo">PK11SlotInfo</link> *      xmlSecNssGetInternalKeySlot         (void);</programlisting>
 <para>
 Gets internal NSS key slot.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>internal key slot and initializes it if needed.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> internal key slot and initializes it if needed.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</title>
-<indexterm><primary>xmlSecNssKeyDataAesId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataAesId</programlisting>
+<refsect2 id="xmlSecNssKeyDataAesId" role="macro">
+<title>xmlSecNssKeyDataAesId</title>
+<indexterm zone="xmlSecNssKeyDataAesId"><primary sortas="xmlSecNssKeyDataAesId">xmlSecNssKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataAesId</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataAesGetKlass (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataAesGetKlass" role="function">
+<title>xmlSecNssKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataAesGetKlass"><primary sortas="xmlSecNssKeyDataAesGetKlass">xmlSecNssKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataAesGetKlass         (void);</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet ()</title>
-<indexterm><primary>xmlSecNssKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataAesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecNssKeyDataAesSet" role="function">
+<title>xmlSecNssKeyDataAesSet ()</title>
+<indexterm zone="xmlSecNssKeyDataAesSet"><primary sortas="xmlSecNssKeyDataAesSet">xmlSecNssKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataAesSet              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of AES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to AES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</title>
-<indexterm><primary>xmlSecNssTransformAes128CbcId</primary></indexterm><programlisting>#define     xmlSecNssTransformAes128CbcId</programlisting>
+<refsect2 id="xmlSecNssTransformAes128CbcId" role="macro">
+<title>xmlSecNssTransformAes128CbcId</title>
+<indexterm zone="xmlSecNssTransformAes128CbcId"><primary sortas="xmlSecNssTransformAes128CbcId">xmlSecNssTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes128CbcId</programlisting>
 <para>
 The AES128 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformAes128CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformAes128CbcGetKlass" role="function">
+<title>xmlSecNssTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecNssTransformAes128CbcGetKlass"><primary sortas="xmlSecNssTransformAes128CbcGetKlass">xmlSecNssTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes128CbcGetKlass (void);</programlisting>
 <para>
 AES 128 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 128 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</title>
-<indexterm><primary>xmlSecNssTransformAes192CbcId</primary></indexterm><programlisting>#define     xmlSecNssTransformAes192CbcId</programlisting>
+<refsect2 id="xmlSecNssTransformAes192CbcId" role="macro">
+<title>xmlSecNssTransformAes192CbcId</title>
+<indexterm zone="xmlSecNssTransformAes192CbcId"><primary sortas="xmlSecNssTransformAes192CbcId">xmlSecNssTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes192CbcId</programlisting>
 <para>
 The AES192 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformAes192CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformAes192CbcGetKlass" role="function">
+<title>xmlSecNssTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecNssTransformAes192CbcGetKlass"><primary sortas="xmlSecNssTransformAes192CbcGetKlass">xmlSecNssTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes192CbcGetKlass (void);</programlisting>
 <para>
 AES 192 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 192 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</title>
-<indexterm><primary>xmlSecNssTransformAes256CbcId</primary></indexterm><programlisting>#define     xmlSecNssTransformAes256CbcId</programlisting>
+<refsect2 id="xmlSecNssTransformAes256CbcId" role="macro">
+<title>xmlSecNssTransformAes256CbcId</title>
+<indexterm zone="xmlSecNssTransformAes256CbcId"><primary sortas="xmlSecNssTransformAes256CbcId">xmlSecNssTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformAes256CbcId</programlisting>
 <para>
 The AES256 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformAes256CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformAes256CbcGetKlass" role="function">
+<title>xmlSecNssTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecNssTransformAes256CbcGetKlass"><primary sortas="xmlSecNssTransformAes256CbcGetKlass">xmlSecNssTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformAes256CbcGetKlass (void);</programlisting>
 <para>
 AES 256 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 256 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</title>
-<indexterm><primary>xmlSecNssTransformKWAes128Id</primary></indexterm><programlisting>#define     xmlSecNssTransformKWAes128Id</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes128Id" role="macro">
+<title>xmlSecNssTransformKWAes128Id</title>
+<indexterm zone="xmlSecNssTransformKWAes128Id"><primary sortas="xmlSecNssTransformKWAes128Id">xmlSecNssTransformKWAes128Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes128Id</programlisting>
 <para>
 The AES 128 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformKWAes128GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes128GetKlass" role="function">
+<title>xmlSecNssTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformKWAes128GetKlass"><primary sortas="xmlSecNssTransformKWAes128GetKlass">xmlSecNssTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes128GetKlass  (void);</programlisting>
 <para>
 The AES-128 key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-128 key wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</title>
-<indexterm><primary>xmlSecNssTransformKWAes192Id</primary></indexterm><programlisting>#define     xmlSecNssTransformKWAes192Id</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes192Id" role="macro">
+<title>xmlSecNssTransformKWAes192Id</title>
+<indexterm zone="xmlSecNssTransformKWAes192Id"><primary sortas="xmlSecNssTransformKWAes192Id">xmlSecNssTransformKWAes192Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes192Id</programlisting>
 <para>
 The AES 192 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformKWAes192GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes192GetKlass" role="function">
+<title>xmlSecNssTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformKWAes192GetKlass"><primary sortas="xmlSecNssTransformKWAes192GetKlass">xmlSecNssTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes192GetKlass  (void);</programlisting>
 <para>
 The AES-192 key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-192 key wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</title>
-<indexterm><primary>xmlSecNssTransformKWAes256Id</primary></indexterm><programlisting>#define     xmlSecNssTransformKWAes256Id</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes256Id" role="macro">
+<title>xmlSecNssTransformKWAes256Id</title>
+<indexterm zone="xmlSecNssTransformKWAes256Id"><primary sortas="xmlSecNssTransformKWAes256Id">xmlSecNssTransformKWAes256Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWAes256Id</programlisting>
 <para>
 The AES 256 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformKWAes256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformKWAes256GetKlass" role="function">
+<title>xmlSecNssTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformKWAes256GetKlass"><primary sortas="xmlSecNssTransformKWAes256GetKlass">xmlSecNssTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWAes256GetKlass  (void);</programlisting>
 <para>
 The AES-256 key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-256 key wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</title>
-<indexterm><primary>xmlSecNssKeyDataDesId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataDesId</programlisting>
+<refsect2 id="xmlSecNssKeyDataDesId" role="macro">
+<title>xmlSecNssKeyDataDesId</title>
+<indexterm zone="xmlSecNssKeyDataDesId"><primary sortas="xmlSecNssKeyDataDesId">xmlSecNssKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataDesId</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataDesGetKlass (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataDesGetKlass" role="function">
+<title>xmlSecNssKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataDesGetKlass"><primary sortas="xmlSecNssKeyDataDesGetKlass">xmlSecNssKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataDesGetKlass         (void);</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet ()</title>
-<indexterm><primary>xmlSecNssKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataDesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecNssKeyDataDesSet" role="function">
+<title>xmlSecNssKeyDataDesSet ()</title>
+<indexterm zone="xmlSecNssKeyDataDesSet"><primary sortas="xmlSecNssKeyDataDesSet">xmlSecNssKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataDesSet              (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of DES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</title>
-<indexterm><primary>xmlSecNssTransformDes3CbcId</primary></indexterm><programlisting>#define     xmlSecNssTransformDes3CbcId</programlisting>
+<refsect2 id="xmlSecNssTransformDes3CbcId" role="macro">
+<title>xmlSecNssTransformDes3CbcId</title>
+<indexterm zone="xmlSecNssTransformDes3CbcId"><primary sortas="xmlSecNssTransformDes3CbcId">xmlSecNssTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecNssTransformDes3CbcId</programlisting>
 <para>
 The Triple DES CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformDes3CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformDes3CbcGetKlass" role="function">
+<title>xmlSecNssTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecNssTransformDes3CbcGetKlass"><primary sortas="xmlSecNssTransformDes3CbcGetKlass">xmlSecNssTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformDes3CbcGetKlass   (void);</programlisting>
 <para>
 Triple DES CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Triple DES encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</title>
-<indexterm><primary>xmlSecNssTransformKWDes3Id</primary></indexterm><programlisting>#define     xmlSecNssTransformKWDes3Id</programlisting>
+<refsect2 id="xmlSecNssTransformKWDes3Id" role="macro">
+<title>xmlSecNssTransformKWDes3Id</title>
+<indexterm zone="xmlSecNssTransformKWDes3Id"><primary sortas="xmlSecNssTransformKWDes3Id">xmlSecNssTransformKWDes3Id</primary></indexterm><programlisting>#define             xmlSecNssTransformKWDes3Id</programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformKWDes3GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformKWDes3GetKlass" role="function">
+<title>xmlSecNssTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformKWDes3GetKlass"><primary sortas="xmlSecNssTransformKWDes3GetKlass">xmlSecNssTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformKWDes3GetKlass    (void);</programlisting>
 <para>
 The Triple DES key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Triple DES key wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</title>
-<indexterm><primary>xmlSecNssKeyDataDsaId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataDsaId</programlisting>
+<refsect2 id="xmlSecNssKeyDataDsaId" role="macro">
+<title>xmlSecNssKeyDataDsaId</title>
+<indexterm zone="xmlSecNssKeyDataDsaId"><primary sortas="xmlSecNssKeyDataDsaId">xmlSecNssKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataDsaId</programlisting>
 <para>
 The DSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataDsaGetKlass (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataDsaGetKlass" role="function">
+<title>xmlSecNssKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataDsaGetKlass"><primary sortas="xmlSecNssKeyDataDsaGetKlass">xmlSecNssKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataDsaGetKlass         (void);</programlisting>
 <para>
 The DSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to DSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</title>
-<indexterm><primary>xmlSecNssTransformDsaSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformDsaSha1Id</programlisting>
+<refsect2 id="xmlSecNssTransformDsaSha1Id" role="macro">
+<title>xmlSecNssTransformDsaSha1Id</title>
+<indexterm zone="xmlSecNssTransformDsaSha1Id"><primary sortas="xmlSecNssTransformDsaSha1Id">xmlSecNssTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformDsaSha1Id</programlisting>
 <para>
 The DSA SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformDsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformDsaSha1GetKlass" role="function">
+<title>xmlSecNssTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformDsaSha1GetKlass"><primary sortas="xmlSecNssTransformDsaSha1GetKlass">xmlSecNssTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformDsaSha1GetKlass   (void);</programlisting>
 <para>
 The DSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength ()</title>
-<indexterm><primary>xmlSecNssHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssHmacGetMinOutputLength (void);</programlisting>
+<refsect2 id="xmlSecNssHmacGetMinOutputLength" role="function">
+<title>xmlSecNssHmacGetMinOutputLength ()</title>
+<indexterm zone="xmlSecNssHmacGetMinOutputLength"><primary sortas="xmlSecNssHmacGetMinOutputLength">xmlSecNssHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssHmacGetMinOutputLength     (void);</programlisting>
 <para>
 Gets the value of min HMAC length.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the min HMAC output length
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength ()</title>
-<indexterm><primary>xmlSecNssHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecNssHmacSetMinOutputLength (<link linkend="int">int</link> min_length);</programlisting>
+<refsect2 id="xmlSecNssHmacSetMinOutputLength" role="function">
+<title>xmlSecNssHmacSetMinOutputLength ()</title>
+<indexterm zone="xmlSecNssHmacSetMinOutputLength"><primary sortas="xmlSecNssHmacSetMinOutputLength">xmlSecNssHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecNssHmacSetMinOutputLength     (<link linkend="int">int</link> min_length);</programlisting>
 <para>
 Sets the min HMAC output length</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>min_length</parameter>&#160;:</term>
 <listitem><simpara> the new min length 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</title>
-<indexterm><primary>xmlSecNssKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataHmacId</programlisting>
+<refsect2 id="xmlSecNssKeyDataHmacId" role="macro">
+<title>xmlSecNssKeyDataHmacId</title>
+<indexterm zone="xmlSecNssKeyDataHmacId"><primary sortas="xmlSecNssKeyDataHmacId">xmlSecNssKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataHmacId</programlisting>
 <para>
 The DHMAC key data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataHmacGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataHmacGetKlass" role="function">
+<title>xmlSecNssKeyDataHmacGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataHmacGetKlass"><primary sortas="xmlSecNssKeyDataHmacGetKlass">xmlSecNssKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataHmacGetKlass        (void);</programlisting>
 <para>
 The HMAC key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HMAC key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet ()</title>
-<indexterm><primary>xmlSecNssKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataHmacSet         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecNssKeyDataHmacSet" role="function">
+<title>xmlSecNssKeyDataHmacSet ()</title>
+<indexterm zone="xmlSecNssKeyDataHmacSet"><primary sortas="xmlSecNssKeyDataHmacSet">xmlSecNssKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataHmacSet             (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of HMAC key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecNssTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacMd5Id</programlisting>
+<refsect2 id="xmlSecNssTransformHmacMd5Id" role="macro">
+<title>xmlSecNssTransformHmacMd5Id</title>
+<indexterm zone="xmlSecNssTransformHmacMd5Id"><primary sortas="xmlSecNssTransformHmacMd5Id">xmlSecNssTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacMd5Id</programlisting>
 <para>
 The HMAC with MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformHmacMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformHmacMd5GetKlass" role="function">
+<title>xmlSecNssTransformHmacMd5GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformHmacMd5GetKlass"><primary sortas="xmlSecNssTransformHmacMd5GetKlass">xmlSecNssTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacMd5GetKlass   (void);</programlisting>
 <para>
 The HMAC-MD5 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-MD5 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</title>
-<indexterm><primary>xmlSecNssTransformHmacRipemd160Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacRipemd160Id</programlisting>
+<refsect2 id="xmlSecNssTransformHmacRipemd160Id" role="macro">
+<title>xmlSecNssTransformHmacRipemd160Id</title>
+<indexterm zone="xmlSecNssTransformHmacRipemd160Id"><primary sortas="xmlSecNssTransformHmacRipemd160Id">xmlSecNssTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacRipemd160Id</programlisting>
 <para>
 The HMAC with RipeMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformHmacRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformHmacRipemd160GetKlass" role="function">
+<title>xmlSecNssTransformHmacRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformHmacRipemd160GetKlass"><primary sortas="xmlSecNssTransformHmacRipemd160GetKlass">xmlSecNssTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-RIPEMD160 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-RIPEMD160 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecNssTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformHmacSha1Id</programlisting>
+<refsect2 id="xmlSecNssTransformHmacSha1Id" role="macro">
+<title>xmlSecNssTransformHmacSha1Id</title>
+<indexterm zone="xmlSecNssTransformHmacSha1Id"><primary sortas="xmlSecNssTransformHmacSha1Id">xmlSecNssTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformHmacSha1Id</programlisting>
 <para>
 The HMAC with SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformHmacSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformHmacSha1GetKlass" role="function">
+<title>xmlSecNssTransformHmacSha1GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformHmacSha1GetKlass"><primary sortas="xmlSecNssTransformHmacSha1GetKlass">xmlSecNssTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformHmacSha1GetKlass  (void);</programlisting>
 <para>
 The HMAC-SHA1 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA1 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</title>
-<indexterm><primary>xmlSecNssKeyDataRsaId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataRsaId</programlisting>
+<refsect2 id="xmlSecNssKeyDataRsaId" role="macro">
+<title>xmlSecNssKeyDataRsaId</title>
+<indexterm zone="xmlSecNssKeyDataRsaId"><primary sortas="xmlSecNssKeyDataRsaId">xmlSecNssKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataRsaId</programlisting>
 <para>
 The RSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataRsaGetKlass (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataRsaGetKlass" role="function">
+<title>xmlSecNssKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataRsaGetKlass"><primary sortas="xmlSecNssKeyDataRsaGetKlass">xmlSecNssKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataRsaGetKlass         (void);</programlisting>
 <para>
 The RSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to RSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</title>
-<indexterm><primary>xmlSecNssTransformRsaSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformRsaSha1Id</programlisting>
+<refsect2 id="xmlSecNssTransformRsaSha1Id" role="macro">
+<title>xmlSecNssTransformRsaSha1Id</title>
+<indexterm zone="xmlSecNssTransformRsaSha1Id"><primary sortas="xmlSecNssTransformRsaSha1Id">xmlSecNssTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaSha1Id</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformRsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformRsaSha1GetKlass" role="function">
+<title>xmlSecNssTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformRsaSha1GetKlass"><primary sortas="xmlSecNssTransformRsaSha1GetKlass">xmlSecNssTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaSha1GetKlass   (void);</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</title>
-<indexterm><primary>xmlSecNssTransformRsaPkcs1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformRsaPkcs1Id</programlisting>
+<refsect2 id="xmlSecNssTransformRsaPkcs1Id" role="macro">
+<title>xmlSecNssTransformRsaPkcs1Id</title>
+<indexterm zone="xmlSecNssTransformRsaPkcs1Id"><primary sortas="xmlSecNssTransformRsaPkcs1Id">xmlSecNssTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaPkcs1Id</programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformRsaPkcs1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformRsaPkcs1GetKlass" role="function">
+<title>xmlSecNssTransformRsaPkcs1GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformRsaPkcs1GetKlass"><primary sortas="xmlSecNssTransformRsaPkcs1GetKlass">xmlSecNssTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaPkcs1GetKlass  (void);</programlisting>
 <para>
 The RSA-PKCS1 key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-PKCS1 key transport transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</title>
-<indexterm><primary>xmlSecNssTransformRsaOaepId</primary></indexterm><programlisting>#define     xmlSecNssTransformRsaOaepId</programlisting>
+<refsect2 id="xmlSecNssTransformRsaOaepId" role="macro">
+<title>xmlSecNssTransformRsaOaepId</title>
+<indexterm zone="xmlSecNssTransformRsaOaepId"><primary sortas="xmlSecNssTransformRsaOaepId">xmlSecNssTransformRsaOaepId</primary></indexterm><programlisting>#define             xmlSecNssTransformRsaOaepId</programlisting>
 <para>
 The RSA OAEP key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformRsaOaepGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformRsaOaepGetKlass" role="function">
+<title>xmlSecNssTransformRsaOaepGetKlass ()</title>
+<indexterm zone="xmlSecNssTransformRsaOaepGetKlass"><primary sortas="xmlSecNssTransformRsaOaepGetKlass">xmlSecNssTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformRsaOaepGetKlass   (void);</programlisting>
 <para>
 The RSA-PKCS1 key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-PKCS1 key transport transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</title>
-<indexterm><primary>xmlSecNssTransformSha1Id</primary></indexterm><programlisting>#define     xmlSecNssTransformSha1Id</programlisting>
+<refsect2 id="xmlSecNssTransformSha1Id" role="macro">
+<title>xmlSecNssTransformSha1Id</title>
+<indexterm zone="xmlSecNssTransformSha1Id"><primary sortas="xmlSecNssTransformSha1Id">xmlSecNssTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecNssTransformSha1Id</programlisting>
 <para>
 The SHA1 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass ()</title>
-<indexterm><primary>xmlSecNssTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecNssTransformSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssTransformSha1GetKlass" role="function">
+<title>xmlSecNssTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecNssTransformSha1GetKlass"><primary sortas="xmlSecNssTransformSha1GetKlass">xmlSecNssTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecNssTransformSha1GetKlass      (void);</programlisting>
 <para>
 SHA-1 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-1 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/nss/keysstore.sgml b/docs/api/sgml/nss/keysstore.sgml
index 612e0e4..a20e886 100644
--- a/docs/api/sgml/nss/keysstore.sgml
+++ b/docs/api/sgml/nss/keysstore.sgml
@@ -1,30 +1,29 @@
 <refentry id="xmlsec-nss-keysstore">
 <refmeta>
-<refentrytitle>keysstore</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-keysstore.top_of_page">keysstore</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>keysstore</refname><refpurpose>Keys store implementation for NSS.</refpurpose>
+<refname>keysstore</refname>
+<refpurpose>Keys store implementation for NSS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-keysstore.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</link>
-<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> <link linkend="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</link> (void);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</link>      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</link>          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</link>          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+#define             <link linkend="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</link>
+<link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    <link linkend="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</link>          (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</link>          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</link>              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</link>              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
 </synopsis>
 </refsynopsisdiv>
 
@@ -36,95 +35,90 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-keysstore.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Keys store implementation for NSS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</title>
-<indexterm><primary>xmlSecNssKeysStoreId</primary></indexterm><programlisting>#define xmlSecNssKeysStoreId		xmlSecNssKeysStoreGetKlass()
+<refsect1 id="xmlsec-nss-keysstore.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNssKeysStoreId" role="macro">
+<title>xmlSecNssKeysStoreId</title>
+<indexterm zone="xmlSecNssKeysStoreId"><primary sortas="xmlSecNssKeysStoreId">xmlSecNssKeysStoreId</primary></indexterm><programlisting>#define xmlSecNssKeysStoreId		xmlSecNssKeysStoreGetKlass()
 </programlisting>
 <para>
 A Nss keys store klass id.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link> xmlSecNssKeysStoreGetKlass (void);</programlisting>
+<refsect2 id="xmlSecNssKeysStoreGetKlass" role="function">
+<title>xmlSecNssKeysStoreGetKlass ()</title>
+<indexterm zone="xmlSecNssKeysStoreGetKlass"><primary sortas="xmlSecNssKeysStoreGetKlass">xmlSecNssKeysStoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyStoreId">xmlSecKeyStoreId</link>    xmlSecNssKeysStoreGetKlass          (void);</programlisting>
 <para>
 The Nss list based keys store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Nss list based keys store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Nss list based keys store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey ()</title>
-<indexterm><primary>xmlSecNssKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeysStoreAdoptKey      (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecNssKeysStoreAdoptKey" role="function">
+<title>xmlSecNssKeysStoreAdoptKey ()</title>
+<indexterm zone="xmlSecNssKeysStoreAdoptKey"><primary sortas="xmlSecNssKeysStoreAdoptKey">xmlSecNssKeysStoreAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreAdoptKey          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad ()</title>
-<indexterm><primary>xmlSecNssKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeysStoreLoad          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *uri,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecNssKeysStoreLoad" role="function">
+<title>xmlSecNssKeysStoreLoad ()</title>
+<indexterm zone="xmlSecNssKeysStoreLoad"><primary sortas="xmlSecNssKeysStoreLoad">xmlSecNssKeysStoreLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreLoad              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *uri,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Reads keys from an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to associated keys manager. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave ()</title>
-<indexterm><primary>xmlSecNssKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeysStoreSave          (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssKeysStoreSave" role="function">
+<title>xmlSecNssKeysStoreSave ()</title>
+<indexterm zone="xmlSecNssKeysStoreSave"><primary sortas="xmlSecNssKeysStoreSave">xmlSecNssKeysStoreSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeysStoreSave              (<link linkend="xmlSecKeyStore">xmlSecKeyStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Writes keys from <parameter>store</parameter> to an XML file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to Nss keys store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the saved keys type (public, private, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/nss/pkikeys.sgml b/docs/api/sgml/nss/pkikeys.sgml
index e942679..b44fc04 100644
--- a/docs/api/sgml/nss/pkikeys.sgml
+++ b/docs/api/sgml/nss/pkikeys.sgml
@@ -1,29 +1,26 @@
 <refentry id="xmlsec-nss-pkikeys">
 <refmeta>
-<refentrytitle>pkikeys</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-pkikeys.top_of_page">pkikeys</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>pkikeys</refname><refpurpose>PKI keys data implementation.</refpurpose>
+<refname>pkikeys</refname>
+<refpurpose>PKI keys data implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-pkikeys.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</link>       (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
-                                             <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);
-<link linkend="SECKEYPublicKey">SECKEYPublicKey</link>* <link linkend="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>* <link linkend="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="KeyType">KeyType</link>     <link linkend="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</link>                (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
+                                                         <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);
+<link linkend="SECKEYPublicKey">SECKEYPublicKey</link>*    <link linkend="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>*   <link linkend="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="KeyType">KeyType</link>             <link linkend="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);
 </synopsis>
 </refsynopsisdiv>
 
@@ -35,96 +32,89 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-pkikeys.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 PKI keys data implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey ()</title>
-<indexterm><primary>xmlSecNssPKIAdoptKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecNssPKIAdoptKey       (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
-                                             <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);</programlisting>
+<refsect1 id="xmlsec-nss-pkikeys.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNssPKIAdoptKey" role="function">
+<title>xmlSecNssPKIAdoptKey ()</title>
+<indexterm zone="xmlSecNssPKIAdoptKey"><primary sortas="xmlSecNssPKIAdoptKey">xmlSecNssPKIAdoptKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecNssPKIAdoptKey                (<link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link> *privkey,
+                                                         <link linkend="SECKEYPublicKey">SECKEYPublicKey</link> *pubkey);</programlisting>
 <para>
 Build a KeyData object from the given Private Key and Public
 Key handles.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>privkey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>privkey</parameter>&#160;:</term>
 <listitem><simpara>        the NSS Private Key handle
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pubkey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pubkey</parameter>&#160;:</term>
 <listitem><simpara>         the NSS Public Key handle
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to KeyData object or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to KeyData object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey ()</title>
-<indexterm><primary>xmlSecNssPKIKeyDataGetPubKey</primary></indexterm><programlisting><link linkend="SECKEYPublicKey">SECKEYPublicKey</link>* xmlSecNssPKIKeyDataGetPubKey
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssPKIKeyDataGetPubKey" role="function">
+<title>xmlSecNssPKIKeyDataGetPubKey ()</title>
+<indexterm zone="xmlSecNssPKIKeyDataGetPubKey"><primary sortas="xmlSecNssPKIKeyDataGetPubKey">xmlSecNssPKIKeyDataGetPubKey</primary></indexterm><programlisting><link linkend="SECKEYPublicKey">SECKEYPublicKey</link>*    xmlSecNssPKIKeyDataGetPubKey        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the Public Key from the key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SECKEYPublicKey or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SECKEYPublicKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey ()</title>
-<indexterm><primary>xmlSecNssPKIKeyDataGetPrivKey</primary></indexterm><programlisting><link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>* xmlSecNssPKIKeyDataGetPrivKey
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssPKIKeyDataGetPrivKey" role="function">
+<title>xmlSecNssPKIKeyDataGetPrivKey ()</title>
+<indexterm zone="xmlSecNssPKIKeyDataGetPrivKey"><primary sortas="xmlSecNssPKIKeyDataGetPrivKey">xmlSecNssPKIKeyDataGetPrivKey</primary></indexterm><programlisting><link linkend="SECKEYPrivateKey">SECKEYPrivateKey</link>*   xmlSecNssPKIKeyDataGetPrivKey       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the Private Key from the key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SECKEYPrivateKey or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SECKEYPrivateKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType ()</title>
-<indexterm><primary>xmlSecNssPKIKeyDataGetKeyType</primary></indexterm><programlisting><link linkend="KeyType">KeyType</link>     xmlSecNssPKIKeyDataGetKeyType   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssPKIKeyDataGetKeyType" role="function">
+<title>xmlSecNssPKIKeyDataGetKeyType ()</title>
+<indexterm zone="xmlSecNssPKIKeyDataGetKeyType"><primary sortas="xmlSecNssPKIKeyDataGetKeyType">xmlSecNssPKIKeyDataGetKeyType</primary></indexterm><programlisting><link linkend="KeyType">KeyType</link>             xmlSecNssPKIKeyDataGetKeyType       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the Key Type from the key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS Key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Key Type 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Key Type 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate ()</title>
-<indexterm><primary>xmlSecNssPKIKeyDataDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssPKIKeyDataDuplicate    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
-                                             <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
+<refsect2 id="xmlSecNssPKIKeyDataDuplicate" role="function">
+<title>xmlSecNssPKIKeyDataDuplicate ()</title>
+<indexterm zone="xmlSecNssPKIKeyDataDuplicate"><primary sortas="xmlSecNssPKIKeyDataDuplicate">xmlSecNssPKIKeyDataDuplicate</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssPKIKeyDataDuplicate        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> dst,
+                                                         <link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> src);</programlisting>
 <para>
 Duplicates the keydata from src to dst</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS Key data to copy to.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS Key data to copy from.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>-1 on error, 0 on success
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> -1 on error, 0 on success
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/nss/x509.sgml b/docs/api/sgml/nss/x509.sgml
index 7d3cab5..6178616 100644
--- a/docs/api/sgml/nss/x509.sgml
+++ b/docs/api/sgml/nss/x509.sgml
@@ -1,59 +1,51 @@
 <refentry id="xmlsec-nss-x509">
 <refmeta>
-<refentrytitle>x509</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-nss-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-NSS Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>x509</refname><refpurpose>X509 certificates support implementation for NSS.</refpurpose>
+<refname>x509</refname>
+<refpurpose>X509 certificates support implementation for NSS.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-nss-x509.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</link>
-                                            (void);
-<link linkend="CERTCertificate">CERTCertificate</link>* <link linkend="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert);
-<link linkend="CERTCertificate">CERTCertificate</link>* <link linkend="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);
-<link linkend="CERTSignedCrl">CERTSignedCrl</link>* <link linkend="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</link>    (<link linkend="CERTCertificate">CERTCertificate</link> *cert);
-#define     <link linkend="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecNssX509StoreId">xmlSecNssX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> <link linkend="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</link>
-                                            (void);
-<link linkend="CERTCertificate">CERTCertificate</link>* <link linkend="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</link> (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="CERTCertificate">CERTCertificate</link>* <link linkend="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</link>   (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="CERTCertList">CERTCertList</link> *certs,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</link>     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+#define             <link linkend="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</link>        (void);
+<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);
+<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</link>        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);
+<link linkend="CERTSignedCrl">CERTSignedCrl</link>*      <link linkend="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</link>             (<link linkend="CERTCertificate">CERTCertificate</link> *cert);
+#define             <link linkend="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</link> (void);
+#define             <link linkend="xmlSecNssX509StoreId">xmlSecNssX509StoreId</link>
+<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</link>        (void);
+<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</link>          (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="CERTCertificate">CERTCertificate</link>*    <link linkend="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</link>            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="CERTCertList">CERTCertList</link> *certs,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</link>         (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
 </synopsis>
 </refsynopsisdiv>
 
@@ -65,305 +57,280 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-nss-x509.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for NSS.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</title>
-<indexterm><primary>xmlSecNssKeyDataX509Id</primary></indexterm><programlisting>#define     xmlSecNssKeyDataX509Id</programlisting>
+<refsect1 id="xmlsec-nss-x509.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNssKeyDataX509Id" role="macro">
+<title>xmlSecNssKeyDataX509Id</title>
+<indexterm zone="xmlSecNssKeyDataX509Id"><primary sortas="xmlSecNssKeyDataX509Id">xmlSecNssKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecNssKeyDataX509Id</programlisting>
 <para>
 The NSS X509 data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataX509GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetKlass" role="function">
+<title>xmlSecNssKeyDataX509GetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetKlass"><primary sortas="xmlSecNssKeyDataX509GetKlass">xmlSecNssKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataX509GetKlass        (void);</programlisting>
 <para>
 The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the X509 data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>* xmlSecNssKeyDataX509GetKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetKeyCert" role="function">
+<title>xmlSecNssKeyDataX509GetKeyCert ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetKeyCert"><primary sortas="xmlSecNssKeyDataX509GetKeyCert">xmlSecNssKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssKeyDataX509GetKeyCert      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the certificate from which the key was extracted.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the key's certificate or NULL if key data was not used for key
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataX509AdoptKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509AdoptKeyCert" role="function">
+<title>xmlSecNssKeyDataX509AdoptKeyCert ()</title>
+<indexterm zone="xmlSecNssKeyDataX509AdoptKeyCert"><primary sortas="xmlSecNssKeyDataX509AdoptKeyCert">xmlSecNssKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptKeyCert    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
 <para>
 Sets the key's certificate in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataX509AdoptCert   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509AdoptCert" role="function">
+<title>xmlSecNssKeyDataX509AdoptCert ()</title>
+<indexterm zone="xmlSecNssKeyDataX509AdoptCert"><primary sortas="xmlSecNssKeyDataX509AdoptCert">xmlSecNssKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptCert       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
 <para>
 Adds certificate to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>* xmlSecNssKeyDataX509GetCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetCert" role="function">
+<title>xmlSecNssKeyDataX509GetCert ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetCert"><primary sortas="xmlSecNssKeyDataX509GetCert">xmlSecNssKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssKeyDataX509GetCert         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a certificate from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
 number of certificates in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecNssKeyDataX509GetCertsSize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetCertsSize" role="function">
+<title>xmlSecNssKeyDataX509GetCertsSize ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetCertsSize"><primary sortas="xmlSecNssKeyDataX509GetCertsSize">xmlSecNssKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecNssKeyDataX509GetCertsSize    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of certificates in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of certificates in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssKeyDataX509AdoptCrl    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509AdoptCrl" role="function">
+<title>xmlSecNssKeyDataX509AdoptCrl ()</title>
+<indexterm zone="xmlSecNssKeyDataX509AdoptCrl"><primary sortas="xmlSecNssKeyDataX509AdoptCrl">xmlSecNssKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssKeyDataX509AdoptCrl        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="CERTSignedCrl">CERTSignedCrl</link> *crl);</programlisting>
 <para>
 Adds CRL to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>crl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to NSS X509 CRL.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="CERTSignedCrl">CERTSignedCrl</link>* xmlSecNssKeyDataX509GetCrl   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetCrl" role="function">
+<title>xmlSecNssKeyDataX509GetCrl ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetCrl"><primary sortas="xmlSecNssKeyDataX509GetCrl">xmlSecNssKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="CERTSignedCrl">CERTSignedCrl</link>*      xmlSecNssKeyDataX509GetCrl          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a CRL from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>                the desired CRL position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the
 number of CRLs in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize ()</title>
-<indexterm><primary>xmlSecNssKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecNssKeyDataX509GetCrlsSize (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecNssKeyDataX509GetCrlsSize" role="function">
+<title>xmlSecNssKeyDataX509GetCrlsSize ()</title>
+<indexterm zone="xmlSecNssKeyDataX509GetCrlsSize"><primary sortas="xmlSecNssKeyDataX509GetCrlsSize">xmlSecNssKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecNssKeyDataX509GetCrlsSize     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of CRLs in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of CRLs in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey ()</title>
-<indexterm><primary>xmlSecNssX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecNssX509CertGetKey    (<link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
+<refsect2 id="xmlSecNssX509CertGetKey" role="function">
+<title>xmlSecNssX509CertGetKey ()</title>
+<indexterm zone="xmlSecNssX509CertGetKey"><primary sortas="xmlSecNssX509CertGetKey">xmlSecNssX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecNssX509CertGetKey             (<link linkend="CERTCertificate">CERTCertificate</link> *cert);</programlisting>
 <para>
 Extracts public key from the <parameter>cert</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>public key value or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> public key value or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</title>
-<indexterm><primary>xmlSecNssKeyDataRawX509CertId</primary></indexterm><programlisting>#define     xmlSecNssKeyDataRawX509CertId</programlisting>
+<refsect2 id="xmlSecNssKeyDataRawX509CertId" role="macro">
+<title>xmlSecNssKeyDataRawX509CertId</title>
+<indexterm zone="xmlSecNssKeyDataRawX509CertId"><primary sortas="xmlSecNssKeyDataRawX509CertId">xmlSecNssKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecNssKeyDataRawX509CertId</programlisting>
 <para>
 The NSS raw X509 certificate klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass ()</title>
-<indexterm><primary>xmlSecNssKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecNssKeyDataRawX509CertGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssKeyDataRawX509CertGetKlass" role="function">
+<title>xmlSecNssKeyDataRawX509CertGetKlass ()</title>
+<indexterm zone="xmlSecNssKeyDataRawX509CertGetKlass"><primary sortas="xmlSecNssKeyDataRawX509CertGetKlass">xmlSecNssKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecNssKeyDataRawX509CertGetKlass (void);</programlisting>
 <para>
 The raw X509 certificates key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>raw X509 certificates key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509StoreId">xmlSecNssX509StoreId</title>
-<indexterm><primary>xmlSecNssX509StoreId</primary></indexterm><programlisting>#define     xmlSecNssX509StoreId</programlisting>
+<refsect2 id="xmlSecNssX509StoreId" role="macro">
+<title>xmlSecNssX509StoreId</title>
+<indexterm zone="xmlSecNssX509StoreId"><primary sortas="xmlSecNssX509StoreId">xmlSecNssX509StoreId</primary></indexterm><programlisting>#define             xmlSecNssX509StoreId</programlisting>
 <para>
 The NSS X509 store klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass ()</title>
-<indexterm><primary>xmlSecNssX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> xmlSecNssX509StoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecNssX509StoreGetKlass" role="function">
+<title>xmlSecNssX509StoreGetKlass ()</title>
+<indexterm zone="xmlSecNssX509StoreGetKlass"><primary sortas="xmlSecNssX509StoreGetKlass">xmlSecNssX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecNssX509StoreGetKlass        (void);</programlisting>
 <para>
 The NSS X509 certificates key data store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to NSS X509 certificates key data store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to NSS X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert ()</title>
-<indexterm><primary>xmlSecNssX509StoreFindCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>* xmlSecNssX509StoreFindCert (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecNssX509StoreFindCert" role="function">
+<title>xmlSecNssX509StoreFindCert ()</title>
+<indexterm zone="xmlSecNssX509StoreFindCert"><primary sortas="xmlSecNssX509StoreFindCert">xmlSecNssX509StoreFindCert</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssX509StoreFindCert          (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Searches <parameter>store</parameter> for a certificate that matches given criteria.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subjectName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subjectName</parameter>&#160;:</term>
 <listitem><simpara>	the desired certificate name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate issuer name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerSerial</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerSerial</parameter>&#160;:</term>
 <listitem><simpara>	the desired certificate issuer serial number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ski</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ski</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate SKI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to found certificate or NULL if certificate is not found
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to found certificate or NULL if certificate is not found
 or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify ()</title>
-<indexterm><primary>xmlSecNssX509StoreVerify</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>* xmlSecNssX509StoreVerify   (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="CERTCertList">CERTCertList</link> *certs,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecNssX509StoreVerify" role="function">
+<title>xmlSecNssX509StoreVerify ()</title>
+<indexterm zone="xmlSecNssX509StoreVerify"><primary sortas="xmlSecNssX509StoreVerify">xmlSecNssX509StoreVerify</primary></indexterm><programlisting><link linkend="CERTCertificate">CERTCertificate</link>*    xmlSecNssX509StoreVerify            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="CERTCertList">CERTCertList</link> *certs,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Verifies <parameter>certs</parameter> list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>certs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>certs</parameter>&#160;:</term>
 <listitem><simpara>		the untrusted certificates stack.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the first verified certificate from <parameter>certs</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the first verified certificate from <parameter>certs</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert ()</title>
-<indexterm><primary>xmlSecNssX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNssX509StoreAdoptCert     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="CERTCertificate">CERTCertificate</link> *cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecNssX509StoreAdoptCert" role="function">
+<title>xmlSecNssX509StoreAdoptCert ()</title>
+<indexterm zone="xmlSecNssX509StoreAdoptCert"><primary sortas="xmlSecNssX509StoreAdoptCert">xmlSecNssX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNssX509StoreAdoptCert         (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="CERTCertificate">CERTCertificate</link> *cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Adds trusted (root) or untrusted certificate to the store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>              the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to NSS X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>               the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/nss/xmlsec-nss-doc.bottom b/docs/api/sgml/nss/xmlsec-nss-doc.bottom
index 02cdd23..a270224 100644
--- a/docs/api/sgml/nss/xmlsec-nss-doc.bottom
+++ b/docs/api/sgml/nss/xmlsec-nss-doc.bottom
@@ -1,6 +1,6 @@
-    &xmlsec-nss-app;
-    &xmlsec-nss-bignum;
-    &xmlsec-nss-crypto;
     &xmlsec-nss-keysstore;
+    &xmlsec-nss-bignum;
     &xmlsec-nss-pkikeys;
     &xmlsec-nss-x509;
+    &xmlsec-nss-app;
+    &xmlsec-nss-crypto;
diff --git a/docs/api/sgml/nss/xmlsec-nss-doc.top b/docs/api/sgml/nss/xmlsec-nss-doc.top
index 07ef384..923139b 100644
--- a/docs/api/sgml/nss/xmlsec-nss-doc.top
+++ b/docs/api/sgml/nss/xmlsec-nss-doc.top
@@ -1,6 +1,6 @@
-<!ENTITY xmlsec-nss-app SYSTEM "sgml/app.sgml">
-<!ENTITY xmlsec-nss-bignum SYSTEM "sgml/bignum.sgml">
-<!ENTITY xmlsec-nss-crypto SYSTEM "sgml/crypto.sgml">
 <!ENTITY xmlsec-nss-keysstore SYSTEM "sgml/keysstore.sgml">
+<!ENTITY xmlsec-nss-bignum SYSTEM "sgml/bignum.sgml">
 <!ENTITY xmlsec-nss-pkikeys SYSTEM "sgml/pkikeys.sgml">
 <!ENTITY xmlsec-nss-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-nss-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-nss-crypto SYSTEM "sgml/crypto.sgml">
diff --git a/docs/api/sgml/openssl/app.sgml b/docs/api/sgml/openssl/app.sgml
index d81eef6..99e80f4 100644
--- a/docs/api/sgml/openssl/app.sgml
+++ b/docs/api/sgml/openssl/app.sgml
@@ -1,102 +1,93 @@
 <refentry id="xmlsec-openssl-app">
 <refmeta>
-<refentrytitle>app</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-openssl-app.top_of_page">app</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>app</refname><refpurpose>Application functions implementation for OpenSSL.</refpurpose>
+<refname>app</refname>
+<refpurpose>Application functions implementation for OpenSSL.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-openssl-app.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link>            (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link>        (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *path);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</link>
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *file);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link>        (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link>  (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link>     (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link>     (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link>
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link>  (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link>     (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link>
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link>  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> <link linkend="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</link>
-                                            (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="void">void</link>*       <link linkend="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</link>
-                                            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</link>                (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</link>            (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</link>    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</link> (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *path);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</link>
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *file);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</link>             (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</link>       (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</link>          (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</link>          (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</link>    (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</link>       (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</link>         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</link>   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</link>      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        <link linkend="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</link>  (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="void">void</link>*               <link linkend="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</link>
+                                                        (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -108,533 +99,506 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-openssl-app.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Application functions implementation for OpenSSL.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit ()</title>
-<indexterm><primary>xmlSecOpenSSLAppInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppInit            (const <link linkend="char">char</link> *config);</programlisting>
+<refsect1 id="xmlsec-openssl-app.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecOpenSSLAppInit" role="function">
+<title>xmlSecOpenSSLAppInit ()</title>
+<indexterm zone="xmlSecOpenSSLAppInit"><primary sortas="xmlSecOpenSSLAppInit">xmlSecOpenSSLAppInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppInit                (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the path to certs.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown ()</title>
-<indexterm><primary>xmlSecOpenSSLAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppShutdown        (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppShutdown" role="function">
+<title>xmlSecOpenSSLAppShutdown ()</title>
+<indexterm zone="xmlSecOpenSSLAppShutdown"><primary sortas="xmlSecOpenSSLAppShutdown">xmlSecOpenSSLAppShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppShutdown            (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit ()</title>
-<indexterm><primary>xmlSecOpenSSLAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppDefaultKeysMngrInit
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrInit" role="function">
+<title>xmlSecOpenSSLAppDefaultKeysMngrInit ()</title>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrInit"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrInit">xmlSecOpenSSLAppDefaultKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with simple keys store <link linkend="xmlSecSimpleKeysStoreId"><type>xmlSecSimpleKeysStoreId</type></link>
 and a default OpenSSL crypto key data stores.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</title>
-<indexterm><primary>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey" role="function">
+<title>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</title>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrAdoptKey">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Adds <parameter>key</parameter> to the keys manager <parameter>mngr</parameter> created with <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit"><type>xmlSecOpenSSLAppDefaultKeysMngrInit</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad ()</title>
-<indexterm><primary>xmlSecOpenSSLAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppDefaultKeysMngrLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *uri);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrLoad" role="function">
+<title>xmlSecOpenSSLAppDefaultKeysMngrLoad ()</title>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrLoad"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrLoad">xmlSecOpenSSLAppDefaultKeysMngrLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *uri);</programlisting>
 <para>
 Loads XML keys file from <parameter>uri</parameter> to the keys manager <parameter>mngr</parameter> created 
 with <link linkend="xmlSecOpenSSLAppDefaultKeysMngrInit"><type>xmlSecOpenSSLAppDefaultKeysMngrInit</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave ()</title>
-<indexterm><primary>xmlSecOpenSSLAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppDefaultKeysMngrSave
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppDefaultKeysMngrSave" role="function">
+<title>xmlSecOpenSSLAppDefaultKeysMngrSave ()</title>
+<indexterm zone="xmlSecOpenSSLAppDefaultKeysMngrSave"><primary sortas="xmlSecOpenSSLAppDefaultKeysMngrSave">xmlSecOpenSSLAppDefaultKeysMngrSave</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Saves keys from <parameter>mngr</parameter> to  XML keys file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the destination filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the type of keys to save (public/private/symmetric).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeysMngrCertLoad
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoad" role="function">
+<title>xmlSecOpenSSLAppKeysMngrCertLoad ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoad"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoad">xmlSecOpenSSLAppKeysMngrCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeysMngrCertLoadMemory
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoadMemory" role="function">
+<title>xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadMemory"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoadMemory">xmlSecOpenSSLAppKeysMngrCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from binary buffer <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeysMngrCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeysMngrCertLoadBIO
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             <link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeysMngrCertLoadBIO" role="function">
+<title>xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeysMngrCertLoadBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from an OpenSSL BIO object and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bio</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bio</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate BIO.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeysMngrAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeysMngrAddCertsPath
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *path);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeysMngrAddCertsPath" role="function">
+<title>xmlSecOpenSSLAppKeysMngrAddCertsPath ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsPath"><primary sortas="xmlSecOpenSSLAppKeysMngrAddCertsPath">xmlSecOpenSSLAppKeysMngrAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *path);</programlisting>
 <para>
 Reads cert from <parameter>path</parameter> and adds to the list of trusted certificates.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>path</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>path</parameter>&#160;:</term>
 <listitem><simpara>		the path to trusted certificates.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeysMngrAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeysMngrAddCertsFile
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *file);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeysMngrAddCertsFile" role="function">
+<title>xmlSecOpenSSLAppKeysMngrAddCertsFile ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeysMngrAddCertsFile"><primary sortas="xmlSecOpenSSLAppKeysMngrAddCertsFile">xmlSecOpenSSLAppKeysMngrAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *file);</programlisting>
 <para>
 Reads certs from <parameter>file</parameter> and adds to the list of trusted certificates.
 It is possible for <parameter>file</parameter> to contain multiple certs.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>               the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>               the file containing trusted certificates.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppKeyLoad        (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyLoad" role="function">
+<title>xmlSecOpenSSLAppKeyLoad ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyLoad"><primary sortas="xmlSecOpenSSLAppKeyLoad">xmlSecOpenSSLAppKeyLoad</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoad             (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppKeyLoadMemory  (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyLoadMemory" role="function">
+<title>xmlSecOpenSSLAppKeyLoadMemory ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyLoadMemory"><primary sortas="xmlSecOpenSSLAppKeyLoadMemory">xmlSecOpenSSLAppKeyLoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoadMemory       (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the memory buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the size of binary key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppKeyLoadBIO     (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyLoadBIO" role="function">
+<title>xmlSecOpenSSLAppKeyLoadBIO ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyLoadBIO">xmlSecOpenSSLAppKeyLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyLoadBIO          (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the an OpenSSL BIO object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bio</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bio</parameter>&#160;:</term>
 <listitem><simpara>		the key BIO.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load ()</title>
-<indexterm><primary>xmlSecOpenSSLAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppPkcs12Load     (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppPkcs12Load" role="function">
+<title>xmlSecOpenSSLAppPkcs12Load ()</title>
+<indexterm zone="xmlSecOpenSSLAppPkcs12Load"><primary sortas="xmlSecOpenSSLAppPkcs12Load">xmlSecOpenSSLAppPkcs12Load</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12Load          (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory ()</title>
-<indexterm><primary>xmlSecOpenSSLAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppPkcs12LoadMemory
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppPkcs12LoadMemory" role="function">
+<title>xmlSecOpenSSLAppPkcs12LoadMemory ()</title>
+<indexterm zone="xmlSecOpenSSLAppPkcs12LoadMemory"><primary sortas="xmlSecOpenSSLAppPkcs12LoadMemory">xmlSecOpenSSLAppPkcs12LoadMemory</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12LoadMemory    (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO ()</title>
-<indexterm><primary>xmlSecOpenSSLAppPkcs12LoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppPkcs12LoadBIO  (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppPkcs12LoadBIO" role="function">
+<title>xmlSecOpenSSLAppPkcs12LoadBIO ()</title>
+<indexterm zone="xmlSecOpenSSLAppPkcs12LoadBIO"><primary sortas="xmlSecOpenSSLAppPkcs12LoadBIO">xmlSecOpenSSLAppPkcs12LoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppPkcs12LoadBIO       (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 data in an OpenSSL BIO object.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bio</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bio</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key bio.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeyCertLoad     (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyCertLoad" role="function">
+<title>xmlSecOpenSSLAppKeyCertLoad ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoad"><primary sortas="xmlSecOpenSSLAppKeyCertLoad">xmlSecOpenSSLAppKeyCertLoad</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoad         (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeyCertLoadMemory
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyCertLoadMemory" role="function">
+<title>xmlSecOpenSSLAppKeyCertLoadMemory ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoadMemory"><primary sortas="xmlSecOpenSSLAppKeyCertLoadMemory">xmlSecOpenSSLAppKeyCertLoadMemory</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from memory buffer and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the certificate binary data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLAppKeyCertLoadBIO  (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             <link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyCertLoadBIO" role="function">
+<title>xmlSecOpenSSLAppKeyCertLoadBIO ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyCertLoadBIO">xmlSecOpenSSLAppKeyCertLoadBIO</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         <link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from memory buffer and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bio</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bio</parameter>&#160;:</term>
 <listitem><simpara>		the certificate bio.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO ()</title>
-<indexterm><primary>xmlSecOpenSSLAppKeyFromCertLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> xmlSecOpenSSLAppKeyFromCertLoadBIO
-                                            (<link linkend="BIO-CAPS">BIO</link> *bio,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppKeyFromCertLoadBIO" role="function">
+<title>xmlSecOpenSSLAppKeyFromCertLoadBIO ()</title>
+<indexterm zone="xmlSecOpenSSLAppKeyFromCertLoadBIO"><primary sortas="xmlSecOpenSSLAppKeyFromCertLoadBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<link linkend="BIO--CAPS">BIO</link> *bio,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Loads public key from cert.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>bio</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bio</parameter>&#160;:</term>
 <listitem><simpara>		the BIO.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the cert format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback ()</title>
-<indexterm><primary>xmlSecOpenSSLAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*       xmlSecOpenSSLAppGetDefaultPwdCallback
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLAppGetDefaultPwdCallback" role="function">
+<title>xmlSecOpenSSLAppGetDefaultPwdCallback ()</title>
+<indexterm zone="xmlSecOpenSSLAppGetDefaultPwdCallback"><primary sortas="xmlSecOpenSSLAppGetDefaultPwdCallback">xmlSecOpenSSLAppGetDefaultPwdCallback</primary></indexterm><programlisting><link linkend="void">void</link>*               xmlSecOpenSSLAppGetDefaultPwdCallback
+                                                        (void);</programlisting>
 <para>
 Gets default password callback.</para>
 <para>
-
-</para></refsect2>
+</para><variablelist role="params">
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> default password callback.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 
 </refsect1>
 
diff --git a/docs/api/sgml/openssl/bn.sgml b/docs/api/sgml/openssl/bn.sgml
index 98992c4..59b800c 100644
--- a/docs/api/sgml/openssl/bn.sgml
+++ b/docs/api/sgml/openssl/bn.sgml
@@ -1,25 +1,24 @@
 <refentry id="xmlsec-openssl-bn">
 <refmeta>
-<refentrytitle>bn</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-openssl-bn.top_of_page">bn</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>bn</refname><refpurpose>Big numbers helper functions.</refpurpose>
+<refname>bn</refname>
+<refpurpose>Big numbers helper functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-openssl-bn.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="BIGNUM-CAPS">BIGNUM</link>*     <link linkend="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</link>     (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="BIGNUM-CAPS">BIGNUM</link> **a);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</link>     (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="BIGNUM-CAPS">BIGNUM</link> *a,
-                                             <link linkend="int">int</link> addLineBreaks);
+<link linkend="BIGNUM--CAPS">BIGNUM</link>*             <link linkend="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</link>         (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="BIGNUM--CAPS">BIGNUM</link> **a);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</link>         (<link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="BIGNUM--CAPS">BIGNUM</link> *a,
+                                                         <link linkend="int">int</link> addLineBreaks);
 </synopsis>
 </refsynopsisdiv>
 
@@ -31,42 +30,41 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-openssl-bn.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Big numbers helper functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue ()</title>
-<indexterm><primary>xmlSecOpenSSLNodeGetBNValue</primary></indexterm><programlisting><link linkend="BIGNUM-CAPS">BIGNUM</link>*     xmlSecOpenSSLNodeGetBNValue     (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             <link linkend="BIGNUM-CAPS">BIGNUM</link> **a);</programlisting>
+<refsect1 id="xmlsec-openssl-bn.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecOpenSSLNodeGetBNValue" role="function">
+<title>xmlSecOpenSSLNodeGetBNValue ()</title>
+<indexterm zone="xmlSecOpenSSLNodeGetBNValue"><primary sortas="xmlSecOpenSSLNodeGetBNValue">xmlSecOpenSSLNodeGetBNValue</primary></indexterm><programlisting><link linkend="BIGNUM--CAPS">BIGNUM</link>*             xmlSecOpenSSLNodeGetBNValue         (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         <link linkend="BIGNUM--CAPS">BIGNUM</link> **a);</programlisting>
 <para>
 Converts the node content from CryptoBinary format 
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>) 
 to a BIGNUM. If no BIGNUM buffer provided then a new
 BIGNUM is created (caller is responsible for freeing it).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> the poitner to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>a</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>a</parameter>&#160;:</term>
 <listitem><simpara> the BIGNUM buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to BIGNUM produced from CryptoBinary string
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to BIGNUM produced from CryptoBinary string
 or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue ()</title>
-<indexterm><primary>xmlSecOpenSSLNodeSetBNValue</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLNodeSetBNValue     (<link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="BIGNUM-CAPS">BIGNUM</link> *a,
-                                             <link linkend="int">int</link> addLineBreaks);</programlisting>
+<refsect2 id="xmlSecOpenSSLNodeSetBNValue" role="function">
+<title>xmlSecOpenSSLNodeSetBNValue ()</title>
+<indexterm zone="xmlSecOpenSSLNodeSetBNValue"><primary sortas="xmlSecOpenSSLNodeSetBNValue">xmlSecOpenSSLNodeSetBNValue</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLNodeSetBNValue         (<link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="BIGNUM--CAPS">BIGNUM</link> *a,
+                                                         <link linkend="int">int</link> addLineBreaks);</programlisting>
 <para>
 Converts BIGNUM to CryptoBinary string
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-CryptoBinary"><type>sec-CryptoBinary</type></link>) 
@@ -74,20 +72,19 @@ and sets it as the content of the given node. If the
 addLineBreaks is set then line breaks are added 
 before and after the CryptoBinary string.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>a</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>a</parameter>&#160;:</term>
 <listitem><simpara> the BIGNUM.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>addLineBreaks</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>addLineBreaks</parameter>&#160;:</term>
 <listitem><simpara> if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or -1 otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or -1 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/openssl/crypto.sgml b/docs/api/sgml/openssl/crypto.sgml
index 5e434c6..f7b3160 100644
--- a/docs/api/sgml/openssl/crypto.sgml
+++ b/docs/api/sgml/openssl/crypto.sgml
@@ -1,182 +1,171 @@
 <refentry id="xmlsec-openssl-crypto">
 <refmeta>
-<refentrytitle>crypto</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-openssl-crypto.top_of_page">crypto</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>crypto</refname><refpurpose>Crypto transforms implementation for OpenSSL.</refpurpose>
+<refname>crypto</refname>
+<refpurpose>Crypto transforms implementation for OpenSSL.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-openssl-crypto.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-NO-SHA224-CAPS">XMLSEC_NO_SHA224</link>
-#define     <link linkend="XMLSEC-NO-SHA256-CAPS">XMLSEC_NO_SHA256</link>
-#define     <link linkend="XMLSEC-NO-SHA384-CAPS">XMLSEC_NO_SHA384</link>
-#define     <link linkend="XMLSEC-NO-SHA512-CAPS">XMLSEC_NO_SHA512</link>
-#define     <link linkend="XMLSEC-NO-AES-CAPS">XMLSEC_NO_AES</link>
-<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> <link linkend="xmlSecCryptoGetFunctions-openssl">xmlSecCryptoGetFunctions_openssl</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLInit">xmlSecOpenSSLInit</link>               (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</link>           (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</link>       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</link>     (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</link>
-                                            (const <link linkend="xmlChar">xmlChar</link> *path);
-const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="DSA-CAPS">DSA</link> *dsa);
-<link linkend="DSA-CAPS">DSA</link>*        <link linkend="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   <link linkend="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-#define     <link linkend="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength</link>
-                                            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength</link>
-                                            (<link linkend="int">int</link> min_length);
-#define     <link linkend="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
-#define     <link linkend="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="RSA-CAPS">RSA</link> *rsa);
-<link linkend="RSA-CAPS">RSA</link>*        <link linkend="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   <link linkend="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-#define     <link linkend="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</link>
-                                            (void);
-#define     <link linkend="XMLSEC-OPENSSL-ERRORS-LIB-CAPS">XMLSEC_OPENSSL_ERRORS_LIB</link>
-#define     <link linkend="XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</link>
-<link linkend="void">void</link>        <link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link>
-                                            (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);
+#define             <link linkend="XMLSEC-NO-SHA224--CAPS">XMLSEC_NO_SHA224</link>
+#define             <link linkend="XMLSEC-NO-SHA256--CAPS">XMLSEC_NO_SHA256</link>
+#define             <link linkend="XMLSEC-NO-SHA384--CAPS">XMLSEC_NO_SHA384</link>
+#define             <link linkend="XMLSEC-NO-SHA512--CAPS">XMLSEC_NO_SHA512</link>
+#define             <link linkend="XMLSEC-NO-AES--CAPS">XMLSEC_NO_AES</link>
+<link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  <link linkend="xmlSecCryptoGetFunctions-openssl">xmlSecCryptoGetFunctions_openssl</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLInit">xmlSecOpenSSLInit</link>                   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</link>               (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</link>           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</link>         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</link>
+                                                        (const <link linkend="xmlChar">xmlChar</link> *path);
+const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</link>          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="DSA--CAPS">DSA</link> *dsa);
+<link linkend="DSA--CAPS">DSA</link>*                <link linkend="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
+<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+#define             <link linkend="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</link>
+                                                        (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength</link> (void);
+<link linkend="void">void</link>                <link linkend="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength</link> (<link linkend="int">int</link> min_length);
+#define             <link linkend="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</link>    (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</link>         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);
+#define             <link linkend="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</link>   (void);
+#define             <link linkend="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="RSA--CAPS">RSA</link> *rsa);
+<link linkend="RSA--CAPS">RSA</link>*                <link linkend="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
+<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+#define             <link linkend="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</link>  (void);
+#define             <link linkend="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</link>
+                                                        (void);
+#define             <link linkend="XMLSEC-OPENSSL-ERRORS-LIB--CAPS">XMLSEC_OPENSSL_ERRORS_LIB</link>
+#define             <link linkend="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</link>
+<link linkend="void">void</link>                <link linkend="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</link>  (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);
 </synopsis>
 </refsynopsisdiv>
 
@@ -188,1154 +177,1042 @@ const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecOpenSSLGetDef
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-openssl-crypto.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Crypto transforms implementation for OpenSSL.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-NO-SHA224-CAPS">XMLSEC_NO_SHA224</title>
-<indexterm><primary>XMLSEC_NO_SHA224</primary></indexterm><programlisting>#define XMLSEC_NO_SHA224 1
+<refsect1 id="xmlsec-openssl-crypto.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-NO-SHA224--CAPS" role="macro">
+<title>XMLSEC_NO_SHA224</title>
+<indexterm zone="XMLSEC-NO-SHA224--CAPS"><primary sortas="XMLSEC_NO_SHA224">XMLSEC_NO_SHA224</primary></indexterm><programlisting>#define XMLSEC_NO_SHA224 1
 </programlisting>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-NO-SHA256-CAPS">XMLSEC_NO_SHA256</title>
-<indexterm><primary>XMLSEC_NO_SHA256</primary></indexterm><programlisting>#define XMLSEC_NO_SHA256 1
+<refsect2 id="XMLSEC-NO-SHA256--CAPS" role="macro">
+<title>XMLSEC_NO_SHA256</title>
+<indexterm zone="XMLSEC-NO-SHA256--CAPS"><primary sortas="XMLSEC_NO_SHA256">XMLSEC_NO_SHA256</primary></indexterm><programlisting>#define XMLSEC_NO_SHA256 1
 </programlisting>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-NO-SHA384-CAPS">XMLSEC_NO_SHA384</title>
-<indexterm><primary>XMLSEC_NO_SHA384</primary></indexterm><programlisting>#define XMLSEC_NO_SHA384 1
+<refsect2 id="XMLSEC-NO-SHA384--CAPS" role="macro">
+<title>XMLSEC_NO_SHA384</title>
+<indexterm zone="XMLSEC-NO-SHA384--CAPS"><primary sortas="XMLSEC_NO_SHA384">XMLSEC_NO_SHA384</primary></indexterm><programlisting>#define XMLSEC_NO_SHA384 1
 </programlisting>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-NO-SHA512-CAPS">XMLSEC_NO_SHA512</title>
-<indexterm><primary>XMLSEC_NO_SHA512</primary></indexterm><programlisting>#define XMLSEC_NO_SHA512 1
+<refsect2 id="XMLSEC-NO-SHA512--CAPS" role="macro">
+<title>XMLSEC_NO_SHA512</title>
+<indexterm zone="XMLSEC-NO-SHA512--CAPS"><primary sortas="XMLSEC_NO_SHA512">XMLSEC_NO_SHA512</primary></indexterm><programlisting>#define XMLSEC_NO_SHA512 1
 </programlisting>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-NO-AES-CAPS">XMLSEC_NO_AES</title>
-<indexterm><primary>XMLSEC_NO_AES</primary></indexterm><programlisting>#define XMLSEC_NO_AES	 1
+<refsect2 id="XMLSEC-NO-AES--CAPS" role="macro">
+<title>XMLSEC_NO_AES</title>
+<indexterm zone="XMLSEC-NO-AES--CAPS"><primary sortas="XMLSEC_NO_AES">XMLSEC_NO_AES</primary></indexterm><programlisting>#define XMLSEC_NO_AES	 1
 </programlisting>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoGetFunctions-openssl">xmlSecCryptoGetFunctions_openssl ()</title>
-<indexterm><primary>xmlSecCryptoGetFunctions_openssl</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link> xmlSecCryptoGetFunctions_openssl
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoGetFunctions-openssl" role="function">
+<title>xmlSecCryptoGetFunctions_openssl ()</title>
+<indexterm zone="xmlSecCryptoGetFunctions-openssl"><primary sortas="xmlSecCryptoGetFunctions_openssl">xmlSecCryptoGetFunctions_openssl</primary></indexterm><programlisting><link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctionsPtr</link>  xmlSecCryptoGetFunctions_openssl
+                                                        (void);</programlisting>
 <para>
 Gets the pointer to xmlsec-openssl functions table.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the xmlsec-openssl functions table or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the xmlsec-openssl functions table or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLInit">xmlSecOpenSSLInit ()</title>
-<indexterm><primary>xmlSecOpenSSLInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLInit               (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLInit" role="function">
+<title>xmlSecOpenSSLInit ()</title>
+<indexterm zone="xmlSecOpenSSLInit"><primary sortas="xmlSecOpenSSLInit">xmlSecOpenSSLInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLInit                   (void);</programlisting>
 <para>
 XMLSec library specific crypto engine initialization.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown ()</title>
-<indexterm><primary>xmlSecOpenSSLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLShutdown           (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLShutdown" role="function">
+<title>xmlSecOpenSSLShutdown ()</title>
+<indexterm zone="xmlSecOpenSSLShutdown"><primary sortas="xmlSecOpenSSLShutdown">xmlSecOpenSSLShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLShutdown               (void);</programlisting>
 <para>
 XMLSec library specific crypto engine shutdown.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit ()</title>
-<indexterm><primary>xmlSecOpenSSLKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeysMngrInit       (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeysMngrInit" role="function">
+<title>xmlSecOpenSSLKeysMngrInit ()</title>
+<indexterm zone="xmlSecOpenSSLKeysMngrInit"><primary sortas="xmlSecOpenSSLKeysMngrInit">xmlSecOpenSSLKeysMngrInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeysMngrInit           (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Adds OpenSSL specific key data stores in keys manager.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom ()</title>
-<indexterm><primary>xmlSecOpenSSLGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLGenerateRandom     (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecOpenSSLGenerateRandom" role="function">
+<title>xmlSecOpenSSLGenerateRandom ()</title>
+<indexterm zone="xmlSecOpenSSLGenerateRandom"><primary sortas="xmlSecOpenSSLGenerateRandom">xmlSecOpenSSLGenerateRandom</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLGenerateRandom         (<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Generates <parameter>size</parameter> random bytes and puts result in <parameter>buffer</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara>		the destination buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara>		the numer of bytes to generate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</title>
-<indexterm><primary>xmlSecOpenSSLSetDefaultTrustedCertsFolder</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLSetDefaultTrustedCertsFolder
-                                            (const <link linkend="xmlChar">xmlChar</link> *path);</programlisting>
+<refsect2 id="xmlSecOpenSSLSetDefaultTrustedCertsFolder" role="function">
+<title>xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</title>
+<indexterm zone="xmlSecOpenSSLSetDefaultTrustedCertsFolder"><primary sortas="xmlSecOpenSSLSetDefaultTrustedCertsFolder">xmlSecOpenSSLSetDefaultTrustedCertsFolder</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
+                                                        (const <link linkend="xmlChar">xmlChar</link> *path);</programlisting>
 <para>
 Sets the default trusted certs folder.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>path</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>path</parameter>&#160;:</term>
 <listitem><simpara> 	the default trusted certs path.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</title>
-<indexterm><primary>xmlSecOpenSSLGetDefaultTrustedCertsFolder</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* xmlSecOpenSSLGetDefaultTrustedCertsFolder
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLGetDefaultTrustedCertsFolder" role="function">
+<title>xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</title>
+<indexterm zone="xmlSecOpenSSLGetDefaultTrustedCertsFolder"><primary sortas="xmlSecOpenSSLGetDefaultTrustedCertsFolder">xmlSecOpenSSLGetDefaultTrustedCertsFolder</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
+                                                        (void);</programlisting>
 <para>
 Gets the default trusted certs folder.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the default trusted cert folder.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the default trusted cert folder.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataAesId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataAesId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataAesId" role="macro">
+<title>xmlSecOpenSSLKeyDataAesId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataAesId"><primary sortas="xmlSecOpenSSLKeyDataAesId">xmlSecOpenSSLKeyDataAesId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataAesId</programlisting>
 <para>
 The AES key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataAesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataAesGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataAesGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataAesGetKlass"><primary sortas="xmlSecOpenSSLKeyDataAesGetKlass">xmlSecOpenSSLKeyDataAesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataAesGetKlass     (void);</programlisting>
 <para>
 The AES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataAesSet      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataAesSet" role="function">
+<title>xmlSecOpenSSLKeyDataAesSet ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataAesSet"><primary sortas="xmlSecOpenSSLKeyDataAesSet">xmlSecOpenSSLKeyDataAesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataAesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of AES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to AES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes128CbcId</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformAes128CbcId</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes128CbcId" role="macro">
+<title>xmlSecOpenSSLTransformAes128CbcId</title>
+<indexterm zone="xmlSecOpenSSLTransformAes128CbcId"><primary sortas="xmlSecOpenSSLTransformAes128CbcId">xmlSecOpenSSLTransformAes128CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes128CbcId</programlisting>
 <para>
 The AES128 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformAes128CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes128CbcGetKlass" role="function">
+<title>xmlSecOpenSSLTransformAes128CbcGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformAes128CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes128CbcGetKlass">xmlSecOpenSSLTransformAes128CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes128CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 128 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 128 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 128 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes192CbcId</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformAes192CbcId</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes192CbcId" role="macro">
+<title>xmlSecOpenSSLTransformAes192CbcId</title>
+<indexterm zone="xmlSecOpenSSLTransformAes192CbcId"><primary sortas="xmlSecOpenSSLTransformAes192CbcId">xmlSecOpenSSLTransformAes192CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes192CbcId</programlisting>
 <para>
 The AES192 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformAes192CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes192CbcGetKlass" role="function">
+<title>xmlSecOpenSSLTransformAes192CbcGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformAes192CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes192CbcGetKlass">xmlSecOpenSSLTransformAes192CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes192CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 192 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 192 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 192 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes256CbcId</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformAes256CbcId</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes256CbcId" role="macro">
+<title>xmlSecOpenSSLTransformAes256CbcId</title>
+<indexterm zone="xmlSecOpenSSLTransformAes256CbcId"><primary sortas="xmlSecOpenSSLTransformAes256CbcId">xmlSecOpenSSLTransformAes256CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformAes256CbcId</programlisting>
 <para>
 The AES256 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformAes256CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformAes256CbcGetKlass" role="function">
+<title>xmlSecOpenSSLTransformAes256CbcGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformAes256CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformAes256CbcGetKlass">xmlSecOpenSSLTransformAes256CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformAes256CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 AES 256 CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to AES 256 CBC encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to AES 256 CBC encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes128Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformKWAes128Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes128Id" role="macro">
+<title>xmlSecOpenSSLTransformKWAes128Id</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes128Id"><primary sortas="xmlSecOpenSSLTransformKWAes128Id">xmlSecOpenSSLTransformKWAes128Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes128Id</programlisting>
 <para>
 The AES 128 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformKWAes128GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes128GetKlass" role="function">
+<title>xmlSecOpenSSLTransformKWAes128GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes128GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes128GetKlass">xmlSecOpenSSLTransformKWAes128GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes128GetKlass
+                                                        (void);</programlisting>
 <para>
 The AES-128 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-128 kew wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-128 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes192Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformKWAes192Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes192Id" role="macro">
+<title>xmlSecOpenSSLTransformKWAes192Id</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes192Id"><primary sortas="xmlSecOpenSSLTransformKWAes192Id">xmlSecOpenSSLTransformKWAes192Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes192Id</programlisting>
 <para>
 The AES 192 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformKWAes192GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes192GetKlass" role="function">
+<title>xmlSecOpenSSLTransformKWAes192GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes192GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes192GetKlass">xmlSecOpenSSLTransformKWAes192GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes192GetKlass
+                                                        (void);</programlisting>
 <para>
 The AES-192 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-192 kew wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-192 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes256Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformKWAes256Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes256Id" role="macro">
+<title>xmlSecOpenSSLTransformKWAes256Id</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes256Id"><primary sortas="xmlSecOpenSSLTransformKWAes256Id">xmlSecOpenSSLTransformKWAes256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWAes256Id</programlisting>
 <para>
 The AES 256 key wrap transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformKWAes256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWAes256GetKlass" role="function">
+<title>xmlSecOpenSSLTransformKWAes256GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformKWAes256GetKlass"><primary sortas="xmlSecOpenSSLTransformKWAes256GetKlass">xmlSecOpenSSLTransformKWAes256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWAes256GetKlass
+                                                        (void);</programlisting>
 <para>
 The AES-256 kew wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>AES-256 kew wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> AES-256 kew wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDesId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataDesId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDesId" role="macro">
+<title>xmlSecOpenSSLKeyDataDesId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDesId"><primary sortas="xmlSecOpenSSLKeyDataDesId">xmlSecOpenSSLKeyDataDesId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataDesId</programlisting>
 <para>
 The DES key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataDesGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDesGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataDesGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDesGetKlass"><primary sortas="xmlSecOpenSSLKeyDataDesGetKlass">xmlSecOpenSSLKeyDataDesGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataDesGetKlass     (void);</programlisting>
 <para>
 The DES key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DES key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DES key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataDesSet      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDesSet" role="function">
+<title>xmlSecOpenSSLKeyDataDesSet ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDesSet"><primary sortas="xmlSecOpenSSLKeyDataDesSet">xmlSecOpenSSLKeyDataDesSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDesSet          (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of DES key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DES key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</title>
-<indexterm><primary>xmlSecOpenSSLTransformDes3CbcId</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformDes3CbcId</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformDes3CbcId" role="macro">
+<title>xmlSecOpenSSLTransformDes3CbcId</title>
+<indexterm zone="xmlSecOpenSSLTransformDes3CbcId"><primary sortas="xmlSecOpenSSLTransformDes3CbcId">xmlSecOpenSSLTransformDes3CbcId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformDes3CbcId</programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformDes3CbcGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformDes3CbcGetKlass" role="function">
+<title>xmlSecOpenSSLTransformDes3CbcGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformDes3CbcGetKlass"><primary sortas="xmlSecOpenSSLTransformDes3CbcGetKlass">xmlSecOpenSSLTransformDes3CbcGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformDes3CbcGetKlass
+                                                        (void);</programlisting>
 <para>
 Triple DES CBC encryption transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Triple DES encryption transform.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Triple DES encryption transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWDes3Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformKWDes3Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWDes3Id" role="macro">
+<title>xmlSecOpenSSLTransformKWDes3Id</title>
+<indexterm zone="xmlSecOpenSSLTransformKWDes3Id"><primary sortas="xmlSecOpenSSLTransformKWDes3Id">xmlSecOpenSSLTransformKWDes3Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformKWDes3Id</programlisting>
 <para>
 The DES3 CBC cipher transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformKWDes3GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformKWDes3GetKlass" role="function">
+<title>xmlSecOpenSSLTransformKWDes3GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformKWDes3GetKlass"><primary sortas="xmlSecOpenSSLTransformKWDes3GetKlass">xmlSecOpenSSLTransformKWDes3GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformKWDes3GetKlass
+                                                        (void);</programlisting>
 <para>
 The Triple DES key wrapper transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Triple DES key wrapper transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Triple DES key wrapper transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataDsaId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaId" role="macro">
+<title>xmlSecOpenSSLKeyDataDsaId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaId"><primary sortas="xmlSecOpenSSLKeyDataDsaId">xmlSecOpenSSLKeyDataDsaId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataDsaId</programlisting>
 <para>
 The DSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataDsaGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataDsaGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetKlass"><primary sortas="xmlSecOpenSSLKeyDataDsaGetKlass">xmlSecOpenSSLKeyDataDsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataDsaGetKlass     (void);</programlisting>
 <para>
 The DSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to DSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to DSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaAdoptDsa</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataDsaAdoptDsa (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="DSA-CAPS">DSA</link> *dsa);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaAdoptDsa" role="function">
+<title>xmlSecOpenSSLKeyDataDsaAdoptDsa ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptDsa"><primary sortas="xmlSecOpenSSLKeyDataDsaAdoptDsa">xmlSecOpenSSLKeyDataDsaAdoptDsa</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="DSA--CAPS">DSA</link> *dsa);</programlisting>
 <para>
 Sets the value of DSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dsa</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsa</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL DSA key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaGetDsa</primary></indexterm><programlisting><link linkend="DSA-CAPS">DSA</link>*        xmlSecOpenSSLKeyDataDsaGetDsa   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaGetDsa" role="function">
+<title>xmlSecOpenSSLKeyDataDsaGetDsa ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetDsa"><primary sortas="xmlSecOpenSSLKeyDataDsaGetDsa">xmlSecOpenSSLKeyDataDsaGetDsa</primary></indexterm><programlisting><link linkend="DSA--CAPS">DSA</link>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the OpenSSL DSA key from DSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL DSA key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL DSA key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataDsaAdoptEvp (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaAdoptEvp" role="function">
+<title>xmlSecOpenSSLKeyDataDsaAdoptEvp ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaAdoptEvp"><primary sortas="xmlSecOpenSSLKeyDataDsaAdoptEvp">xmlSecOpenSSLKeyDataDsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
 <para>
 Sets the DSA key data value to OpenSSL EVP key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pKey</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL EVP key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataDsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   xmlSecOpenSSLKeyDataDsaGetEvp   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataDsaGetEvp" role="function">
+<title>xmlSecOpenSSLKeyDataDsaGetEvp ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataDsaGetEvp"><primary sortas="xmlSecOpenSSLKeyDataDsaGetEvp">xmlSecOpenSSLKeyDataDsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the OpenSSL EVP key from DSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to DSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL EVP key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL EVP key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformDsaSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformDsaSha1Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformDsaSha1Id" role="macro">
+<title>xmlSecOpenSSLTransformDsaSha1Id</title>
+<indexterm zone="xmlSecOpenSSLTransformDsaSha1Id"><primary sortas="xmlSecOpenSSLTransformDsaSha1Id">xmlSecOpenSSLTransformDsaSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformDsaSha1Id</programlisting>
 <para>
 The DSA SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformDsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformDsaSha1GetKlass" role="function">
+<title>xmlSecOpenSSLTransformDsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformDsaSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformDsaSha1GetKlass">xmlSecOpenSSLTransformDsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformDsaSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The DSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>DSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> DSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength ()</title>
-<indexterm><primary>xmlSecOpenSSLHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLHmacGetMinOutputLength
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLHmacGetMinOutputLength" role="function">
+<title>xmlSecOpenSSLHmacGetMinOutputLength ()</title>
+<indexterm zone="xmlSecOpenSSLHmacGetMinOutputLength"><primary sortas="xmlSecOpenSSLHmacGetMinOutputLength">xmlSecOpenSSLHmacGetMinOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLHmacGetMinOutputLength (void);</programlisting>
 <para>
 Gets the value of min HMAC length.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the min HMAC output length
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the min HMAC output length
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength ()</title>
-<indexterm><primary>xmlSecOpenSSLHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecOpenSSLHmacSetMinOutputLength
-                                            (<link linkend="int">int</link> min_length);</programlisting>
+<refsect2 id="xmlSecOpenSSLHmacSetMinOutputLength" role="function">
+<title>xmlSecOpenSSLHmacSetMinOutputLength ()</title>
+<indexterm zone="xmlSecOpenSSLHmacSetMinOutputLength"><primary sortas="xmlSecOpenSSLHmacSetMinOutputLength">xmlSecOpenSSLHmacSetMinOutputLength</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecOpenSSLHmacSetMinOutputLength (<link linkend="int">int</link> min_length);</programlisting>
 <para>
 Sets the min HMAC output length</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>min_length</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>min_length</parameter>&#160;:</term>
 <listitem><simpara> the new min length 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataHmacId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataHmacId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataHmacId" role="macro">
+<title>xmlSecOpenSSLKeyDataHmacId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacId"><primary sortas="xmlSecOpenSSLKeyDataHmacId">xmlSecOpenSSLKeyDataHmacId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataHmacId</programlisting>
 <para>
 The DHMAC key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataHmacGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataHmacGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataHmacGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacGetKlass"><primary sortas="xmlSecOpenSSLKeyDataHmacGetKlass">xmlSecOpenSSLKeyDataHmacGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataHmacGetKlass    (void);</programlisting>
 <para>
 The HMAC key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>HMAC key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> HMAC key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataHmacSet     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataHmacSet" role="function">
+<title>xmlSecOpenSSLKeyDataHmacSet ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataHmacSet"><primary sortas="xmlSecOpenSSLKeyDataHmacSet">xmlSecOpenSSLKeyDataHmacSet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataHmacSet         (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufSize);</programlisting>
 <para>
 Sets the value of HMAC key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to HMAC key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufSize</parameter>&#160;:</term>
 <listitem><simpara>		the key value size (in bytes).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacMd5Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacMd5Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacMd5Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacMd5Id"><primary sortas="xmlSecOpenSSLTransformHmacMd5Id">xmlSecOpenSSLTransformHmacMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacMd5Id</programlisting>
 <para>
 The HMAC with MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacMd5GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacMd5GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacMd5GetKlass">xmlSecOpenSSLTransformHmacMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacMd5GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-MD5 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-MD5 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-MD5 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacRipemd160Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacRipemd160Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacRipemd160Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacRipemd160Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160Id"><primary sortas="xmlSecOpenSSLTransformHmacRipemd160Id">xmlSecOpenSSLTransformHmacRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacRipemd160Id</programlisting>
 <para>
 The HMAC with RipeMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacRipemd160GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacRipemd160GetKlass">xmlSecOpenSSLTransformHmacRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-RIPEMD160 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-RIPEMD160 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-RIPEMD160 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha1Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha1Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacSha1Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha1Id"><primary sortas="xmlSecOpenSSLTransformHmacSha1Id">xmlSecOpenSSLTransformHmacSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha1Id</programlisting>
 <para>
 The HMAC with SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha1GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacSha1GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha1GetKlass">xmlSecOpenSSLTransformHmacSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA1 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA1 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA1 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha224Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha224Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha224Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacSha224Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha224Id"><primary sortas="xmlSecOpenSSLTransformHmacSha224Id">xmlSecOpenSSLTransformHmacSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha224Id</programlisting>
 <para>
 The HMAC with SHA224 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha224GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacSha224GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha224GetKlass">xmlSecOpenSSLTransformHmacSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha224GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA224 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA224 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA224 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha256Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha256Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha256Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacSha256Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha256Id"><primary sortas="xmlSecOpenSSLTransformHmacSha256Id">xmlSecOpenSSLTransformHmacSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha256Id</programlisting>
 <para>
 The HMAC with SHA256 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha256GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacSha256GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha256GetKlass">xmlSecOpenSSLTransformHmacSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha256GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA256 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA256 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA256 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha384Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha384Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha384Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacSha384Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha384Id"><primary sortas="xmlSecOpenSSLTransformHmacSha384Id">xmlSecOpenSSLTransformHmacSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha384Id</programlisting>
 <para>
 The HMAC with SHA384 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha384GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacSha384GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha384GetKlass">xmlSecOpenSSLTransformHmacSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha384GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA384 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA384 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA384 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha512Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformHmacSha512Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha512Id" role="macro">
+<title>xmlSecOpenSSLTransformHmacSha512Id</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha512Id"><primary sortas="xmlSecOpenSSLTransformHmacSha512Id">xmlSecOpenSSLTransformHmacSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformHmacSha512Id</programlisting>
 <para>
 The HMAC with SHA512 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformHmacSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformHmacSha512GetKlass" role="function">
+<title>xmlSecOpenSSLTransformHmacSha512GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformHmacSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformHmacSha512GetKlass">xmlSecOpenSSLTransformHmacSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformHmacSha512GetKlass
+                                                        (void);</programlisting>
 <para>
 The HMAC-SHA512 transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the HMAC-SHA512 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the HMAC-SHA512 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformMd5Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformMd5Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformMd5Id" role="macro">
+<title>xmlSecOpenSSLTransformMd5Id</title>
+<indexterm zone="xmlSecOpenSSLTransformMd5Id"><primary sortas="xmlSecOpenSSLTransformMd5Id">xmlSecOpenSSLTransformMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformMd5Id</programlisting>
 <para>
 The MD5 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformMd5GetKlass" role="function">
+<title>xmlSecOpenSSLTransformMd5GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformMd5GetKlass">xmlSecOpenSSLTransformMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformMd5GetKlass   (void);</programlisting>
 <para>
 MD5 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to MD5 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to MD5 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRipemd160Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRipemd160Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRipemd160Id" role="macro">
+<title>xmlSecOpenSSLTransformRipemd160Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRipemd160Id"><primary sortas="xmlSecOpenSSLTransformRipemd160Id">xmlSecOpenSSLTransformRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRipemd160Id</programlisting>
 <para>
 The RIPEMD160 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRipemd160GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformRipemd160GetKlass">xmlSecOpenSSLTransformRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 RIPEMD-160 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to RIPEMD-160 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to RIPEMD-160 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataRsaId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaId" role="macro">
+<title>xmlSecOpenSSLKeyDataRsaId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaId"><primary sortas="xmlSecOpenSSLKeyDataRsaId">xmlSecOpenSSLKeyDataRsaId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataRsaId</programlisting>
 <para>
 The RSA key klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataRsaGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataRsaGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetKlass"><primary sortas="xmlSecOpenSSLKeyDataRsaGetKlass">xmlSecOpenSSLKeyDataRsaGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataRsaGetKlass     (void);</programlisting>
 <para>
 The OpenSSL RSA key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL RSA key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL RSA key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaAdoptRsa</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataRsaAdoptRsa (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="RSA-CAPS">RSA</link> *rsa);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaAdoptRsa" role="function">
+<title>xmlSecOpenSSLKeyDataRsaAdoptRsa ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptRsa"><primary sortas="xmlSecOpenSSLKeyDataRsaAdoptRsa">xmlSecOpenSSLKeyDataRsaAdoptRsa</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="RSA--CAPS">RSA</link> *rsa);</programlisting>
 <para>
 Sets the value of RSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to RSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>rsa</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>rsa</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL RSA key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaGetRsa</primary></indexterm><programlisting><link linkend="RSA-CAPS">RSA</link>*        xmlSecOpenSSLKeyDataRsaGetRsa   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaGetRsa" role="function">
+<title>xmlSecOpenSSLKeyDataRsaGetRsa ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetRsa"><primary sortas="xmlSecOpenSSLKeyDataRsaGetRsa">xmlSecOpenSSLKeyDataRsaGetRsa</primary></indexterm><programlisting><link linkend="RSA--CAPS">RSA</link>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the OpenSSL RSA key from RSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to RSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL RSA key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL RSA key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataRsaAdoptEvp (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaAdoptEvp" role="function">
+<title>xmlSecOpenSSLKeyDataRsaAdoptEvp ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaAdoptEvp"><primary sortas="xmlSecOpenSSLKeyDataRsaAdoptEvp">xmlSecOpenSSLKeyDataRsaAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
 <para>
 Sets the RSA key data value to OpenSSL EVP key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to RSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pKey</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL EVP key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   xmlSecOpenSSLKeyDataRsaGetEvp   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRsaGetEvp" role="function">
+<title>xmlSecOpenSSLKeyDataRsaGetEvp ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRsaGetEvp"><primary sortas="xmlSecOpenSSLKeyDataRsaGetEvp">xmlSecOpenSSLKeyDataRsaGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the OpenSSL EVP key from RSA key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to RSA key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL EVP key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL EVP key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaMd5Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaMd5Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaMd5Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaMd5Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaMd5Id"><primary sortas="xmlSecOpenSSLTransformRsaMd5Id">xmlSecOpenSSLTransformRsaMd5Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaMd5Id</programlisting>
 <para>
 The RSA-MD5 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaMd5GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaMd5GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaMd5GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaMd5GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaMd5GetKlass">xmlSecOpenSSLTransformRsaMd5GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaMd5GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-MD5 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-MD5 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-MD5 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaRipemd160Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaRipemd160Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaRipemd160Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaRipemd160Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160Id"><primary sortas="xmlSecOpenSSLTransformRsaRipemd160Id">xmlSecOpenSSLTransformRsaRipemd160Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaRipemd160Id</programlisting>
 <para>
 The RSA-RIPEMD160 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaRipemd160GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaRipemd160GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaRipemd160GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaRipemd160GetKlass">xmlSecOpenSSLTransformRsaRipemd160GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-RIPEMD160 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-RIPEMD160 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-RIPEMD160 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha1Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha1Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaSha1Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha1Id"><primary sortas="xmlSecOpenSSLTransformRsaSha1Id">xmlSecOpenSSLTransformRsaSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha1Id</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha1GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaSha1GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha1GetKlass">xmlSecOpenSSLTransformRsaSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha1GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA1 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA1 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA1 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha224Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha224Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha224Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaSha224Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha224Id"><primary sortas="xmlSecOpenSSLTransformRsaSha224Id">xmlSecOpenSSLTransformRsaSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha224Id</programlisting>
 <para>
 The RSA-SHA224 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha224GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaSha224GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha224GetKlass">xmlSecOpenSSLTransformRsaSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha224GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA224 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA224 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA224 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha256Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha256Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha256Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaSha256Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha256Id"><primary sortas="xmlSecOpenSSLTransformRsaSha256Id">xmlSecOpenSSLTransformRsaSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha256Id</programlisting>
 <para>
 The RSA-SHA256 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha256GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaSha256GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha256GetKlass">xmlSecOpenSSLTransformRsaSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha256GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA256 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA256 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA256 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha384Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha384Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha384Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaSha384Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha384Id"><primary sortas="xmlSecOpenSSLTransformRsaSha384Id">xmlSecOpenSSLTransformRsaSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha384Id</programlisting>
 <para>
 The RSA-SHA384 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha384GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaSha384GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha384GetKlass">xmlSecOpenSSLTransformRsaSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha384GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA384 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA384 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA384 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha512Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaSha512Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha512Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaSha512Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha512Id"><primary sortas="xmlSecOpenSSLTransformRsaSha512Id">xmlSecOpenSSLTransformRsaSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaSha512Id</programlisting>
 <para>
 The RSA-SHA512 signature transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaSha512GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaSha512GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaSha512GetKlass">xmlSecOpenSSLTransformRsaSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaSha512GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-SHA512 signature transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-SHA512 signature transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-SHA512 signature transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaPkcs1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaPkcs1Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaPkcs1Id" role="macro">
+<title>xmlSecOpenSSLTransformRsaPkcs1Id</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1Id"><primary sortas="xmlSecOpenSSLTransformRsaPkcs1Id">xmlSecOpenSSLTransformRsaPkcs1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaPkcs1Id</programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaPkcs1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaPkcs1GetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaPkcs1GetKlass"><primary sortas="xmlSecOpenSSLTransformRsaPkcs1GetKlass">xmlSecOpenSSLTransformRsaPkcs1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-PKCS1 key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-PKCS1 key transport transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-PKCS1 key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaOaepId</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformRsaOaepId</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaOaepId" role="macro">
+<title>xmlSecOpenSSLTransformRsaOaepId</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaOaepId"><primary sortas="xmlSecOpenSSLTransformRsaOaepId">xmlSecOpenSSLTransformRsaOaepId</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformRsaOaepId</programlisting>
 <para>
 The RSA PKCS1 key transport transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformRsaOaepGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformRsaOaepGetKlass" role="function">
+<title>xmlSecOpenSSLTransformRsaOaepGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformRsaOaepGetKlass"><primary sortas="xmlSecOpenSSLTransformRsaOaepGetKlass">xmlSecOpenSSLTransformRsaOaepGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformRsaOaepGetKlass
+                                                        (void);</programlisting>
 <para>
 The RSA-OAEP key transport transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>RSA-OAEP key transport transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> RSA-OAEP key transport transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha1Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformSha1Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha1Id" role="macro">
+<title>xmlSecOpenSSLTransformSha1Id</title>
+<indexterm zone="xmlSecOpenSSLTransformSha1Id"><primary sortas="xmlSecOpenSSLTransformSha1Id">xmlSecOpenSSLTransformSha1Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha1Id</programlisting>
 <para>
 The SHA1 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformSha1GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha1GetKlass" role="function">
+<title>xmlSecOpenSSLTransformSha1GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformSha1GetKlass"><primary sortas="xmlSecOpenSSLTransformSha1GetKlass">xmlSecOpenSSLTransformSha1GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha1GetKlass  (void);</programlisting>
 <para>
 SHA-1 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-1 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-1 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha224Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformSha224Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha224Id" role="macro">
+<title>xmlSecOpenSSLTransformSha224Id</title>
+<indexterm zone="xmlSecOpenSSLTransformSha224Id"><primary sortas="xmlSecOpenSSLTransformSha224Id">xmlSecOpenSSLTransformSha224Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha224Id</programlisting>
 <para>
 The SHA224 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformSha224GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha224GetKlass" role="function">
+<title>xmlSecOpenSSLTransformSha224GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformSha224GetKlass"><primary sortas="xmlSecOpenSSLTransformSha224GetKlass">xmlSecOpenSSLTransformSha224GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha224GetKlass
+                                                        (void);</programlisting>
 <para>
 SHA-224 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-224 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-224 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha256Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformSha256Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha256Id" role="macro">
+<title>xmlSecOpenSSLTransformSha256Id</title>
+<indexterm zone="xmlSecOpenSSLTransformSha256Id"><primary sortas="xmlSecOpenSSLTransformSha256Id">xmlSecOpenSSLTransformSha256Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha256Id</programlisting>
 <para>
 The SHA256 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformSha256GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha256GetKlass" role="function">
+<title>xmlSecOpenSSLTransformSha256GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformSha256GetKlass"><primary sortas="xmlSecOpenSSLTransformSha256GetKlass">xmlSecOpenSSLTransformSha256GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha256GetKlass
+                                                        (void);</programlisting>
 <para>
 SHA-256 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-256 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-256 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha384Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformSha384Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha384Id" role="macro">
+<title>xmlSecOpenSSLTransformSha384Id</title>
+<indexterm zone="xmlSecOpenSSLTransformSha384Id"><primary sortas="xmlSecOpenSSLTransformSha384Id">xmlSecOpenSSLTransformSha384Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha384Id</programlisting>
 <para>
 The SHA384 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformSha384GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha384GetKlass" role="function">
+<title>xmlSecOpenSSLTransformSha384GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformSha384GetKlass"><primary sortas="xmlSecOpenSSLTransformSha384GetKlass">xmlSecOpenSSLTransformSha384GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha384GetKlass
+                                                        (void);</programlisting>
 <para>
 SHA-384 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-384 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-384 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha512Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLTransformSha512Id</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha512Id" role="macro">
+<title>xmlSecOpenSSLTransformSha512Id</title>
+<indexterm zone="xmlSecOpenSSLTransformSha512Id"><primary sortas="xmlSecOpenSSLTransformSha512Id">xmlSecOpenSSLTransformSha512Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLTransformSha512Id</programlisting>
 <para>
 The SHA512 digest transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecOpenSSLTransformSha512GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLTransformSha512GetKlass" role="function">
+<title>xmlSecOpenSSLTransformSha512GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLTransformSha512GetKlass"><primary sortas="xmlSecOpenSSLTransformSha512GetKlass">xmlSecOpenSSLTransformSha512GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecOpenSSLTransformSha512GetKlass
+                                                        (void);</programlisting>
 <para>
 SHA-512 digest transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to SHA-512 digest transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to SHA-512 digest transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-OPENSSL-ERRORS-LIB-CAPS">XMLSEC_OPENSSL_ERRORS_LIB</title>
-<indexterm><primary>XMLSEC_OPENSSL_ERRORS_LIB</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_LIB			(ERR_LIB_USER + 57)
+<refsect2 id="XMLSEC-OPENSSL-ERRORS-LIB--CAPS" role="macro">
+<title>XMLSEC_OPENSSL_ERRORS_LIB</title>
+<indexterm zone="XMLSEC-OPENSSL-ERRORS-LIB--CAPS"><primary sortas="XMLSEC_OPENSSL_ERRORS_LIB">XMLSEC_OPENSSL_ERRORS_LIB</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_LIB			(ERR_LIB_USER + 57)
 </programlisting>
 <para>
 Macro. The XMLSec library klass for OpenSSL errors reporting functions.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</title>
-<indexterm><primary>XMLSEC_OPENSSL_ERRORS_FUNCTION</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_FUNCTION			0
+<refsect2 id="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS" role="macro">
+<title>XMLSEC_OPENSSL_ERRORS_FUNCTION</title>
+<indexterm zone="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS"><primary sortas="XMLSEC_OPENSSL_ERRORS_FUNCTION">XMLSEC_OPENSSL_ERRORS_FUNCTION</primary></indexterm><programlisting>#define XMLSEC_OPENSSL_ERRORS_FUNCTION			0
 </programlisting>
 <para>
 Macro. The XMLSec library functions OpenSSL errors reporting functions.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback ()</title>
-<indexterm><primary>xmlSecOpenSSLErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecOpenSSLErrorsDefaultCallback
-                                            (const <link linkend="char">char</link> *file,
-                                             <link linkend="int">int</link> line,
-                                             const <link linkend="char">char</link> *func,
-                                             const <link linkend="char">char</link> *errorObject,
-                                             const <link linkend="char">char</link> *errorSubject,
-                                             <link linkend="int">int</link> reason,
-                                             const <link linkend="char">char</link> *msg);</programlisting>
+<refsect2 id="xmlSecOpenSSLErrorsDefaultCallback" role="function">
+<title>xmlSecOpenSSLErrorsDefaultCallback ()</title>
+<indexterm zone="xmlSecOpenSSLErrorsDefaultCallback"><primary sortas="xmlSecOpenSSLErrorsDefaultCallback">xmlSecOpenSSLErrorsDefaultCallback</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecOpenSSLErrorsDefaultCallback  (const <link linkend="char">char</link> *file,
+                                                         <link linkend="int">int</link> line,
+                                                         const <link linkend="char">char</link> *func,
+                                                         const <link linkend="char">char</link> *errorObject,
+                                                         const <link linkend="char">char</link> *errorSubject,
+                                                         <link linkend="int">int</link> reason,
+                                                         const <link linkend="char">char</link> *msg);</programlisting>
 <para>
 The default OpenSSL errors reporting callback function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara>		the error location file name (__FILE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>line</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>line</parameter>&#160;:</term>
 <listitem><simpara>		the error location line number (__LINE__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>func</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
 <listitem><simpara>		the error location function name (__FUNCTION__ macro).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorObject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorObject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error object 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>errorSubject</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>errorSubject</parameter>&#160;:</term>
 <listitem><simpara>	the error specific error subject.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>reason</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>reason</parameter>&#160;:</term>
 <listitem><simpara>		the error code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>msg</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>msg</parameter>&#160;:</term>
 <listitem><simpara>		the additional error message.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/openssl/evp.sgml b/docs/api/sgml/openssl/evp.sgml
index 84af367..bbc141a 100644
--- a/docs/api/sgml/openssl/evp.sgml
+++ b/docs/api/sgml/openssl/evp.sgml
@@ -1,25 +1,24 @@
 <refentry id="xmlsec-openssl-evp">
 <refmeta>
-<refentrytitle>evp</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-openssl-evp.top_of_page">evp</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>evp</refname><refpurpose>EVP keys data implementation.</refpurpose>
+<refname>evp</refname>
+<refpurpose>EVP keys data implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-openssl-evp.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);
-<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   <link linkend="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   <link linkend="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</link>          (<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</link>   (<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
+<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</link>       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           <link linkend="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</link>              (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</link>            (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);
 </synopsis>
 </refsynopsisdiv>
 
@@ -31,73 +30,69 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-openssl-evp.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 EVP keys data implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLEvpKeyDataAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLEvpKeyDataAdoptEvp (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);</programlisting>
+<refsect1 id="xmlsec-openssl-evp.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecOpenSSLEvpKeyDataAdoptEvp" role="function">
+<title>xmlSecOpenSSLEvpKeyDataAdoptEvp ()</title>
+<indexterm zone="xmlSecOpenSSLEvpKeyDataAdoptEvp"><primary sortas="xmlSecOpenSSLEvpKeyDataAdoptEvp">xmlSecOpenSSLEvpKeyDataAdoptEvp</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
 <para>
 Sets the value of key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL EVP key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pKey</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to EVP key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp ()</title>
-<indexterm><primary>xmlSecOpenSSLEvpKeyDataGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   xmlSecOpenSSLEvpKeyDataGetEvp   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLEvpKeyDataGetEvp" role="function">
+<title>xmlSecOpenSSLEvpKeyDataGetEvp ()</title>
+<indexterm zone="xmlSecOpenSSLEvpKeyDataGetEvp"><primary sortas="xmlSecOpenSSLEvpKeyDataGetEvp">xmlSecOpenSSLEvpKeyDataGetEvp</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the EVP_PKEY from the key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL EVP data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to EVP_PKEY or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to EVP_PKEY or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup ()</title>
-<indexterm><primary>xmlSecOpenSSLEvpKeyDup</primary></indexterm><programlisting><link linkend="EVP-PKEY-CAPS">EVP_PKEY</link>*   xmlSecOpenSSLEvpKeyDup          (<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);</programlisting>
+<refsect2 id="xmlSecOpenSSLEvpKeyDup" role="function">
+<title>xmlSecOpenSSLEvpKeyDup ()</title>
+<indexterm zone="xmlSecOpenSSLEvpKeyDup"><primary sortas="xmlSecOpenSSLEvpKeyDup">xmlSecOpenSSLEvpKeyDup</primary></indexterm><programlisting><link linkend="EVP-PKEY--CAPS">EVP_PKEY</link>*           xmlSecOpenSSLEvpKeyDup              (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
 <para>
 Duplicates <parameter>pKey</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pKey</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to EVP_PKEY.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created EVP_PKEY object or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created EVP_PKEY object or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt ()</title>
-<indexterm><primary>xmlSecOpenSSLEvpKeyAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecOpenSSLEvpKeyAdopt   (<link linkend="EVP-PKEY-CAPS">EVP_PKEY</link> *pKey);</programlisting>
+<refsect2 id="xmlSecOpenSSLEvpKeyAdopt" role="function">
+<title>xmlSecOpenSSLEvpKeyAdopt ()</title>
+<indexterm zone="xmlSecOpenSSLEvpKeyAdopt"><primary sortas="xmlSecOpenSSLEvpKeyAdopt">xmlSecOpenSSLEvpKeyAdopt</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecOpenSSLEvpKeyAdopt            (<link linkend="EVP-PKEY--CAPS">EVP_PKEY</link> *pKey);</programlisting>
 <para>
 Creates xmlsec key object from OpenSSL key object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>pKey</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pKey</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to EVP_PKEY.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created xmlsec key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created xmlsec key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/openssl/x509.sgml b/docs/api/sgml/openssl/x509.sgml
index 30b6c7c..e03b9c9 100644
--- a/docs/api/sgml/openssl/x509.sgml
+++ b/docs/api/sgml/openssl/x509.sgml
@@ -1,73 +1,63 @@
 <refentry id="xmlsec-openssl-x509">
 <refmeta>
-<refentrytitle>x509</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-openssl-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC-OPENSSL Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>x509</refname><refpurpose>X509 certificates support implementation for OpenSSL.</refpurpose>
+<refname>x509</refname>
+<refpurpose>X509 certificates support implementation for OpenSSL.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-openssl-x509.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</link>
-#define     <link linkend="XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</link>
-#define     <link linkend="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</link>
-                                            (void);
-<link linkend="X509-CAPS">X509</link>*       <link linkend="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CAPS">X509</link> *cert);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CAPS">X509</link> *cert);
-<link linkend="X509-CAPS">X509</link>*       <link linkend="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CRL-CAPS">X509_CRL</link> *crl);
-<link linkend="X509-CRL-CAPS">X509_CRL</link>*   <link linkend="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</link>
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
-<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> <link linkend="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</link>
-                                            (<link linkend="X509-CAPS">X509</link> *cert);
-#define     <link linkend="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</link>
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> <link linkend="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</link>
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> <link linkend="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</link>
-                                            (void);
-<link linkend="X509-CAPS">X509</link>*       <link linkend="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="X509-CAPS">X509</link>*       <link linkend="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</link>    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</link> *certs,
-                                             <link linkend="XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</link> (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="X509-CAPS">X509</link> *cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="X509-CRL-CAPS">X509_CRL</link> *crl);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             const <link linkend="char">char</link> *path);
-<link linkend="int">int</link>         <link linkend="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</link>
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             const <link linkend="char">char</link> *file);
+#define             <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link>
+#define             <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link>
+#define             <link linkend="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</link>    (void);
+<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</link>  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509--CAPS">X509</link> *cert);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</link>   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509--CAPS">X509</link> *cert);
+<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</link>     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</link>
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</link>    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);
+<link linkend="X509-CRL--CAPS">X509_CRL</link>*           <link linkend="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</link>      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</link> (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);
+<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    <link linkend="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</link>         (<link linkend="X509--CAPS">X509</link> *cert);
+#define             <link linkend="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</link>
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     <link linkend="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</link>
+<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  <link linkend="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</link>    (void);
+<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</link>      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="X509--CAPS">X509</link>*               <link linkend="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</link>        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link> *certs,
+                                                         <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</link>     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="X509--CAPS">X509</link> *cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</link>      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *path);
+<link linkend="int">int</link>                 <link linkend="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</link>  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *file);
 </synopsis>
 </refsynopsisdiv>
 
@@ -79,388 +69,356 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-openssl-x509.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 X509 certificates support implementation for OpenSSL.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</title>
-<indexterm><primary>XMLSEC_STACK_OF_X509</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509		STACK_OF(X509)
+<refsect1 id="xmlsec-openssl-x509.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-STACK-OF-X509--CAPS" role="macro">
+<title>XMLSEC_STACK_OF_X509</title>
+<indexterm zone="XMLSEC-STACK-OF-X509--CAPS"><primary sortas="XMLSEC_STACK_OF_X509">XMLSEC_STACK_OF_X509</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509		STACK_OF(X509)
 </programlisting>
 <para>
 Macro. To make docbook happy.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</title>
-<indexterm><primary>XMLSEC_STACK_OF_X509_CRL</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509_CRL	STACK_OF(X509_CRL)
+<refsect2 id="XMLSEC-STACK-OF-X509-CRL--CAPS" role="macro">
+<title>XMLSEC_STACK_OF_X509_CRL</title>
+<indexterm zone="XMLSEC-STACK-OF-X509-CRL--CAPS"><primary sortas="XMLSEC_STACK_OF_X509_CRL">XMLSEC_STACK_OF_X509_CRL</primary></indexterm><programlisting>#define XMLSEC_STACK_OF_X509_CRL	STACK_OF(X509_CRL)
 </programlisting>
 <para>
 Macro. To make docbook happy.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509Id</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataX509Id</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509Id" role="macro">
+<title>xmlSecOpenSSLKeyDataX509Id</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509Id"><primary sortas="xmlSecOpenSSLKeyDataX509Id">xmlSecOpenSSLKeyDataX509Id</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataX509Id</programlisting>
 <para>
 The OpenSSL X509 data klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataX509GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetKlass"><primary sortas="xmlSecOpenSSLKeyDataX509GetKlass">xmlSecOpenSSLKeyDataX509GetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataX509GetKlass    (void);</programlisting>
 <para>
 The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-X509Data"><type>sec-X509Data</type></link>).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the X509 data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the X509 data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="X509-CAPS">X509</link>*       xmlSecOpenSSLKeyDataX509GetKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetKeyCert" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetKeyCert ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetKeyCert"><primary sortas="xmlSecOpenSSLKeyDataX509GetKeyCert">xmlSecOpenSSLKeyDataX509GetKeyCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the certificate from which the key was extracted.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the key's certificate or NULL if key data was not used for key
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataX509AdoptKeyCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CAPS">X509</link> *cert);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509AdoptKeyCert" role="function">
+<title>xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptKeyCert"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptKeyCert">xmlSecOpenSSLKeyDataX509AdoptKeyCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509--CAPS">X509</link> *cert);</programlisting>
 <para>
 Sets the key's certificate in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataX509AdoptCert
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CAPS">X509</link> *cert);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509AdoptCert" role="function">
+<title>xmlSecOpenSSLKeyDataX509AdoptCert ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCert"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptCert">xmlSecOpenSSLKeyDataX509AdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509--CAPS">X509</link> *cert);</programlisting>
 <para>
 Adds certificate to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="X509-CAPS">X509</link>*       xmlSecOpenSSLKeyDataX509GetCert (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetCert" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetCert ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCert"><primary sortas="xmlSecOpenSSLKeyDataX509GetCert">xmlSecOpenSSLKeyDataX509GetCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLKeyDataX509GetCert     (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a certificate from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to certificate or NULL if <parameter>pos</parameter> is larger than the 
 number of certificates in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecOpenSSLKeyDataX509GetCertsSize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetCertsSize" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetCertsSize ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCertsSize"><primary sortas="xmlSecOpenSSLKeyDataX509GetCertsSize">xmlSecOpenSSLKeyDataX509GetCertsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecOpenSSLKeyDataX509GetCertsSize
+                                                        (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of certificates in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of certificates in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of certificates in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLKeyDataX509AdoptCrl
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="X509-CRL-CAPS">X509_CRL</link> *crl);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509AdoptCrl" role="function">
+<title>xmlSecOpenSSLKeyDataX509AdoptCrl ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509AdoptCrl"><primary sortas="xmlSecOpenSSLKeyDataX509AdoptCrl">xmlSecOpenSSLKeyDataX509AdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);</programlisting>
 <para>
 Adds CRL to the X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>crl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL X509 CRL.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="X509-CRL-CAPS">X509_CRL</link>*   xmlSecOpenSSLKeyDataX509GetCrl  (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetCrl" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetCrl ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrl"><primary sortas="xmlSecOpenSSLKeyDataX509GetCrl">xmlSecOpenSSLKeyDataX509GetCrl</primary></indexterm><programlisting><link linkend="X509-CRL--CAPS">X509_CRL</link>*           xmlSecOpenSSLKeyDataX509GetCrl      (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets a CRL from X509 key data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>		the desired CRL position.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to CRL or NULL if <parameter>pos</parameter> is larger than the 
 number of CRLs in <parameter>data</parameter> or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecOpenSSLKeyDataX509GetCrlsSize
-                                            (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataX509GetCrlsSize" role="function">
+<title>xmlSecOpenSSLKeyDataX509GetCrlsSize ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataX509GetCrlsSize"><primary sortas="xmlSecOpenSSLKeyDataX509GetCrlsSize">xmlSecOpenSSLKeyDataX509GetCrlsSize</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> data);</programlisting>
 <para>
 Gets the number of CRLs in <parameter>data</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>te number of CRLs in <parameter>data</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> te number of CRLs in <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey ()</title>
-<indexterm><primary>xmlSecOpenSSLX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link> xmlSecOpenSSLX509CertGetKey
-                                            (<link linkend="X509-CAPS">X509</link> *cert);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509CertGetKey" role="function">
+<title>xmlSecOpenSSLX509CertGetKey ()</title>
+<indexterm zone="xmlSecOpenSSLX509CertGetKey"><primary sortas="xmlSecOpenSSLX509CertGetKey">xmlSecOpenSSLX509CertGetKey</primary></indexterm><programlisting><link linkend="xmlSecKeyData">xmlSecKeyDataPtr</link>    xmlSecOpenSSLX509CertGetKey         (<link linkend="X509--CAPS">X509</link> *cert);</programlisting>
 <para>
 Extracts public key from the <parameter>cert</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>public key value or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> public key value or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRawX509CertId</primary></indexterm><programlisting>#define     xmlSecOpenSSLKeyDataRawX509CertId</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRawX509CertId" role="macro">
+<title>xmlSecOpenSSLKeyDataRawX509CertId</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertId"><primary sortas="xmlSecOpenSSLKeyDataRawX509CertId">xmlSecOpenSSLKeyDataRawX509CertId</primary></indexterm><programlisting>#define             xmlSecOpenSSLKeyDataRawX509CertId</programlisting>
 <para>
 The OpenSSL raw X509 certificate klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> xmlSecOpenSSLKeyDataRawX509CertGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLKeyDataRawX509CertGetKlass" role="function">
+<title>xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLKeyDataRawX509CertGetKlass"><primary sortas="xmlSecOpenSSLKeyDataRawX509CertGetKlass">xmlSecOpenSSLKeyDataRawX509CertGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
+                                                        (void);</programlisting>
 <para>
 The raw X509 certificates key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>raw X509 certificates key data klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> raw X509 certificates key data klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreId</primary></indexterm><programlisting>#define     xmlSecOpenSSLX509StoreId</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreId" role="macro">
+<title>xmlSecOpenSSLX509StoreId</title>
+<indexterm zone="xmlSecOpenSSLX509StoreId"><primary sortas="xmlSecOpenSSLX509StoreId">xmlSecOpenSSLX509StoreId</primary></indexterm><programlisting>#define             xmlSecOpenSSLX509StoreId</programlisting>
 <para>
 The OpenSSL X509 store klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> xmlSecOpenSSLX509StoreGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreGetKlass" role="function">
+<title>xmlSecOpenSSLX509StoreGetKlass ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreGetKlass"><primary sortas="xmlSecOpenSSLX509StoreGetKlass">xmlSecOpenSSLX509StoreGetKlass</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  xmlSecOpenSSLX509StoreGetKlass    (void);</programlisting>
 <para>
 The OpenSSL X509 certificates key data store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to OpenSSL X509 certificates key data store klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to OpenSSL X509 certificates key data store klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreFindCert</primary></indexterm><programlisting><link linkend="X509-CAPS">X509</link>*       xmlSecOpenSSLX509StoreFindCert  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="xmlChar">xmlChar</link> *subjectName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerName,
-                                             <link linkend="xmlChar">xmlChar</link> *issuerSerial,
-                                             <link linkend="xmlChar">xmlChar</link> *ski,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreFindCert" role="function">
+<title>xmlSecOpenSSLX509StoreFindCert ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreFindCert"><primary sortas="xmlSecOpenSSLX509StoreFindCert">xmlSecOpenSSLX509StoreFindCert</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLX509StoreFindCert      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="xmlChar">xmlChar</link> *subjectName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerName,
+                                                         <link linkend="xmlChar">xmlChar</link> *issuerSerial,
+                                                         <link linkend="xmlChar">xmlChar</link> *ski,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Searches <parameter>store</parameter> for a certificate that matches given criteria.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subjectName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subjectName</parameter>&#160;:</term>
 <listitem><simpara>	the desired certificate name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate issuer name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerSerial</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerSerial</parameter>&#160;:</term>
 <listitem><simpara>	the desired certificate issuer serial number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ski</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ski</parameter>&#160;:</term>
 <listitem><simpara>		the desired certificate SKI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to found certificate or NULL if certificate is not found
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to found certificate or NULL if certificate is not found
 or an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreVerify</primary></indexterm><programlisting><link linkend="X509-CAPS">X509</link>*       xmlSecOpenSSLX509StoreVerify    (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</link> *certs,
-                                             <link linkend="XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreVerify" role="function">
+<title>xmlSecOpenSSLX509StoreVerify ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreVerify"><primary sortas="xmlSecOpenSSLX509StoreVerify">xmlSecOpenSSLX509StoreVerify</primary></indexterm><programlisting><link linkend="X509--CAPS">X509</link>*               xmlSecOpenSSLX509StoreVerify        (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</link> *certs,
+                                                         <link linkend="XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</link> *crls,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> *keyInfoCtx);</programlisting>
 <para>
 Verifies <parameter>certs</parameter> list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>certs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>certs</parameter>&#160;:</term>
 <listitem><simpara>		the untrusted certificates stack.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>crls</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crls</parameter>&#160;:</term>
 <listitem><simpara>		the crls stack.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the first verified certificate from <parameter>certs</parameter>.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the first verified certificate from <parameter>certs</parameter>.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLX509StoreAdoptCert (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="X509-CAPS">X509</link> *cert,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreAdoptCert" role="function">
+<title>xmlSecOpenSSLX509StoreAdoptCert ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreAdoptCert"><primary sortas="xmlSecOpenSSLX509StoreAdoptCert">xmlSecOpenSSLX509StoreAdoptCert</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAdoptCert     (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="X509--CAPS">X509</link> *cert,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Adds trusted (root) or untrusted certificate to the store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cert</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cert</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL X509 certificate.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the certificate type (trusted/untrusted).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreAdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLX509StoreAdoptCrl  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             <link linkend="X509-CRL-CAPS">X509_CRL</link> *crl);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreAdoptCrl" role="function">
+<title>xmlSecOpenSSLX509StoreAdoptCrl ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreAdoptCrl"><primary sortas="xmlSecOpenSSLX509StoreAdoptCrl">xmlSecOpenSSLX509StoreAdoptCrl</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAdoptCrl      (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         <link linkend="X509-CRL--CAPS">X509_CRL</link> *crl);</programlisting>
 <para>
 Adds X509 CRL to the store.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to X509 key data store klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>crl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>crl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to OpenSSL X509_CRL.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLX509StoreAddCertsPath
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             const <link linkend="char">char</link> *path);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreAddCertsPath" role="function">
+<title>xmlSecOpenSSLX509StoreAddCertsPath ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreAddCertsPath"><primary sortas="xmlSecOpenSSLX509StoreAddCertsPath">xmlSecOpenSSLX509StoreAddCertsPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAddCertsPath  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *path);</programlisting>
 <para>
 Adds all certs in the <parameter>path</parameter> to the list of trusted certs
 in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> the pointer to OpenSSL x509 store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>path</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>path</parameter>&#160;:</term>
 <listitem><simpara> the path to the certs dir.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile ()</title>
-<indexterm><primary>xmlSecOpenSSLX509StoreAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecOpenSSLX509StoreAddCertsFile
-                                            (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
-                                             const <link linkend="char">char</link> *file);</programlisting>
+<refsect2 id="xmlSecOpenSSLX509StoreAddCertsFile" role="function">
+<title>xmlSecOpenSSLX509StoreAddCertsFile ()</title>
+<indexterm zone="xmlSecOpenSSLX509StoreAddCertsFile"><primary sortas="xmlSecOpenSSLX509StoreAddCertsFile">xmlSecOpenSSLX509StoreAddCertsFile</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecOpenSSLX509StoreAddCertsFile  (<link linkend="xmlSecKeyDataStore">xmlSecKeyDataStorePtr</link> store,
+                                                         const <link linkend="char">char</link> *file);</programlisting>
 <para>
 Adds all certs in <parameter>file</parameter> to the list of trusted certs
 in <parameter>store</parameter>. It is possible for <parameter>file</parameter> to contain multiple certs.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>store</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>store</parameter>&#160;:</term>
 <listitem><simpara> the pointer to OpenSSL x509 store.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>file</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>file</parameter>&#160;:</term>
 <listitem><simpara> the certs file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom b/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom
index ecb31c6..56051d7 100644
--- a/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom
+++ b/docs/api/sgml/openssl/xmlsec-openssl-doc.bottom
@@ -1,5 +1,5 @@
+    &xmlsec-openssl-x509;
     &xmlsec-openssl-app;
+    &xmlsec-openssl-evp;
     &xmlsec-openssl-bn;
     &xmlsec-openssl-crypto;
-    &xmlsec-openssl-evp;
-    &xmlsec-openssl-x509;
diff --git a/docs/api/sgml/openssl/xmlsec-openssl-doc.top b/docs/api/sgml/openssl/xmlsec-openssl-doc.top
index 3718fe3..6e45bcc 100644
--- a/docs/api/sgml/openssl/xmlsec-openssl-doc.top
+++ b/docs/api/sgml/openssl/xmlsec-openssl-doc.top
@@ -1,5 +1,5 @@
+<!ENTITY xmlsec-openssl-x509 SYSTEM "sgml/x509.sgml">
 <!ENTITY xmlsec-openssl-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-openssl-evp SYSTEM "sgml/evp.sgml">
 <!ENTITY xmlsec-openssl-bn SYSTEM "sgml/bn.sgml">
 <!ENTITY xmlsec-openssl-crypto SYSTEM "sgml/crypto.sgml">
-<!ENTITY xmlsec-openssl-evp SYSTEM "sgml/evp.sgml">
-<!ENTITY xmlsec-openssl-x509 SYSTEM "sgml/x509.sgml">
diff --git a/docs/api/sgml/parser.sgml b/docs/api/sgml/parser.sgml
index fe7fdc8..923cc31 100644
--- a/docs/api/sgml/parser.sgml
+++ b/docs/api/sgml/parser.sgml
@@ -1,33 +1,31 @@
 <refentry id="xmlsec-parser">
 <refmeta>
-<refentrytitle>parser</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-parser.top_of_page">parser</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>parser</refname><refpurpose>Parser transform implementation.</refpurpose>
+<refname>parser</refname>
+<refpurpose>Parser transform implementation.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-parser.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlDoc">xmlDocPtr</link>   <link linkend="xmlSecParseFile">xmlSecParseFile</link>                 (const <link linkend="char">char</link> *filename);
-<link linkend="xmlDoc">xmlDocPtr</link>   <link linkend="xmlSecParseMemory">xmlSecParseMemory</link>               (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                             <link linkend="int">int</link> recovery);
-<link linkend="xmlDoc">xmlDocPtr</link>   <link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link>            (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);
-#define     <link linkend="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</link>
-                                            (void);
+<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseFile">xmlSecParseFile</link>                     (const <link linkend="char">char</link> *filename);
+<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseMemory">xmlSecParseMemory</link>                   (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
+                                                         <link linkend="int">int</link> recovery);
+<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link>                (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);
+#define             <link linkend="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</link>    (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -39,105 +37,99 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-parser.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Parser transform implementation.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecParseFile">xmlSecParseFile ()</title>
-<indexterm><primary>xmlSecParseFile</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>   xmlSecParseFile                 (const <link linkend="char">char</link> *filename);</programlisting>
+<refsect1 id="xmlsec-parser.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecParseFile" role="function">
+<title>xmlSecParseFile ()</title>
+<indexterm zone="xmlSecParseFile"><primary sortas="xmlSecParseFile">xmlSecParseFile</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseFile                     (const <link linkend="char">char</link> *filename);</programlisting>
 <para>
 Loads XML Doc from file <parameter>filename</parameter>. We need a special version because of 
 c14n issue. The code is copied from <link linkend="xmlSAXParseFileWithData"><function>xmlSAXParseFileWithData()</function></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the loaded XML document or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecParseMemory">xmlSecParseMemory ()</title>
-<indexterm><primary>xmlSecParseMemory</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>   xmlSecParseMemory               (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                             <link linkend="int">int</link> recovery);</programlisting>
+<refsect2 id="xmlSecParseMemory" role="function">
+<title>xmlSecParseMemory ()</title>
+<indexterm zone="xmlSecParseMemory"><primary sortas="xmlSecParseMemory">xmlSecParseMemory</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseMemory                   (const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
+                                                         <link linkend="int">int</link> recovery);</programlisting>
 <para>
 Loads XML Doc from memory. We need a special version because of 
 c14n issue. The code is copied from <link linkend="xmlSAXParseMemory"><function>xmlSAXParseMemory()</function></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the input buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>recovery</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>recovery</parameter>&#160;:</term>
 <listitem><simpara> 		the flag.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the loaded XML document or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecParseMemoryExt">xmlSecParseMemoryExt ()</title>
-<indexterm><primary>xmlSecParseMemoryExt</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>   xmlSecParseMemoryExt            (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);</programlisting>
+<refsect2 id="xmlSecParseMemoryExt" role="function">
+<title>xmlSecParseMemoryExt ()</title>
+<indexterm zone="xmlSecParseMemoryExt"><primary sortas="xmlSecParseMemoryExt">xmlSecParseMemoryExt</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecParseMemoryExt                (const <link linkend="xmlSecByte">xmlSecByte</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> prefixSize,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bufferSize,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *postfix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> postfixSize);</programlisting>
 <para>
 Loads XML Doc from 3 chunks of memory: <parameter>prefix</parameter>, <parameter>buffer</parameter> and <parameter>postfix</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>prefix</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>prefix</parameter>&#160;:</term>
 <listitem><simpara> 		the first part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>prefixSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>prefixSize</parameter>&#160;:</term>
 <listitem><simpara> 	the size of the first part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara> 		the second part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bufferSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bufferSize</parameter>&#160;:</term>
 <listitem><simpara> 	the size of the second part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>postfix</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>postfix</parameter>&#160;:</term>
 <listitem><simpara> 		the third part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>postfixSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>postfixSize</parameter>&#160;:</term>
 <listitem><simpara> 	the size of the third part of the input.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the loaded XML document or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the loaded XML document or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</title>
-<indexterm><primary>xmlSecTransformXmlParserId</primary></indexterm><programlisting>#define     xmlSecTransformXmlParserId</programlisting>
+<refsect2 id="xmlSecTransformXmlParserId" role="macro">
+<title>xmlSecTransformXmlParserId</title>
+<indexterm zone="xmlSecTransformXmlParserId"><primary sortas="xmlSecTransformXmlParserId">xmlSecTransformXmlParserId</primary></indexterm><programlisting>#define             xmlSecTransformXmlParserId</programlisting>
 <para>
 The XML Parser transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass ()</title>
-<indexterm><primary>xmlSecTransformXmlParserGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformXmlParserGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformXmlParserGetKlass" role="function">
+<title>xmlSecTransformXmlParserGetKlass ()</title>
+<indexterm zone="xmlSecTransformXmlParserGetKlass"><primary sortas="xmlSecTransformXmlParserGetKlass">xmlSecTransformXmlParserGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXmlParserGetKlass    (void);</programlisting>
 <para>
 The XML parser transform.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>XML parser transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XML parser transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/private.sgml b/docs/api/sgml/private.sgml
index b8b9a5d..634e1f0 100644
--- a/docs/api/sgml/private.sgml
+++ b/docs/api/sgml/private.sgml
@@ -1,80 +1,74 @@
 <refentry id="xmlsec-private">
 <refmeta>
-<refentrytitle>private</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-private.top_of_page">private</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>private</refname><refpurpose></refpurpose>
+<refname>private</refname>
+<refpurpose></refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-private.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoInitMethod">*xmlSecCryptoInitMethod</link>)       (void);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoShutdownMethod">*xmlSecCryptoShutdownMethod</link>)   (void);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoKeysMngrInitMethod">*xmlSecCryptoKeysMngrInitMethod</link>)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
-<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> (<link linkend="xmlSecCryptoKeyDataGetKlassMethod">*xmlSecCryptoKeyDataGetKlassMethod</link>)
-                                            (void);
-<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> (<link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">*xmlSecCryptoKeyDataStoreGetKlassMethod</link>)
-                                            (void);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> (<link linkend="xmlSecCryptoTransformGetKlassMethod">*xmlSecCryptoTransformGetKlassMethod</link>)
-                                            (void);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppInitMethod">*xmlSecCryptoAppInitMethod</link>)    (const <link linkend="char">char</link> *config);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppShutdownMethod">*xmlSecCryptoAppShutdownMethod</link>)
-                                            (void);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">*xmlSecCryptoAppKeysMngrCertLoadMethod</link>)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecCryptoAppKeyLoadMethod">*xmlSecCryptoAppKeyLoadMethod</link>)
-                                            (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">*xmlSecCryptoAppKeyLoadMemoryMethod</link>)
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecCryptoAppPkcs12LoadMethod">*xmlSecCryptoAppPkcs12LoadMethod</link>)
-                                            (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="xmlSecKey">xmlSecKeyPtr</link> (<link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">*xmlSecCryptoAppPkcs12LoadMemoryMethod</link>)
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppKeyCertLoadMethod">*xmlSecCryptoAppKeyCertLoadMethod</link>)
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-<link linkend="int">int</link>         (<link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">*xmlSecCryptoAppKeyCertLoadMemoryMethod</link>)
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
-struct      <link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</link>;
-#define     <link linkend="xmlSecStrPrintf">xmlSecStrPrintf</link>
-#define     <link linkend="xmlSecStrVPrintf">xmlSecStrVPrintf</link>
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoInitMethod">*xmlSecCryptoInitMethod</link>)           (void);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoShutdownMethod">*xmlSecCryptoShutdownMethod</link>)       (void);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoKeysMngrInitMethod">*xmlSecCryptoKeysMngrInitMethod</link>)   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);
+<link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     (<link linkend="xmlSecCryptoKeyDataGetKlassMethod">*xmlSecCryptoKeyDataGetKlassMethod</link>)
+                                                        (void);
+<link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  (<link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">*xmlSecCryptoKeyDataStoreGetKlassMethod</link>)
+                                                        (void);
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   (<link linkend="xmlSecCryptoTransformGetKlassMethod">*xmlSecCryptoTransformGetKlassMethod</link>)
+                                                        (void);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppInitMethod">*xmlSecCryptoAppInitMethod</link>)        (const <link linkend="char">char</link> *config);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppShutdownMethod">*xmlSecCryptoAppShutdownMethod</link>)    (void);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">*xmlSecCryptoAppKeysMngrCertLoadMethod</link>)
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>)
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppKeyLoadMethod">*xmlSecCryptoAppKeyLoadMethod</link>)     (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">*xmlSecCryptoAppKeyLoadMemoryMethod</link>)
+                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMethod">*xmlSecCryptoAppPkcs12LoadMethod</link>)  (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="xmlSecKey">xmlSecKeyPtr</link>        (<link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">*xmlSecCryptoAppPkcs12LoadMemoryMethod</link>)
+                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMethod">*xmlSecCryptoAppKeyCertLoadMethod</link>) (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+<link linkend="int">int</link>                 (<link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">*xmlSecCryptoAppKeyCertLoadMemoryMethod</link>)
+                                                        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);
+struct              <link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</link>;
+#define             <link linkend="xmlSecStrPrintf">xmlSecStrPrintf</link>
+#define             <link linkend="xmlSecStrVPrintf">xmlSecStrVPrintf</link>
 </synopsis>
 </refsynopsisdiv>
 
@@ -86,368 +80,345 @@ struct      <link linkend="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</lin
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-private.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
-
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod ()</title>
-<indexterm><primary>xmlSecCryptoInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoInitMethod)       (void);</programlisting>
+<refsect1 id="xmlsec-private.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecCryptoInitMethod" role="function">
+<title>xmlSecCryptoInitMethod ()</title>
+<indexterm zone="xmlSecCryptoInitMethod"><primary sortas="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoInitMethod)           (void);</programlisting>
 <para>
 xmlsec-crypto libraryinitialization method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod ()</title>
-<indexterm><primary>xmlSecCryptoShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoShutdownMethod)   (void);</programlisting>
+<refsect2 id="xmlSecCryptoShutdownMethod" role="function">
+<title>xmlSecCryptoShutdownMethod ()</title>
+<indexterm zone="xmlSecCryptoShutdownMethod"><primary sortas="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoShutdownMethod)       (void);</programlisting>
 <para>
 xmlsec-crypto library shutdown method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod ()</title>
-<indexterm><primary>xmlSecCryptoKeysMngrInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoKeysMngrInitMethod)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
+<refsect2 id="xmlSecCryptoKeysMngrInitMethod" role="function">
+<title>xmlSecCryptoKeysMngrInitMethod ()</title>
+<indexterm zone="xmlSecCryptoKeysMngrInitMethod"><primary sortas="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoKeysMngrInitMethod)   (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr);</programlisting>
 <para>
 Initializes <parameter>mngr</parameter> with xmlsec-crypto library specific data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod ()</title>
-<indexterm><primary>xmlSecCryptoKeyDataGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link> (*xmlSecCryptoKeyDataGetKlassMethod)
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoKeyDataGetKlassMethod" role="function">
+<title>xmlSecCryptoKeyDataGetKlassMethod ()</title>
+<indexterm zone="xmlSecCryptoKeyDataGetKlassMethod"><primary sortas="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataId">xmlSecKeyDataId</link>     (*xmlSecCryptoKeyDataGetKlassMethod)
+                                                        (void);</programlisting>
 <para>
 Gets the key data klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to key data klass or NULL if an error occurs 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data klass or NULL if an error occurs 
 (the xmlsec-crypto library is not loaded or this key data klass is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod ()</title>
-<indexterm><primary>xmlSecCryptoKeyDataStoreGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link> (*xmlSecCryptoKeyDataStoreGetKlassMethod)
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoKeyDataStoreGetKlassMethod" role="function">
+<title>xmlSecCryptoKeyDataStoreGetKlassMethod ()</title>
+<indexterm zone="xmlSecCryptoKeyDataStoreGetKlassMethod"><primary sortas="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecKeyDataStoreId">xmlSecKeyDataStoreId</link>  (*xmlSecCryptoKeyDataStoreGetKlassMethod)
+                                                        (void);</programlisting>
 <para>
 Gets the key data store klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to key data store klass or NULL if an error occurs 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to key data store klass or NULL if an error occurs 
 (the xmlsec-crypto library is not loaded or this key data store klass is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod ()</title>
-<indexterm><primary>xmlSecCryptoTransformGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> (*xmlSecCryptoTransformGetKlassMethod)
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoTransformGetKlassMethod" role="function">
+<title>xmlSecCryptoTransformGetKlassMethod ()</title>
+<indexterm zone="xmlSecCryptoTransformGetKlassMethod"><primary sortas="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   (*xmlSecCryptoTransformGetKlassMethod)
+                                                        (void);</programlisting>
 <para>
 Gets the transform klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to transform klass or NULL if an error occurs 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to transform klass or NULL if an error occurs 
 (the xmlsec-crypto library is not loaded or this transform is not
 implemented).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppInitMethod)    (const <link linkend="char">char</link> *config);</programlisting>
+<refsect2 id="xmlSecCryptoAppInitMethod" role="function">
+<title>xmlSecCryptoAppInitMethod ()</title>
+<indexterm zone="xmlSecCryptoAppInitMethod"><primary sortas="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppInitMethod)        (const <link linkend="char">char</link> *config);</programlisting>
 <para>
 General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
 <parameter>xmlSecInit</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>config</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>config</parameter>&#160;:</term>
 <listitem><simpara>		the path to crypto library configuration.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppShutdownMethod)
-                                            (void);</programlisting>
+<refsect2 id="xmlSecCryptoAppShutdownMethod" role="function">
+<title>xmlSecCryptoAppShutdownMethod ()</title>
+<indexterm zone="xmlSecCryptoAppShutdownMethod"><primary sortas="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppShutdownMethod)    (void);</programlisting>
 <para>
 General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
 <parameter>xmlSecShutdown</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeysMngrCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppKeysMngrCertLoadMethod)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMethod" role="function">
+<title>xmlSecCryptoAppKeysMngrCertLoadMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMethod"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeysMngrCertLoadMethod)
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>filename</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara> 		the certificate file.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>filename</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod)
-                                            (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod" role="function">
+<title>xmlSecCryptoAppKeysMngrCertLoadMemoryMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeysMngrCertLoadMemoryMethod)
+                                                        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> mngr,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         <link linkend="xmlSecKeyDataType">xmlSecKeyDataType</link> type);</programlisting>
 <para>
 Reads cert from <parameter>data</parameter> and adds to the list of trusted or known
 untrusted certs in <parameter>store</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>mngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mngr</parameter>&#160;:</term>
 <listitem><simpara> 		the keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the flag that indicates is the certificate in <parameter>data</parameter>
    			trusted or not.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyLoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecCryptoAppKeyLoadMethod)
-                                            (const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyLoadMethod" role="function">
+<title>xmlSecCryptoAppKeyLoadMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeyLoadMethod"><primary sortas="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppKeyLoadMethod)     (const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the a file.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyLoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecCryptoAppKeyLoadMemoryMethod)
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyLoadMemoryMethod" role="function">
+<title>xmlSecCryptoAppKeyLoadMemoryMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeyLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppKeyLoadMemoryMethod)
+                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key from the binary data buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the key data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the key data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the key data format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the key data password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the key password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppPkcs12LoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecCryptoAppPkcs12LoadMethod)
-                                            (const <link linkend="char">char</link> *filename,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppPkcs12LoadMethod" role="function">
+<title>xmlSecCryptoAppPkcs12LoadMethod ()</title>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMethod"><primary sortas="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppPkcs12LoadMethod)  (const <link linkend="char">char</link> *filename,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 key filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 file password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppPkcs12LoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link> (*xmlSecCryptoAppPkcs12LoadMemoryMethod)
-                                            (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             const <link linkend="char">char</link> *pwd,
-                                             <link linkend="void">void</link> *pwdCallback,
-                                             <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
+<refsect2 id="xmlSecCryptoAppPkcs12LoadMemoryMethod" role="function">
+<title>xmlSecCryptoAppPkcs12LoadMemoryMethod ()</title>
+<indexterm zone="xmlSecCryptoAppPkcs12LoadMemoryMethod"><primary sortas="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</primary></indexterm><programlisting><link linkend="xmlSecKey">xmlSecKeyPtr</link>        (*xmlSecCryptoAppPkcs12LoadMemoryMethod)
+                                                        (const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         const <link linkend="char">char</link> *pwd,
+                                                         <link linkend="void">void</link> *pwdCallback,
+                                                         <link linkend="void">void</link> *pwdCallbackCtx);</programlisting>
 <para>
 Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pkcs12 data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the pkcs12 data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwd</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwd</parameter>&#160;:</term>
 <listitem><simpara>		the PKCS12 data password.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallback</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallback</parameter>&#160;:</term>
 <listitem><simpara>	the password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pwdCallbackCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pwdCallbackCtx</parameter>&#160;:</term>
 <listitem><simpara>	the user context for password callback.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the key or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the key or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppKeyCertLoadMethod)
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="char">char</link> *filename,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyCertLoadMethod" role="function">
+<title>xmlSecCryptoAppKeyCertLoadMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMethod"><primary sortas="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeyCertLoadMethod) (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="char">char</link> *filename,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from $<parameter>filename</parameter> and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>filename</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>filename</parameter>&#160;:</term>
 <listitem><simpara>		the certificate filename.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate file format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod ()</title>
-<indexterm><primary>xmlSecCryptoAppKeyCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecCryptoAppKeyCertLoadMemoryMethod)
-                                            (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
+<refsect2 id="xmlSecCryptoAppKeyCertLoadMemoryMethod" role="function">
+<title>xmlSecCryptoAppKeyCertLoadMemoryMethod ()</title>
+<indexterm zone="xmlSecCryptoAppKeyCertLoadMemoryMethod"><primary sortas="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecCryptoAppKeyCertLoadMemoryMethod)
+                                                        (<link linkend="xmlSecKey">xmlSecKeyPtr</link> key,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecKeyDataFormat">xmlSecKeyDataFormat</link> format);</programlisting>
 <para>
 Reads the certificate from binary <parameter>data</parameter> buffer and adds it to key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the cert data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the cert data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>format</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>format</parameter>&#160;:</term>
 <listitem><simpara>		the certificate data format.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCryptoDLFunctions">struct xmlSecCryptoDLFunctions</title>
-<indexterm><primary>xmlSecCryptoDLFunctions</primary></indexterm><programlisting>struct xmlSecCryptoDLFunctions {
-
+<refsect2 id="xmlSecCryptoDLFunctions" role="struct">
+<title>struct xmlSecCryptoDLFunctions</title>
+<indexterm zone="xmlSecCryptoDLFunctions"><primary sortas="xmlSecCryptoDLFunctions">xmlSecCryptoDLFunctions</primary></indexterm><programlisting>struct xmlSecCryptoDLFunctions {
     /**  
      * Crypto Init/shutdown
      */
@@ -533,331 +504,328 @@ Reads the certificate from binary <parameter>data</parameter> buffer and adds it
 <para>
 The list of crypto engine functions, key data and transform classes.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</link> <structfield>cryptoInit</structfield></term>
+<term><link linkend="xmlSecCryptoInitMethod">xmlSecCryptoInitMethod</link>&#160;<structfield>cryptoInit</structfield>;</term>
 <listitem><simpara>			the xmlsec-crypto library initialization method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</link> <structfield>cryptoShutdown</structfield></term>
+<term><link linkend="xmlSecCryptoShutdownMethod">xmlSecCryptoShutdownMethod</link>&#160;<structfield>cryptoShutdown</structfield>;</term>
 <listitem><simpara>		the xmlsec-crypto library shutdown method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</link> <structfield>cryptoKeysMngrInit</structfield></term>
+<term><link linkend="xmlSecCryptoKeysMngrInitMethod">xmlSecCryptoKeysMngrInitMethod</link>&#160;<structfield>cryptoKeysMngrInit</structfield>;</term>
 <listitem><simpara>		the xmlsec-crypto library keys manager init method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataAesGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataAesGetKlass</structfield>;</term>
 <listitem><simpara>		the method to get pointer to AES key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataDesGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataDesGetKlass</structfield>;</term>
 <listitem><simpara>		the method to get pointer to DES key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataDsaGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataDsaGetKlass</structfield>;</term>
 <listitem><simpara>		the method to get pointer to DSA key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataGost2001GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataGost2001GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to GOST 2001 key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataHmacGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataHmacGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to HMAC key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataRsaGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataRsaGetKlass</structfield>;</term>
 <listitem><simpara>		the method to get pointer to RSA key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataX509GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataX509GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to X509 key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link> <structfield>keyDataRawX509CertGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataGetKlassMethod">xmlSecCryptoKeyDataGetKlassMethod</link>&#160;<structfield>keyDataRawX509CertGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to raw X509 cert key data klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</link> <structfield>x509StoreGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoKeyDataStoreGetKlassMethod">xmlSecCryptoKeyDataStoreGetKlassMethod</link>&#160;<structfield>x509StoreGetKlass</structfield>;</term>
 <listitem><simpara>		the method to get pointer to X509 key data store.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformAes128CbcGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes128CbcGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 128 encryption transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformAes192CbcGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes192CbcGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 192 encryption transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformAes256CbcGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformAes256CbcGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 256 encryption transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformKWAes128GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes128GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 128 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformKWAes192GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes192GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 192 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformKWAes256GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWAes256GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to AES 256 key wrapper transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformDes3CbcGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformDes3CbcGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to Triple DES encryption transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformKWDes3GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformKWDes3GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to Triple DES key wrapper transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformDsaSha1GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformDsaSha1GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to DSA-SHA1 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformGost2001GostR3411_94GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformGost2001GostR3411_94GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to GOST2001 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacMd5GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacMd5GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to HMAC-MD5 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacRipemd160GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacRipemd160GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to HMAC-RIPEMD160 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacSha1GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha1GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to HMAC-SHA1 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacSha224GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha224GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to HMAC-SHA224 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacSha256GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha256GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to HMAC-SHA256 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacSha384GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha384GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to HMAC-SHA384 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformHmacSha512GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformHmacSha512GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to HMAC-SHA512 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformMd5GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformMd5GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to MD5 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRipemd160GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRipemd160GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RIPEMD160 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaMd5GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaMd5GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-MD5 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaRipemd160GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaRipemd160GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to RSA-RIPEMD160 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaSha1GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha1GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-SHA1 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaSha224GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha224GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-SHA224 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaSha256GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha256GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-SHA256 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaSha384GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha384GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-SHA384 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaSha512GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaSha512GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-SHA512 signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaPkcs1GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaPkcs1GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-PKCS1_5 key transport transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformRsaOaepGetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformRsaOaepGetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to RSA-OAEP key transport transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformGostR3411_94GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformGostR3411_94GetKlass</structfield>;</term>
 <listitem><simpara> the method to get pointer to GOST R3411 transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha1GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha1GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to SHA1 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha224GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha224GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to SHA224 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha256GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha256GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to SHA256 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha384GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha384GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to SHA384 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link> <structfield>transformSha512GetKlass</structfield></term>
+<term><link linkend="xmlSecCryptoTransformGetKlassMethod">xmlSecCryptoTransformGetKlassMethod</link>&#160;<structfield>transformSha512GetKlass</structfield>;</term>
 <listitem><simpara>	the method to get pointer to SHA512 digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</link> <structfield>cryptoAppInit</structfield></term>
+<term><link linkend="xmlSecCryptoAppInitMethod">xmlSecCryptoAppInitMethod</link>&#160;<structfield>cryptoAppInit</structfield>;</term>
 <listitem><simpara>		the default crypto engine initialization method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</link> <structfield>cryptoAppShutdown</structfield></term>
+<term><link linkend="xmlSecCryptoAppShutdownMethod">xmlSecCryptoAppShutdownMethod</link>&#160;<structfield>cryptoAppShutdown</structfield>;</term>
 <listitem><simpara>		the default crypto engine shutdown method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrInitMethod">xmlSecCryptoAppDefaultKeysMngrInitMethod</link> <structfield>cryptoAppDefaultKeysMngrInit</structfield></term>
+<term><link linkend="xmlSecCryptoAppDefaultKeysMngrInitMethod">xmlSecCryptoAppDefaultKeysMngrInitMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrInit</structfield>;</term>
 <listitem><simpara> 	the default keys manager init method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod">xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod</link> <structfield>cryptoAppDefaultKeysMngrAdoptKey</structfield></term>
+<term><link linkend="xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod">xmlSecCryptoAppDefaultKeysMngrAdoptKeyMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrAdoptKey</structfield>;</term>
 <listitem><simpara>	the default keys manager adopt key method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrLoadMethod">xmlSecCryptoAppDefaultKeysMngrLoadMethod</link> <structfield>cryptoAppDefaultKeysMngrLoad</structfield></term>
+<term><link linkend="xmlSecCryptoAppDefaultKeysMngrLoadMethod">xmlSecCryptoAppDefaultKeysMngrLoadMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrLoad</structfield>;</term>
 <listitem><simpara>	the default keys manager load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppDefaultKeysMngrSaveMethod">xmlSecCryptoAppDefaultKeysMngrSaveMethod</link> <structfield>cryptoAppDefaultKeysMngrSave</structfield></term>
+<term><link linkend="xmlSecCryptoAppDefaultKeysMngrSaveMethod">xmlSecCryptoAppDefaultKeysMngrSaveMethod</link>&#160;<structfield>cryptoAppDefaultKeysMngrSave</structfield>;</term>
 <listitem><simpara>	the default keys manager save method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</link> <structfield>cryptoAppKeysMngrCertLoad</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMethod">xmlSecCryptoAppKeysMngrCertLoadMethod</link>&#160;<structfield>cryptoAppKeysMngrCertLoad</structfield>;</term>
 <listitem><simpara>		the default keys manager file cert load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link> <structfield>cryptoAppKeysMngrCertLoadMemory</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeysMngrCertLoadMemoryMethod">xmlSecCryptoAppKeysMngrCertLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeysMngrCertLoadMemory</structfield>;</term>
 <listitem><simpara>	the default keys manager memory cert load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</link> <structfield>cryptoAppKeyLoad</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeyLoadMethod">xmlSecCryptoAppKeyLoadMethod</link>&#160;<structfield>cryptoAppKeyLoad</structfield>;</term>
 <listitem><simpara>		the key file load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</link> <structfield>cryptoAppKeyLoadMemory</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeyLoadMemoryMethod">xmlSecCryptoAppKeyLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeyLoadMemory</structfield>;</term>
 <listitem><simpara>	the meory key load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</link> <structfield>cryptoAppPkcs12Load</structfield></term>
+<term><link linkend="xmlSecCryptoAppPkcs12LoadMethod">xmlSecCryptoAppPkcs12LoadMethod</link>&#160;<structfield>cryptoAppPkcs12Load</structfield>;</term>
 <listitem><simpara>	the pkcs12 file load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</link> <structfield>cryptoAppPkcs12LoadMemory</structfield></term>
+<term><link linkend="xmlSecCryptoAppPkcs12LoadMemoryMethod">xmlSecCryptoAppPkcs12LoadMemoryMethod</link>&#160;<structfield>cryptoAppPkcs12LoadMemory</structfield>;</term>
 <listitem><simpara>	the memory pkcs12 load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</link> <structfield>cryptoAppKeyCertLoad</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeyCertLoadMethod">xmlSecCryptoAppKeyCertLoadMethod</link>&#160;<structfield>cryptoAppKeyCertLoad</structfield>;</term>
 <listitem><simpara>	the cert file load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</link> <structfield>cryptoAppKeyCertLoadMemory</structfield></term>
+<term><link linkend="xmlSecCryptoAppKeyCertLoadMemoryMethod">xmlSecCryptoAppKeyCertLoadMemoryMethod</link>&#160;<structfield>cryptoAppKeyCertLoadMemory</structfield>;</term>
 <listitem><simpara>	the memory cert load method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>cryptoAppDefaultPwdCallback</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>cryptoAppDefaultPwdCallback</structfield>;</term>
 <listitem><simpara>the default password callback.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecStrPrintf">xmlSecStrPrintf</title>
-<indexterm><primary>xmlSecStrPrintf</primary></indexterm><programlisting>#define xmlSecStrPrintf 	xmlStrPrintf
+<refsect2 id="xmlSecStrPrintf" role="macro">
+<title>xmlSecStrPrintf</title>
+<indexterm zone="xmlSecStrPrintf"><primary sortas="xmlSecStrPrintf">xmlSecStrPrintf</primary></indexterm><programlisting>#define xmlSecStrPrintf 	xmlStrPrintf
 </programlisting>
 <para>
 Prints a string (see <parameter>xmlStrPrintf</parameter>).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecStrVPrintf">xmlSecStrVPrintf</title>
-<indexterm><primary>xmlSecStrVPrintf</primary></indexterm><programlisting>#define xmlSecStrVPrintf 	xmlStrVPrintf
+<refsect2 id="xmlSecStrVPrintf" role="macro">
+<title>xmlSecStrVPrintf</title>
+<indexterm zone="xmlSecStrVPrintf"><primary sortas="xmlSecStrVPrintf">xmlSecStrVPrintf</primary></indexterm><programlisting>#define xmlSecStrVPrintf 	xmlStrVPrintf
 </programlisting>
 <para>
 Prints a string (see <parameter>xmlStrVPrintf</parameter>).</para>
 <para>
-
 </para></refsect2>
 
 </refsect1>
diff --git a/docs/api/sgml/soap.sgml b/docs/api/sgml/soap.sgml
index db37eae..86b112c 100644
--- a/docs/api/sgml/soap.sgml
+++ b/docs/api/sgml/soap.sgml
@@ -1,64 +1,61 @@
 <refentry id="xmlsec-soap">
 <refmeta>
-<refentrytitle>soap</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-soap.top_of_page">soap</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>soap</refname><refpurpose></refpurpose>
+<refname>soap</refname>
+<refpurpose></refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-soap.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link>      (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> entryNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultString,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultActor);
-<link linkend="int">int</link>         <link linkend="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</link>             (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-enum        <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link>      (<link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> entryNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultRole);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link>     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *subCodeName);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link>  (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link> (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);
-<link linkend="int">int</link>         <link linkend="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</link>             (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlSecSize">xmlSecSize</link>  <link linkend="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</link>        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>       (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</link>          (<link linkend="xmlDoc">xmlDocPtr</link> doc);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultString,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultActor);
+<link linkend="int">int</link>                 <link linkend="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</link>               (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetBody">xmlSecSoap11GetBody</link>                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</link>    (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+enum                <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</link>          (<link linkend="xmlDoc">xmlDocPtr</link> doc);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultRole);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</link>         (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeName);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</link>      (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</link>     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);
+<link linkend="int">int</link>                 <link linkend="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</link>               (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetBody">xmlSecSoap12GetBody</link>                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlSecSize">xmlSecSize</link>          <link linkend="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</link>    (<link linkend="xmlNode">xmlNodePtr</link> envNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</link>            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</link>           (<link linkend="xmlNode">xmlNodePtr</link> envNode);
 </synopsis>
 </refsynopsisdiv>
 
@@ -70,18 +67,17 @@ enum        <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-soap.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
-
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope ()</title>
-<indexterm><primary>xmlSecSoap11CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11CreateEnvelope      (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<refsect1 id="xmlsec-soap.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecSoap11CreateEnvelope" role="function">
+<title>xmlSecSoap11CreateEnvelope ()</title>
+<indexterm zone="xmlSecSoap11CreateEnvelope"><primary sortas="xmlSecSoap11CreateEnvelope">xmlSecSoap11CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11CreateEnvelope          (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
 <para>
 Creates a new SOAP Envelope node. Caller is responsible for 
 adding the returned node to the XML document.
@@ -101,18 +97,17 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara>        the parent doc (might be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created &lt;soap:Envelope&gt; node or NULL
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created &lt;soap:Envelope&gt; node or NULL
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader ()</title>
-<indexterm><primary>xmlSecSoap11EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11EnsureHeader        (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11EnsureHeader" role="function">
+<title>xmlSecSoap11EnsureHeader ()</title>
+<indexterm zone="xmlSecSoap11EnsureHeader"><primary sortas="xmlSecSoap11EnsureHeader">xmlSecSoap11EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11EnsureHeader            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the pointer to &lt;soap:Header&gt; node (if necessary, the node
 is created).
@@ -130,39 +125,37 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap11AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11AddBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
+<refsect2 id="xmlSecSoap11AddBodyEntry" role="function">
+<title>xmlSecSoap11AddBodyEntry ()</title>
+<indexterm zone="xmlSecSoap11AddBodyEntry"><primary sortas="xmlSecSoap11AddBodyEntry">xmlSecSoap11AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11AddBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
 <para>
 Adds a new entry to &lt;soap:Body&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>entryNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>entryNode</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to body entry node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap11AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11AddFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultString,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultActor);</programlisting>
+<refsect2 id="xmlSecSoap11AddFaultEntry" role="function">
+<title>xmlSecSoap11AddFaultEntry ()</title>
+<indexterm zone="xmlSecSoap11AddFaultEntry"><primary sortas="xmlSecSoap11AddFaultEntry">xmlSecSoap11AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11AddFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultCodeLocalPart,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultString,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultActor);</programlisting>
 <para>
 Adds &lt;soap:Fault&gt; entry to the <parameter>envNode</parameter>. Note that only one &lt;soap:Fault&gt;
 entry is allowed.
@@ -188,120 +181,112 @@ XML Schema (http://schemas.xmlsoap.org/soap/envelope/):
         &lt;xs:anyAttribute namespace="#<link linkend="any"><type>any</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultCodeHref</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultCodeHref</parameter>&#160;:</term>
 <listitem><simpara>      the fault code QName href (must be known in th context of 
                      &lt;soap:Body&gt; node).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultCodeLocalPart</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultCodeLocalPart</parameter>&#160;:</term>
 <listitem><simpara> the fault code QName LocalPart.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultString</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultString</parameter>&#160;:</term>
 <listitem><simpara>        the human readable explanation of the fault.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultActor</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultActor</parameter>&#160;:</term>
 <listitem><simpara>         the information about who caused the fault (might be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the added entry or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope ()</title>
-<indexterm><primary>xmlSecSoap11CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecSoap11CheckEnvelope       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11CheckEnvelope" role="function">
+<title>xmlSecSoap11CheckEnvelope ()</title>
+<indexterm zone="xmlSecSoap11CheckEnvelope"><primary sortas="xmlSecSoap11CheckEnvelope">xmlSecSoap11CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSoap11CheckEnvelope           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Validates &lt;soap:Envelope&gt; node structure.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
 not valid or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader ()</title>
-<indexterm><primary>xmlSecSoap11GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11GetHeader           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11GetHeader" role="function">
+<title>xmlSecSoap11GetHeader ()</title>
+<indexterm zone="xmlSecSoap11GetHeader"><primary sortas="xmlSecSoap11GetHeader">xmlSecSoap11GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetHeader               (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets pointer to the &lt;soap:Header&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11GetBody">xmlSecSoap11GetBody ()</title>
-<indexterm><primary>xmlSecSoap11GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11GetBody             (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11GetBody" role="function">
+<title>xmlSecSoap11GetBody ()</title>
+<indexterm zone="xmlSecSoap11GetBody"><primary sortas="xmlSecSoap11GetBody">xmlSecSoap11GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetBody                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets pointer to the &lt;soap:Body&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber ()</title>
-<indexterm><primary>xmlSecSoap11GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecSoap11GetBodyEntriesNumber
-                                            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11GetBodyEntriesNumber" role="function">
+<title>xmlSecSoap11GetBodyEntriesNumber ()</title>
+<indexterm zone="xmlSecSoap11GetBodyEntriesNumber"><primary sortas="xmlSecSoap11GetBodyEntriesNumber">xmlSecSoap11GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecSoap11GetBodyEntriesNumber    (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the number of body entries.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of body entries.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of body entries.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap11GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11GetBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecSoap11GetBodyEntry" role="function">
+<title>xmlSecSoap11GetBodyEntry ()</title>
+<indexterm zone="xmlSecSoap11GetBodyEntry"><primary sortas="xmlSecSoap11GetBodyEntry">xmlSecSoap11GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets the body entry number <parameter>pos</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>        the body entry number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to body entry node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to body entry node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap11GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap11GetFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap11GetFaultEntry" role="function">
+<title>xmlSecSoap11GetFaultEntry ()</title>
+<indexterm zone="xmlSecSoap11GetFaultEntry"><primary sortas="xmlSecSoap11GetFaultEntry">xmlSecSoap11GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap11GetFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the Fault entry (if any).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Fault entry or NULL if it does not exist.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Fault entry or NULL if it does not exist.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12FaultCode">enum xmlSecSoap12FaultCode</title>
-<indexterm><primary>xmlSecSoap12FaultCode</primary></indexterm><programlisting>typedef enum {
+<refsect2 id="xmlSecSoap12FaultCode" role="enum">
+<title>enum xmlSecSoap12FaultCode</title>
+<indexterm zone="xmlSecSoap12FaultCode"><primary sortas="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</primary></indexterm><programlisting>typedef enum {
     xmlSecSoap12FaultCodeUnknown = 0,
     xmlSecSoap12FaultCodeVersionMismatch,
     xmlSecSoap12FaultCodeMustUnderstand,
@@ -314,14 +299,13 @@ Gets the Fault entry (if any).</para>
 The values of the &lt;Value&gt; child element information item of the 
 &lt;Code&gt; element information item (http://www.w3.org/TR/2003/REC-soap12-part1-20030624/<link linkend="faultcodes"><type>faultcodes</type></link>).</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeUnknown" role="constant">
 <term><literal>xmlSecSoap12FaultCodeUnknown</literal></term>
 <listitem><simpara>		The fault code is not available.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeVersionMismatch" role="constant">
 <term><literal>xmlSecSoap12FaultCodeVersionMismatch</literal></term>
 <listitem><simpara>	The faulting node found an 
 					invalid element information 
@@ -329,7 +313,7 @@ The values of the &lt;Value&gt; child element information item of the
 					Envelope element information item. 
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeMustUnderstand" role="constant">
 <term><literal>xmlSecSoap12FaultCodeMustUnderstand</literal></term>
 <listitem><simpara>	An immediate child element 
 					information item of the SOAP 
@@ -341,7 +325,7 @@ The values of the &lt;Value&gt; child element information item of the
 					information item with a value of "true"
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeDataEncodingUnknown" role="constant">
 <term><literal>xmlSecSoap12FaultCodeDataEncodingUnknown</literal></term>
 <listitem><simpara>	A SOAP header block or SOAP 
 					body child element information 
@@ -351,7 +335,7 @@ The values of the &lt;Value&gt; child element information item of the
 					does not support.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeSender" role="constant">
 <term><literal>xmlSecSoap12FaultCodeSender</literal></term>
 <listitem><simpara>		The message was incorrectly 
 					formed or did not contain the 
@@ -359,7 +343,7 @@ The values of the &lt;Value&gt; child element information item of the
 					to succeed. 
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecSoap12FaultCodeReceiver" role="constant">
 <term><literal>xmlSecSoap12FaultCodeReceiver</literal></term>
 <listitem><simpara>		The message could not be processed 
 					for reasons attributable to the 
@@ -369,9 +353,9 @@ The values of the &lt;Value&gt; child element information item of the
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope ()</title>
-<indexterm><primary>xmlSecSoap12CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12CreateEnvelope      (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<refsect2 id="xmlSecSoap12CreateEnvelope" role="function">
+<title>xmlSecSoap12CreateEnvelope ()</title>
+<indexterm zone="xmlSecSoap12CreateEnvelope"><primary sortas="xmlSecSoap12CreateEnvelope">xmlSecSoap12CreateEnvelope</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12CreateEnvelope          (<link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
 <para>
 Creates a new SOAP 1.2 Envelope node. Caller is responsible for 
 adding the returned node to the XML document.
@@ -389,18 +373,17 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara>        the parent doc (might be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created &lt;soap:Envelope&gt; node or NULL
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created &lt;soap:Envelope&gt; node or NULL
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader ()</title>
-<indexterm><primary>xmlSecSoap12EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12EnsureHeader        (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12EnsureHeader" role="function">
+<title>xmlSecSoap12EnsureHeader ()</title>
+<indexterm zone="xmlSecSoap12EnsureHeader"><primary sortas="xmlSecSoap12EnsureHeader">xmlSecSoap12EnsureHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12EnsureHeader            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the pointer to &lt;soap:Header&gt; node (if necessary, the node
 is created).
@@ -418,18 +401,17 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12AddBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
+<refsect2 id="xmlSecSoap12AddBodyEntry" role="function">
+<title>xmlSecSoap12AddBodyEntry ()</title>
+<indexterm zone="xmlSecSoap12AddBodyEntry"><primary sortas="xmlSecSoap12AddBodyEntry">xmlSecSoap12AddBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> entryNode);</programlisting>
 <para>
 Adds a new entry to &lt;soap:Body&gt; node.
 </para>
@@ -446,25 +428,24 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>entryNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>entryNode</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to body entry node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry (<parameter>contentNode</parameter>) or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12AddFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultRole);</programlisting>
+<refsect2 id="xmlSecSoap12AddFaultEntry" role="function">
+<title>xmlSecSoap12AddFaultEntry ()</title>
+<indexterm zone="xmlSecSoap12AddFaultEntry"><primary sortas="xmlSecSoap12AddFaultEntry">xmlSecSoap12AddFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSoap12FaultCode">xmlSecSoap12FaultCode</link> faultCode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultNodeURI,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultRole);</programlisting>
 <para>
 Adds &lt;soap:Fault&gt; entry to the <parameter>envNode</parameter>. Note that only one &lt;soap:Fault&gt;
 entry is allowed.
@@ -531,184 +512,173 @@ XML Schema (http://www.w3.org/2003/05/soap-envelope):
         &lt;xs:anyAttribute namespace="#<link linkend="other"><type>other</type></link>" processContents="lax"/&gt;
     &lt;/xs:complexType&gt;</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>            the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultCode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultCode</parameter>&#160;:</term>
 <listitem><simpara>          the fault code.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultReasonText</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultReasonText</parameter>&#160;:</term>
 <listitem><simpara>    the human readable explanation of the fault.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultReasonLang</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultReasonLang</parameter>&#160;:</term>
 <listitem><simpara>    the language (xml:lang) for <parameter>faultReason</parameter> string.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultNodeURI</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultNodeURI</parameter>&#160;:</term>
 <listitem><simpara>       the more preciese information about fault source 
                      (might be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultRole</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultRole</parameter>&#160;:</term>
 <listitem><simpara>          the role the node was operating in at the point 
                      the fault occurred (might be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the added entry or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added entry or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultSubcode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12AddFaultSubcode     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *subCodeName);</programlisting>
+<refsect2 id="xmlSecSoap12AddFaultSubcode" role="function">
+<title>xmlSecSoap12AddFaultSubcode ()</title>
+<indexterm zone="xmlSecSoap12AddFaultSubcode"><primary sortas="xmlSecSoap12AddFaultSubcode">xmlSecSoap12AddFaultSubcode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultSubcode         (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *subCodeName);</programlisting>
 <para>
 Adds a new &lt;Subcode&gt; node to the &lt;Code&gt; node or the last &lt;Subcode&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>faultNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subCodeHref</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subCodeHref</parameter>&#160;:</term>
 <listitem><simpara>        the subcode href.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subCodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subCodeName</parameter>&#160;:</term>
 <listitem><simpara>        the subcode name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to the newly created &lt;Subcode&gt; node or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to the newly created &lt;Subcode&gt; node or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultReasonText</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12AddFaultReasonText  (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
-                                             const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);</programlisting>
+<refsect2 id="xmlSecSoap12AddFaultReasonText" role="function">
+<title>xmlSecSoap12AddFaultReasonText ()</title>
+<indexterm zone="xmlSecSoap12AddFaultReasonText"><primary sortas="xmlSecSoap12AddFaultReasonText">xmlSecSoap12AddFaultReasonText</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultReasonText      (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonText,
+                                                         const <link linkend="xmlChar">xmlChar</link> *faultReasonLang);</programlisting>
 <para>
 Adds a new Text node to the Fault/Reason node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>faultNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultReasonText</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultReasonText</parameter>&#160;:</term>
 <listitem><simpara>    the new reason text.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>faultReasonLang</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultReasonLang</parameter>&#160;:</term>
 <listitem><simpara>    the new reason xml:lang attribute.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>a pointer to the newly created &lt;Text&gt; node or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> a pointer to the newly created &lt;Text&gt; node or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry ()</title>
-<indexterm><primary>xmlSecSoap12AddFaultDetailEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12AddFaultDetailEntry (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);</programlisting>
+<refsect2 id="xmlSecSoap12AddFaultDetailEntry" role="function">
+<title>xmlSecSoap12AddFaultDetailEntry ()</title>
+<indexterm zone="xmlSecSoap12AddFaultDetailEntry"><primary sortas="xmlSecSoap12AddFaultDetailEntry">xmlSecSoap12AddFaultDetailEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12AddFaultDetailEntry     (<link linkend="xmlNode">xmlNodePtr</link> faultNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> detailEntryNode);</programlisting>
 <para>
 Adds a new child to the Detail child element of <parameter>faultNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>faultNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>faultNode</parameter>&#160;:</term>
 <listitem><simpara>          the pointer to &lt;Fault&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>detailEntryNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>detailEntryNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to detail entry node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the added child (<parameter>detailEntryNode</parameter>) or NULL if an error 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the added child (<parameter>detailEntryNode</parameter>) or NULL if an error 
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope ()</title>
-<indexterm><primary>xmlSecSoap12CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecSoap12CheckEnvelope       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12CheckEnvelope" role="function">
+<title>xmlSecSoap12CheckEnvelope ()</title>
+<indexterm zone="xmlSecSoap12CheckEnvelope"><primary sortas="xmlSecSoap12CheckEnvelope">xmlSecSoap12CheckEnvelope</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecSoap12CheckEnvelope           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Validates &lt;soap:Envelope&gt; node structure.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>envNode</parameter> has a valid &lt;soap:Envelope&gt; element, 0 if it is
 not valid or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader ()</title>
-<indexterm><primary>xmlSecSoap12GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12GetHeader           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12GetHeader" role="function">
+<title>xmlSecSoap12GetHeader ()</title>
+<indexterm zone="xmlSecSoap12GetHeader"><primary sortas="xmlSecSoap12GetHeader">xmlSecSoap12GetHeader</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetHeader               (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets pointer to the &lt;soap:Header&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Header&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12GetBody">xmlSecSoap12GetBody ()</title>
-<indexterm><primary>xmlSecSoap12GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12GetBody             (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12GetBody" role="function">
+<title>xmlSecSoap12GetBody ()</title>
+<indexterm zone="xmlSecSoap12GetBody"><primary sortas="xmlSecSoap12GetBody">xmlSecSoap12GetBody</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetBody                 (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets pointer to the &lt;soap:Body&gt; node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to &lt;soap:Body&gt; node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber ()</title>
-<indexterm><primary>xmlSecSoap12GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>  xmlSecSoap12GetBodyEntriesNumber
-                                            (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12GetBodyEntriesNumber" role="function">
+<title>xmlSecSoap12GetBodyEntriesNumber ()</title>
+<indexterm zone="xmlSecSoap12GetBodyEntriesNumber"><primary sortas="xmlSecSoap12GetBodyEntriesNumber">xmlSecSoap12GetBodyEntriesNumber</primary></indexterm><programlisting><link linkend="xmlSecSize">xmlSecSize</link>          xmlSecSoap12GetBodyEntriesNumber    (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the number of body entries.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the number of body entries.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the number of body entries.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry ()</title>
-<indexterm><primary>xmlSecSoap12GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12GetBodyEntry        (<link linkend="xmlNode">xmlNodePtr</link> envNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
+<refsect2 id="xmlSecSoap12GetBodyEntry" role="function">
+<title>xmlSecSoap12GetBodyEntry ()</title>
+<indexterm zone="xmlSecSoap12GetBodyEntry"><primary sortas="xmlSecSoap12GetBodyEntry">xmlSecSoap12GetBodyEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetBodyEntry            (<link linkend="xmlNode">xmlNodePtr</link> envNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> pos);</programlisting>
 <para>
 Gets the body entry number <parameter>pos</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>pos</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>pos</parameter>&#160;:</term>
 <listitem><simpara>        the body entry number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to body entry node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to body entry node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry ()</title>
-<indexterm><primary>xmlSecSoap12GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecSoap12GetFaultEntry       (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
+<refsect2 id="xmlSecSoap12GetFaultEntry" role="function">
+<title>xmlSecSoap12GetFaultEntry ()</title>
+<indexterm zone="xmlSecSoap12GetFaultEntry"><primary sortas="xmlSecSoap12GetFaultEntry">xmlSecSoap12GetFaultEntry</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecSoap12GetFaultEntry           (<link linkend="xmlNode">xmlNodePtr</link> envNode);</programlisting>
 <para>
 Gets the Fault entry (if any).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>envNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>envNode</parameter>&#160;:</term>
 <listitem><simpara>    the pointer to &lt;soap:Envelope&gt; node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to Fault entry or NULL if it does not exist.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to Fault entry or NULL if it does not exist.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/templates.sgml b/docs/api/sgml/templates.sgml
index 3e8d86b..4efe016 100644
--- a/docs/api/sgml/templates.sgml
+++ b/docs/api/sgml/templates.sgml
@@ -1,142 +1,131 @@
 <refentry id="xmlsec-templates">
 <refmeta>
-<refentrytitle>templates</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-templates.top_of_page">templates</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>templates</refname><refpurpose>Dynamic templates creation functions.</refpurpose>
+<refname>templates</refname>
+<refpurpose>Dynamic templates creation functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-templates.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link>       (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</link> (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *nsPrefix);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link> (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link>    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                             const <link linkend="xmlChar">xmlChar</link> *encoding);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link> (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *target);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link>     (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link>  (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link>         (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                             const <link linkend="xmlChar">xmlChar</link> *encoding);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link>  (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link> (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *target);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link>     (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *recipient);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *issuerName);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *serial);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</link>        (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNode">xmlNodePtr</link>  <link linkend="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</link>        (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *xslt);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *prefixList);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</link>     (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</link>    (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);
-<link linkend="int">int</link>         <link linkend="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</link>  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</link>           (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</link>     (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nsPrefix);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</link>    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</link>     (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</link>        (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
+                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</link>     (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</link>   (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *target);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</link>         (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</link>      (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</link>             (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
+                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</link>      (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</link>     (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *target);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</link>  (<link linkend="xmlNode">xmlNodePtr</link> encNode);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</link>   (<link linkend="xmlNode">xmlNodePtr</link> encNode);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</link>         (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</link>        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</link>        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</link> (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</link>    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *recipient);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</link>   (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *issuerName);
+<link linkend="xmlNode">xmlNodePtr</link>          <link linkend="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *serial);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</link>    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</link>            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</link>    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</link>            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</link>  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *xslt);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</link>
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *prefixList);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</link>         (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</link>        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
+<link linkend="int">int</link>                 <link linkend="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</link>      (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);
 </synopsis>
 </refsynopsisdiv>
 
@@ -148,21 +137,21 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-templates.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Dynamic templates creation functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate ()</title>
-<indexterm><primary>xmlSecTmplSignatureCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplSignatureCreate       (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect1 id="xmlsec-templates.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecTmplSignatureCreate" role="function">
+<title>xmlSecTmplSignatureCreate ()</title>
+<indexterm zone="xmlSecTmplSignatureCreate"><primary sortas="xmlSecTmplSignatureCreate">xmlSecTmplSignatureCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureCreate           (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node with the mandatory <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink>, 
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink> and 
@@ -170,34 +159,33 @@ Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;ds
 The application is responsible for inserting the returned node
 in the XML document.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to signature document or NULL; in the 
 		second case, application must later call <parameter>xmlSetTreeDoc</parameter>
 		to ensure that all the children nodes have correct 
 		pointer to XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>c14nMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>c14nMethodId</parameter>&#160;:</term>
 <listitem><simpara> 	the signature canonicalization method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>signMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signMethodId</parameter>&#160;:</term>
 <listitem><simpara> 	the signature  method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref ()</title>
-<indexterm><primary>xmlSecTmplSignatureCreateNsPref</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplSignatureCreateNsPref (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *nsPrefix);</programlisting>
+<refsect2 id="xmlSecTmplSignatureCreateNsPref" role="function">
+<title>xmlSecTmplSignatureCreateNsPref ()</title>
+<indexterm zone="xmlSecTmplSignatureCreateNsPref"><primary sortas="xmlSecTmplSignatureCreateNsPref">xmlSecTmplSignatureCreateNsPref</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureCreateNsPref     (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> c14nMethodId,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> signMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nsPrefix);</programlisting>
 <para>
 Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node with the mandatory
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink>, <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink>,
@@ -208,854 +196,804 @@ namespace with the given prefix that will be used for all of the
 appropriate child nodes.  The application is responsible for
 inserting the returned node in the XML document.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to signature document or NULL; in the 
 		second case, application must later call <parameter>xmlSetTreeDoc</parameter>
 		to ensure that all the children nodes have correct 
 		pointer to XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>c14nMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>c14nMethodId</parameter>&#160;:</term>
 <listitem><simpara> 	the signature canonicalization method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>signMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signMethodId</parameter>&#160;:</term>
 <listitem><simpara> 	the signature  method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nsPrefix</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nsPrefix</parameter>&#160;:</term>
 <listitem><simpara>	the namespace prefix for the signature element (e.g. "dsig"), or NULL 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node or NULL if an 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo ()</title>
-<indexterm><primary>xmlSecTmplSignatureEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureEnsureKeyInfo
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect2 id="xmlSecTmplSignatureEnsureKeyInfo" role="function">
+<title>xmlSecTmplSignatureEnsureKeyInfo ()</title>
+<indexterm zone="xmlSecTmplSignatureEnsureKeyInfo"><primary sortas="xmlSecTmplSignatureEnsureKeyInfo">xmlSecTmplSignatureEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureEnsureKeyInfo    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Adds (if necessary) <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> 
 node <parameter>signNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>signNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signNode</parameter>&#160;:</term>
 <listitem><simpara> 		the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or NULL if an 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or NULL if an 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference ()</title>
-<indexterm><primary>xmlSecTmplSignatureAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplSignatureAddReference (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
+<refsect2 id="xmlSecTmplSignatureAddReference" role="function">
+<title>xmlSecTmplSignatureAddReference ()</title>
+<indexterm zone="xmlSecTmplSignatureAddReference"><primary sortas="xmlSecTmplSignatureAddReference">xmlSecTmplSignatureAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureAddReference     (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node with given URI (<parameter>uri</parameter>), Id (<parameter>id</parameter>) and 
 Type (<parameter>type</parameter>) attributes and the required children <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink> and
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> child of <parameter>signNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>signNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>digestMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>digestMethodId</parameter>&#160;:</term>
 <listitem><simpara>	the reference digest method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara> 		the reference node uri (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the reference node type (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject ()</title>
-<indexterm><primary>xmlSecTmplSignatureAddObject</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplSignatureAddObject    (<link linkend="xmlNode">xmlNodePtr</link> signNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                             const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
+<refsect2 id="xmlSecTmplSignatureAddObject" role="function">
+<title>xmlSecTmplSignatureAddObject ()</title>
+<indexterm zone="xmlSecTmplSignatureAddObject"><primary sortas="xmlSecTmplSignatureAddObject">xmlSecTmplSignatureAddObject</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplSignatureAddObject        (<link linkend="xmlNode">xmlNodePtr</link> signNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
+                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node <parameter>signNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>signNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mimeType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mimeType</parameter>&#160;:</term>
 <listitem><simpara> 		the object mime type (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>encoding</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encoding</parameter>&#160;:</term>
 <listitem><simpara> 		the object encoding (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode ()</title>
-<indexterm><primary>xmlSecTmplSignatureGetSignMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureGetSignMethodNode
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
+<refsect2 id="xmlSecTmplSignatureGetSignMethodNode" role="function">
+<title>xmlSecTmplSignatureGetSignMethodNode ()</title>
+<indexterm zone="xmlSecTmplSignatureGetSignMethodNode"><primary sortas="xmlSecTmplSignatureGetSignMethodNode">xmlSecTmplSignatureGetSignMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplSignatureGetSignMethodNode
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
 <para>
 Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod";>&lt;dsig:SignatureMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>signNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signNode</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod ">&lt;dsig:SignatureMethod /&gt;</ulink> node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod ">&lt;dsig:SignatureMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode ()</title>
-<indexterm><primary>xmlSecTmplSignatureGetC14NMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplSignatureGetC14NMethodNode
-                                            (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
+<refsect2 id="xmlSecTmplSignatureGetC14NMethodNode" role="function">
+<title>xmlSecTmplSignatureGetC14NMethodNode ()</title>
+<indexterm zone="xmlSecTmplSignatureGetC14NMethodNode"><primary sortas="xmlSecTmplSignatureGetC14NMethodNode">xmlSecTmplSignatureGetC14NMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplSignatureGetC14NMethodNode
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> signNode);</programlisting>
 <para>
 Gets pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod";>&lt;dsig:CanonicalizationMethod/&gt;</ulink> child of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>signNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>signNode</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature ">&lt;dsig:Signature /&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod ">&lt;dsig:CanonicalizationMethod /&gt;</ulink> node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod ">&lt;dsig:CanonicalizationMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform ()</title>
-<indexterm><primary>xmlSecTmplReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplReferenceAddTransform (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecTmplReferenceAddTransform" role="function">
+<title>xmlSecTmplReferenceAddTransform ()</title>
+<indexterm zone="xmlSecTmplReferenceAddTransform"><primary sortas="xmlSecTmplReferenceAddTransform">xmlSecTmplReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplReferenceAddTransform     (<link linkend="xmlNode">xmlNodePtr</link> referenceNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node <parameter>referenceNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>referenceNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>referenceNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara> 		the transform method id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or NULL if an 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or NULL if an 
 error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties ()</title>
-<indexterm><primary>xmlSecTmplObjectAddSignProperties</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplObjectAddSignProperties
-                                            (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
+<refsect2 id="xmlSecTmplObjectAddSignProperties" role="function">
+<title>xmlSecTmplObjectAddSignProperties ()</title>
+<indexterm zone="xmlSecTmplObjectAddSignProperties"><primary sortas="xmlSecTmplObjectAddSignProperties">xmlSecTmplObjectAddSignProperties</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplObjectAddSignProperties   (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>objectNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>objectNode</parameter>&#160;:</term>
 <listitem><simpara> 	the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>target</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>target</parameter>&#160;:</term>
 <listitem><simpara> 		the Target  (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties";>&lt;dsig:SignatureProperties/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest ()</title>
-<indexterm><primary>xmlSecTmplObjectAddManifest</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplObjectAddManifest     (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect2 id="xmlSecTmplObjectAddManifest" role="function">
+<title>xmlSecTmplObjectAddManifest ()</title>
+<indexterm zone="xmlSecTmplObjectAddManifest"><primary sortas="xmlSecTmplObjectAddManifest">xmlSecTmplObjectAddManifest</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplObjectAddManifest         (<link linkend="xmlNode">xmlNodePtr</link> objectNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node <parameter>objectNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>objectNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>objectNode</parameter>&#160;:</term>
 <listitem><simpara> 	the  pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Object";>&lt;dsig:Object/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference ()</title>
-<indexterm><primary>xmlSecTmplManifestAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplManifestAddReference  (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
+<refsect2 id="xmlSecTmplManifestAddReference" role="function">
+<title>xmlSecTmplManifestAddReference ()</title>
+<indexterm zone="xmlSecTmplManifestAddReference"><primary sortas="xmlSecTmplManifestAddReference">xmlSecTmplManifestAddReference</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplManifestAddReference      (<link linkend="xmlNode">xmlNodePtr</link> manifestNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> digestMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node with specified URI (<parameter>uri</parameter>), Id (<parameter>id</parameter>) and 
 Type (<parameter>type</parameter>) attributes and the required children <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod";>&lt;dsig:DigestMethod/&gt;</ulink> and
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue";>&lt;dsig:DigestValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node <parameter>manifestNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>manifestNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>manifestNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>digestMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>digestMethodId</parameter>&#160;:</term>
 <listitem><simpara>	the reference digest method.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the node id (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara> 		the reference node uri (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the reference node type (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate ()</title>
-<indexterm><primary>xmlSecTmplEncDataCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplEncDataCreate         (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *mimeType,
-                                             const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
+<refsect2 id="xmlSecTmplEncDataCreate" role="function">
+<title>xmlSecTmplEncDataCreate ()</title>
+<indexterm zone="xmlSecTmplEncDataCreate"><primary sortas="xmlSecTmplEncDataCreate">xmlSecTmplEncDataCreate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataCreate             (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *mimeType,
+                                                         const <link linkend="xmlChar">xmlChar</link> *encoding);</programlisting>
 <para>
 Creates new <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData ">&lt;enc:EncryptedData /&gt;</ulink> node for encryption template.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to signature document or NULL; in the later
 		case, application must later call <parameter>xmlSetTreeDoc</parameter> to ensure 
 		that all the children nodes have correct pointer to XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>encMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encMethodId</parameter>&#160;:</term>
 <listitem><simpara>	the encryption method (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the Id attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the Type attribute (optional)
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mimeType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mimeType</parameter>&#160;:</term>
 <listitem><simpara> 		the MimeType attribute (optional)
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>encoding</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encoding</parameter>&#160;:</term>
 <listitem><simpara> 		the Encoding attribute (optional)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer newly created  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node or NULL 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer newly created  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node or NULL 
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo ()</title>
-<indexterm><primary>xmlSecTmplEncDataEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplEncDataEnsureKeyInfo  (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect2 id="xmlSecTmplEncDataEnsureKeyInfo" role="function">
+<title>xmlSecTmplEncDataEnsureKeyInfo ()</title>
+<indexterm zone="xmlSecTmplEncDataEnsureKeyInfo"><primary sortas="xmlSecTmplEncDataEnsureKeyInfo">xmlSecTmplEncDataEnsureKeyInfo</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataEnsureKeyInfo      (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> to the  <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the Id attrbibute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties ()</title>
-<indexterm><primary>xmlSecTmplEncDataEnsureEncProperties</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataEnsureEncProperties
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect2 id="xmlSecTmplEncDataEnsureEncProperties" role="function">
+<title>xmlSecTmplEncDataEnsureEncProperties ()</title>
+<indexterm zone="xmlSecTmplEncDataEnsureEncProperties"><primary sortas="xmlSecTmplEncDataEnsureEncProperties">xmlSecTmplEncDataEnsureEncProperties</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplEncDataEnsureEncProperties
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> 
 node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the Id attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty ()</title>
-<indexterm><primary>xmlSecTmplEncDataAddEncProperty</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplEncDataAddEncProperty (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
+<refsect2 id="xmlSecTmplEncDataAddEncProperty" role="function">
+<title>xmlSecTmplEncDataAddEncProperty ()</title>
+<indexterm zone="xmlSecTmplEncDataAddEncProperty"><primary sortas="xmlSecTmplEncDataAddEncProperty">xmlSecTmplEncDataAddEncProperty</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataAddEncProperty     (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *target);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink> node (and the parent 
 <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties";>&lt;enc:EncryptionProperties/&gt;</ulink> node if required) to the 
 <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the Id attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>target</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>target</parameter>&#160;:</term>
 <listitem><simpara> 		the Target attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty";>&lt;enc:EncryptionProperty/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue ()</title>
-<indexterm><primary>xmlSecTmplEncDataEnsureCipherValue</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataEnsureCipherValue
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
+<refsect2 id="xmlSecTmplEncDataEnsureCipherValue" role="function">
+<title>xmlSecTmplEncDataEnsureCipherValue ()</title>
+<indexterm zone="xmlSecTmplEncDataEnsureCipherValue"><primary sortas="xmlSecTmplEncDataEnsureCipherValue">xmlSecTmplEncDataEnsureCipherValue</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataEnsureCipherValue  (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference ()</title>
-<indexterm><primary>xmlSecTmplEncDataEnsureCipherReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataEnsureCipherReference
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTmplEncDataEnsureCipherReference" role="function">
+<title>xmlSecTmplEncDataEnsureCipherReference ()</title>
+<indexterm zone="xmlSecTmplEncDataEnsureCipherReference"><primary sortas="xmlSecTmplEncDataEnsureCipherReference">xmlSecTmplEncDataEnsureCipherReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplEncDataEnsureCipherReference
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node with specified URI attribute <parameter>uri</parameter>
 to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara> 		the URI attribute (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode ()</title>
-<indexterm><primary>xmlSecTmplEncDataGetEncMethodNode</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplEncDataGetEncMethodNode
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
+<refsect2 id="xmlSecTmplEncDataGetEncMethodNode" role="function">
+<title>xmlSecTmplEncDataGetEncMethodNode ()</title>
+<indexterm zone="xmlSecTmplEncDataGetEncMethodNode"><primary sortas="xmlSecTmplEncDataGetEncMethodNode">xmlSecTmplEncDataGetEncMethodNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplEncDataGetEncMethodNode   (<link linkend="xmlNode">xmlNodePtr</link> encNode);</programlisting>
 <para>
 Gets pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod";>&lt;enc:EncrytpionMethod/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData ">&lt;enc:EcnryptedData /&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod ">&lt;enc:EncryptionMethod /&gt;</ulink> node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod ">&lt;enc:EncryptionMethod /&gt;</ulink> node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform ()</title>
-<indexterm><primary>xmlSecTmplCipherReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplCipherReferenceAddTransform
-                                            (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecTmplCipherReferenceAddTransform" role="function">
+<title>xmlSecTmplCipherReferenceAddTransform ()</title>
+<indexterm zone="xmlSecTmplCipherReferenceAddTransform"><primary sortas="xmlSecTmplCipherReferenceAddTransform">xmlSecTmplCipherReferenceAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplCipherReferenceAddTransform
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> cipherReferenceNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node)
 with specified transform methods <parameter>transform</parameter> to the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink>
 child node of the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node <parameter>encNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cipherReferenceNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cipherReferenceNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference";>&lt;enc:CipherReference/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara> 		the transform id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference ()</title>
-<indexterm><primary>xmlSecTmplReferenceListAddDataReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplReferenceListAddDataReference
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTmplReferenceListAddDataReference" role="function">
+<title>xmlSecTmplReferenceListAddDataReference ()</title>
+<indexterm zone="xmlSecTmplReferenceListAddDataReference"><primary sortas="xmlSecTmplReferenceListAddDataReference">xmlSecTmplReferenceListAddDataReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplReferenceListAddDataReference
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 	                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>                        uri to reference (optional)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-DataReference";>&lt;enc:DataReference/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference ()</title>
-<indexterm><primary>xmlSecTmplReferenceListAddKeyReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplReferenceListAddKeyReference
-                                            (<link linkend="xmlNode">xmlNodePtr</link> encNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTmplReferenceListAddKeyReference" role="function">
+<title>xmlSecTmplReferenceListAddKeyReference ()</title>
+<indexterm zone="xmlSecTmplReferenceListAddKeyReference"><primary sortas="xmlSecTmplReferenceListAddKeyReference">xmlSecTmplReferenceListAddKeyReference</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplReferenceListAddKeyReference
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> encNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> and the parent <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList";>&lt;enc:ReferenceList/&gt;</ulink> node (if needed).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encNode</parameter>&#160;:</term>
 <listitem><simpara> 	                the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>                        uri to reference (optional)
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> node or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference";>&lt;enc:KeyReference/&gt;</ulink> node or 
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName ()</title>
-<indexterm><primary>xmlSecTmplKeyInfoAddKeyName</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplKeyInfoAddKeyName     (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
+<refsect2 id="xmlSecTmplKeyInfoAddKeyName" role="function">
+<title>xmlSecTmplKeyInfoAddKeyName ()</title>
+<indexterm zone="xmlSecTmplKeyInfoAddKeyName"><primary sortas="xmlSecTmplKeyInfoAddKeyName">xmlSecTmplKeyInfoAddKeyName</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddKeyName         (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the key name (optional).	
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyName";>&lt;dsig:KeyName/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue ()</title>
-<indexterm><primary>xmlSecTmplKeyInfoAddKeyValue</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplKeyInfoAddKeyValue    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
+<refsect2 id="xmlSecTmplKeyInfoAddKeyValue" role="function">
+<title>xmlSecTmplKeyInfoAddKeyValue ()</title>
+<indexterm zone="xmlSecTmplKeyInfoAddKeyValue"><primary sortas="xmlSecTmplKeyInfoAddKeyValue">xmlSecTmplKeyInfoAddKeyValue</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddKeyValue        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue";>&lt;dsig:KeyValue/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data ()</title>
-<indexterm><primary>xmlSecTmplKeyInfoAddX509Data</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplKeyInfoAddX509Data    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
+<refsect2 id="xmlSecTmplKeyInfoAddX509Data" role="function">
+<title>xmlSecTmplKeyInfoAddX509Data ()</title>
+<indexterm zone="xmlSecTmplKeyInfoAddX509Data"><primary sortas="xmlSecTmplKeyInfoAddX509Data">xmlSecTmplKeyInfoAddX509Data</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddX509Data        (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod ()</title>
-<indexterm><primary>xmlSecTmplKeyInfoAddRetrievalMethod</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplKeyInfoAddRetrievalMethod
-                                            (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
+<refsect2 id="xmlSecTmplKeyInfoAddRetrievalMethod" role="function">
+<title>xmlSecTmplKeyInfoAddRetrievalMethod ()</title>
+<indexterm zone="xmlSecTmplKeyInfoAddRetrievalMethod"><primary sortas="xmlSecTmplKeyInfoAddRetrievalMethod">xmlSecTmplKeyInfoAddRetrievalMethod</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddRetrievalMethod (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara> 		the URI attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the Type attribute(optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform ()</title>
-<indexterm><primary>xmlSecTmplRetrievalMethodAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplRetrievalMethodAddTransform
-                                            (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecTmplRetrievalMethodAddTransform" role="function">
+<title>xmlSecTmplRetrievalMethodAddTransform ()</title>
+<indexterm zone="xmlSecTmplRetrievalMethodAddTransform"><primary sortas="xmlSecTmplRetrievalMethodAddTransform">xmlSecTmplRetrievalMethodAddTransform</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplRetrievalMethodAddTransform
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> retrMethodNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node (and the parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node
 if required) to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node <parameter>retrMethod</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>retrMethodNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>retrMethodNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod";>&lt;dsig:RetrievalMethod/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara> 	the transform id.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transforms";>&lt;dsig:Transforms/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey ()</title>
-<indexterm><primary>xmlSecTmplKeyInfoAddEncryptedKey</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplKeyInfoAddEncryptedKey
-                                            (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
-                                             const <link linkend="xmlChar">xmlChar</link> *id,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *recipient);</programlisting>
+<refsect2 id="xmlSecTmplKeyInfoAddEncryptedKey" role="function">
+<title>xmlSecTmplKeyInfoAddEncryptedKey ()</title>
+<indexterm zone="xmlSecTmplKeyInfoAddEncryptedKey"><primary sortas="xmlSecTmplKeyInfoAddEncryptedKey">xmlSecTmplKeyInfoAddEncryptedKey</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplKeyInfoAddEncryptedKey    (<link linkend="xmlNode">xmlNodePtr</link> keyInfoNode,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> encMethodId,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *recipient);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node with given attributes to 
 the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node <parameter>keyInfoNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keyInfoNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>encMethodId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encMethodId</parameter>&#160;:</term>
 <listitem><simpara>	the encryption method (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the Id attribute (optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the Type attribute (optional). 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>recipient</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>recipient</parameter>&#160;:</term>
 <listitem><simpara> 		the Recipient attribute (optional). 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial ()</title>
-<indexterm><primary>xmlSecTmplX509DataAddIssuerSerial</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplX509DataAddIssuerSerial
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
+<refsect2 id="xmlSecTmplX509DataAddIssuerSerial" role="function">
+<title>xmlSecTmplX509DataAddIssuerSerial ()</title>
+<indexterm zone="xmlSecTmplX509DataAddIssuerSerial"><primary sortas="xmlSecTmplX509DataAddIssuerSerial">xmlSecTmplX509DataAddIssuerSerial</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddIssuerSerial   (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509DataNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName ()</title>
-<indexterm><primary>xmlSecTmplX509IssuerSerialAddIssuerName</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplX509IssuerSerialAddIssuerName
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *issuerName);</programlisting>
+<refsect2 id="xmlSecTmplX509IssuerSerialAddIssuerName" role="function">
+<title>xmlSecTmplX509IssuerSerialAddIssuerName ()</title>
+<indexterm zone="xmlSecTmplX509IssuerSerialAddIssuerName"><primary sortas="xmlSecTmplX509IssuerSerialAddIssuerName">xmlSecTmplX509IssuerSerialAddIssuerName</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplX509IssuerSerialAddIssuerName
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *issuerName);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node <parameter>x509IssuerSerialNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509IssuerSerialNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509IssuerSerialNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>issuerName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>issuerName</parameter>&#160;:</term>
 <listitem><simpara>		the issuer name (optional).	
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName";>&lt;dsig:X509IssuerName/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber ()</title>
-<indexterm><primary>xmlSecTmplX509IssuerSerialAddSerialNumber</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplX509IssuerSerialAddSerialNumber
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *serial);</programlisting>
+<refsect2 id="xmlSecTmplX509IssuerSerialAddSerialNumber" role="function">
+<title>xmlSecTmplX509IssuerSerialAddSerialNumber ()</title>
+<indexterm zone="xmlSecTmplX509IssuerSerialAddSerialNumber"><primary sortas="xmlSecTmplX509IssuerSerialAddSerialNumber">xmlSecTmplX509IssuerSerialAddSerialNumber</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>          xmlSecTmplX509IssuerSerialAddSerialNumber
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> x509IssuerSerialNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *serial);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber";>&lt;dsig:X509SerialNumber/&gt;</ulink> node to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node <parameter>x509IssuerSerialNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509IssuerSerialNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509IssuerSerialNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>serial</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>serial</parameter>&#160;:</term>
 <listitem><simpara>		the serial number (optional).	
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber";>&lt;dsig:X509SerialNumber/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber";>&lt;dsig:X509SerialNumber/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName ()</title>
-<indexterm><primary>xmlSecTmplX509DataAddSubjectName</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplX509DataAddSubjectName
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
+<refsect2 id="xmlSecTmplX509DataAddSubjectName" role="function">
+<title>xmlSecTmplX509DataAddSubjectName ()</title>
+<indexterm zone="xmlSecTmplX509DataAddSubjectName"><primary sortas="xmlSecTmplX509DataAddSubjectName">xmlSecTmplX509DataAddSubjectName</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddSubjectName    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509DataNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI ()</title>
-<indexterm><primary>xmlSecTmplX509DataAddSKI</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplX509DataAddSKI        (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
+<refsect2 id="xmlSecTmplX509DataAddSKI" role="function">
+<title>xmlSecTmplX509DataAddSKI ()</title>
+<indexterm zone="xmlSecTmplX509DataAddSKI"><primary sortas="xmlSecTmplX509DataAddSKI">xmlSecTmplX509DataAddSKI</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddSKI            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI";>&lt;dsig:X509SKI/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509DataNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI";>&lt;dsig:X509SKI/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI";>&lt;dsig:X509SKI/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate ()</title>
-<indexterm><primary>xmlSecTmplX509DataAddCertificate</primary></indexterm><programlisting><link linkend="xmlNode">xmlNodePtr</link>  xmlSecTmplX509DataAddCertificate
-                                            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
+<refsect2 id="xmlSecTmplX509DataAddCertificate" role="function">
+<title>xmlSecTmplX509DataAddCertificate ()</title>
+<indexterm zone="xmlSecTmplX509DataAddCertificate"><primary sortas="xmlSecTmplX509DataAddCertificate">xmlSecTmplX509DataAddCertificate</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddCertificate    (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509DataNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL ()</title>
-<indexterm><primary>xmlSecTmplX509DataAddCRL</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecTmplX509DataAddCRL        (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
+<refsect2 id="xmlSecTmplX509DataAddCRL" role="function">
+<title>xmlSecTmplX509DataAddCRL ()</title>
+<indexterm zone="xmlSecTmplX509DataAddCRL"><primary sortas="xmlSecTmplX509DataAddCRL">xmlSecTmplX509DataAddCRL</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecTmplX509DataAddCRL            (<link linkend="xmlNode">xmlNodePtr</link> x509DataNode);</programlisting>
 <para>
 Adds <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node to the given <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>x509DataNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>x509DataNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node or
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the newly created <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node or
 NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength ()</title>
-<indexterm><primary>xmlSecTmplTransformAddHmacOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddHmacOutputLength
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddHmacOutputLength" role="function">
+<title>xmlSecTmplTransformAddHmacOutputLength ()</title>
+<indexterm zone="xmlSecTmplTransformAddHmacOutputLength"><primary sortas="xmlSecTmplTransformAddHmacOutputLength">xmlSecTmplTransformAddHmacOutputLength</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddHmacOutputLength
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> bitsLen);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength";>&lt;dsig:HMACOutputLength/&gt;</ulink> child for the HMAC transform 
 node <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>bitsLen</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>bitsLen</parameter>&#160;:</term>
 <listitem><simpara> 		the required length in bits
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negatie value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negatie value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam ()</title>
-<indexterm><primary>xmlSecTmplTransformAddRsaOaepParam</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddRsaOaepParam
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddRsaOaepParam" role="function">
+<title>xmlSecTmplTransformAddRsaOaepParam ()</title>
+<indexterm zone="xmlSecTmplTransformAddRsaOaepParam"><primary sortas="xmlSecTmplTransformAddRsaOaepParam">xmlSecTmplTransformAddRsaOaepParam</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddRsaOaepParam  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buf,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam";>&lt;enc:OAEPParam/&gt;</ulink> child node in the <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buf</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buf</parameter>&#160;:</term>
 <listitem><simpara> 		the OAEP param buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the OAEP param buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet ()</title>
-<indexterm><primary>xmlSecTmplTransformAddXsltStylesheet</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddXsltStylesheet
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *xslt);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddXsltStylesheet" role="function">
+<title>xmlSecTmplTransformAddXsltStylesheet ()</title>
+<indexterm zone="xmlSecTmplTransformAddXsltStylesheet"><primary sortas="xmlSecTmplTransformAddXsltStylesheet">xmlSecTmplTransformAddXsltStylesheet</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXsltStylesheet
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *xslt);</programlisting>
 <para>
 Writes the XSLT transform expression to the <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>xslt</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>xslt</parameter>&#160;:</term>
 <listitem><simpara> 		the XSLT transform exspression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces ()</title>
-<indexterm><primary>xmlSecTmplTransformAddC14NInclNamespaces</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddC14NInclNamespaces
-                                            (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *prefixList);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddC14NInclNamespaces" role="function">
+<title>xmlSecTmplTransformAddC14NInclNamespaces ()</title>
+<indexterm zone="xmlSecTmplTransformAddC14NInclNamespaces"><primary sortas="xmlSecTmplTransformAddC14NInclNamespaces">xmlSecTmplTransformAddC14NInclNamespaces</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddC14NInclNamespaces
+                                                        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *prefixList);</programlisting>
 <para>
 Adds "inclusive" namespaces to the ExcC14N transform node <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>prefixList</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>prefixList</parameter>&#160;:</term>
 <listitem><simpara> 	the white space delimited  list of namespace prefixes, 
 		where "<link linkend="default"><type>default</type></link>" indicates the default namespace
 		(optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 if success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 if success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath ()</title>
-<indexterm><primary>xmlSecTmplTransformAddXPath</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddXPath     (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddXPath" role="function">
+<title>xmlSecTmplTransformAddXPath ()</title>
+<indexterm zone="xmlSecTmplTransformAddXPath"><primary sortas="xmlSecTmplTransformAddXPath">xmlSecTmplTransformAddXPath</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPath         (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
 <para>
 Writes XPath transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node 
 <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>expression</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>expression</parameter>&#160;:</term>
 <listitem><simpara> 	the XPath expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nsList</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nsList</parameter>&#160;:</term>
 <listitem><simpara> 		the NULL terminated list of namespace prefix/href pairs
 		(optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 for success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2 ()</title>
-<indexterm><primary>xmlSecTmplTransformAddXPath2</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddXPath2    (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *type,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddXPath2" role="function">
+<title>xmlSecTmplTransformAddXPath2 ()</title>
+<indexterm zone="xmlSecTmplTransformAddXPath2"><primary sortas="xmlSecTmplTransformAddXPath2">xmlSecTmplTransformAddXPath2</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPath2        (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
 <para>
 Writes XPath2 transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node 
 <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara> 		the XPath2 transform type ("union", "intersect" or "subtract").
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>expression</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>expression</parameter>&#160;:</term>
 <listitem><simpara> 	the XPath expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nsList</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nsList</parameter>&#160;:</term>
 <listitem><simpara> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 for success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer ()</title>
-<indexterm><primary>xmlSecTmplTransformAddXPointer</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTmplTransformAddXPointer  (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
-                                             const <link linkend="xmlChar">xmlChar</link> *expression,
-                                             const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
+<refsect2 id="xmlSecTmplTransformAddXPointer" role="function">
+<title>xmlSecTmplTransformAddXPointer ()</title>
+<indexterm zone="xmlSecTmplTransformAddXPointer"><primary sortas="xmlSecTmplTransformAddXPointer">xmlSecTmplTransformAddXPointer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTmplTransformAddXPointer      (<link linkend="xmlNode">xmlNodePtr</link> transformNode,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expression,
+                                                         const <link linkend="xmlChar">xmlChar</link> **nsList);</programlisting>
 <para>
 Writes XPoniter transform infromation to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node 
 <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformNode</parameter>&#160;:</term>
 <listitem><simpara> 	the pointer to the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>expression</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>expression</parameter>&#160;:</term>
 <listitem><simpara> 	the XPath expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nsList</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nsList</parameter>&#160;:</term>
 <listitem><simpara> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 for success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 for success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/transforms.sgml b/docs/api/sgml/transforms.sgml
index f464387..05d38a1 100644
--- a/docs/api/sgml/transforms.sgml
+++ b/docs/api/sgml/transforms.sgml
@@ -1,297 +1,269 @@
 <refentry id="xmlsec-transforms">
 <refmeta>
-<refentrytitle>transforms</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-transforms.top_of_page">transforms</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>transforms</refname><refpurpose>Transform object definition.</refpurpose>
+<refname>transforms</refname>
+<refpurpose>Transform object definition.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-transforms.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</link>
-<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <link linkend="xmlSecTransformIdsGet">xmlSecTransformIdsGet</link>      (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformIdsInit">xmlSecTransformIdsInit</link>          (void);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</link>      (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</link>      (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-enum        <link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>;
-enum        <link linkend="xmlSecTransformMode">xmlSecTransformMode</link>;
-enum        <link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>;
-typedef     <link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>;
-#define     <link linkend="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</link>
-#define     <link linkend="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</link>
-#define     <link linkend="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</link>
-#define     <link linkend="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</link>
-#define     <link linkend="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</link>
-#define     <link linkend="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</link>
-<link linkend="int">int</link>         <link linkend="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</link>     (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-typedef     <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>;
-#define     <link linkend="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</link>
-#define     <link linkend="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</link>
-#define     <link linkend="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</link>
-typedef     <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link>;
-#define     <link linkend="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</link>
-#define     <link linkend="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</link>
-#define     <link linkend="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</link>
-#define     <link linkend="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</link>
-#define     <link linkend="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</link>
-#define     <link linkend="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</link>
-#define     <link linkend="xmlSecTransformUsageAny">xmlSecTransformUsageAny</link>
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformCtxPreExecuteCallback">*xmlSecTransformCtxPreExecuteCallback</link>)
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-#define     <link linkend="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</link>
-struct      <link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>;
-<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> <link linkend="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</link>
-                                            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</link>       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</link>    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</link>      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformCtxReset">xmlSecTransformCtxReset</link>         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</link>  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             <link linkend="xmlNode">xmlNodePtr</link> hereNode);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</link>       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransform">xmlSecTransformPtr</link> <link linkend="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</link>
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="xmlSecTransform">xmlSecTransformPtr</link> <link linkend="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</link>
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="xmlSecTransform">xmlSecTransformPtr</link> <link linkend="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</link>
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</link> (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</link>       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</link> (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</link>    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</link>    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</link>       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</link>     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</link>  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-struct      <link linkend="xmlSecTransform">xmlSecTransform</link>;
-<link linkend="xmlSecTransform">xmlSecTransformPtr</link> <link linkend="xmlSecTransformCreate">xmlSecTransformCreate</link>    (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformDestroy">xmlSecTransformDestroy</link>          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link> <link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link>  (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformPump">xmlSecTransformPump</link>             (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformSetKey">xmlSecTransformSetKey</link>           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformVerify">xmlSecTransformVerify</link>           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> <link linkend="xmlSecTransformGetDataType">xmlSecTransformGetDataType</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformPushBin">xmlSecTransformPushBin</link>          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformPopBin">xmlSecTransformPopBin</link>           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformPushXml">xmlSecTransformPushXml</link>          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformPopXml">xmlSecTransformPopXml</link>           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformExecute">xmlSecTransformExecute</link>          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="int">int</link> last,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformDebugDump">xmlSecTransformDebugDump</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</link>     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecTransformGetName">xmlSecTransformGetName</link>          (transform)
-#define     <link linkend="xmlSecTransformIsValid">xmlSecTransformIsValid</link>          (transform)
-#define     <link linkend="xmlSecTransformCheckType">xmlSecTransformCheckType</link>        (transform, t)
-#define     <link linkend="xmlSecTransformCheckId">xmlSecTransformCheckId</link>          (transform, i)
-#define     <link linkend="xmlSecTransformCheckSize">xmlSecTransformCheckSize</link>        (transform, size)
-<link linkend="int">int</link>         <link linkend="xmlSecTransformConnect">xmlSecTransformConnect</link>          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformRemove">xmlSecTransformRemove</link>           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> <link linkend="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</link>   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</link>   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> <link linkend="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link> <link linkend="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformInitializeMethod">*xmlSecTransformInitializeMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="void">void</link>        (<link linkend="xmlSecTransformFinalizeMethod">*xmlSecTransformFinalizeMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
-<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> (<link linkend="xmlSecTransformGetDataTypeMethod">*xmlSecTransformGetDataTypeMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformNodeReadMethod">*xmlSecTransformNodeReadMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformNodeWriteMethod">*xmlSecTransformNodeWriteMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformSetKeyRequirementsMethod">*xmlSecTransformSetKeyRequirementsMethod</link>)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformSetKeyMethod">*xmlSecTransformSetKeyMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformVerifyMethod">*xmlSecTransformVerifyMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformPushBinMethod">*xmlSecTransformPushBinMethod</link>) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformPopBinMethod">*xmlSecTransformPopBinMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformPushXmlMethod">*xmlSecTransformPushXmlMethod</link>) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformPopXmlMethod">*xmlSecTransformPopXmlMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-<link linkend="int">int</link>         (<link linkend="xmlSecTransformExecuteMethod">*xmlSecTransformExecuteMethod</link>) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="int">int</link> last,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
-struct      <link linkend="xmlSecTransformKlass">xmlSecTransformKlass</link>;
-#define     <link linkend="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</link>     (klass)
-#define     <link linkend="xmlSecTransformIdListId">xmlSecTransformIdListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformIdListFind">xmlSecTransformIdListFind</link>       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</link>  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</link>
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</link>
-#define     <link linkend="xmlSecTransformBase64Id">xmlSecTransformBase64Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</link>
-                                            (void);
-<link linkend="void">void</link>        <link linkend="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</link>
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> lineSize);
-#define     <link linkend="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformXPathId">xmlSecTransformXPathId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformXPointerId">xmlSecTransformXPointerId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</link>  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *expr,
-                                             <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
-                                             <link linkend="xmlNode">xmlNodePtr</link> hereNode);
-#define     <link linkend="xmlSecTransformXsltId">xmlSecTransformXsltId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</link>
-                                            (void);
-#define     <link linkend="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</link>
-<link linkend="xmlSecTransformId">xmlSecTransformId</link> <link linkend="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</link>
-                                            (void);
-<link linkend="int">int</link>         <link linkend="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</link>  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);
+#define             <link linkend="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</link>
+<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    <link linkend="xmlSecTransformIdsGet">xmlSecTransformIdsGet</link>               (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsInit">xmlSecTransformIdsInit</link>              (void);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</link>          (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</link>   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</link>          (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
+enum                <link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>;
+enum                <link linkend="xmlSecTransformMode">xmlSecTransformMode</link>;
+enum                <link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>;
+typedef             <link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>;
+#define             <link linkend="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</link>
+#define             <link linkend="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</link>
+#define             <link linkend="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</link>
+#define             <link linkend="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</link>
+#define             <link linkend="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</link>
+#define             <link linkend="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</link>         (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+typedef             <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>;
+#define             <link linkend="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</link>
+#define             <link linkend="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</link>
+#define             <link linkend="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</link>
+typedef             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link>;
+#define             <link linkend="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</link>
+#define             <link linkend="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</link>
+#define             <link linkend="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</link>
+#define             <link linkend="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</link>
+#define             <link linkend="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</link>
+#define             <link linkend="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</link>
+#define             <link linkend="xmlSecTransformUsageAny">xmlSecTransformUsageAny</link>
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformCtxPreExecuteCallback">*xmlSecTransformCtxPreExecuteCallback</link>)
+                                                        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+#define             <link linkend="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</link>
+struct              <link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>;
+<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link>  <link linkend="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</link>         (void);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</link>          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxReset">xmlSecTransformCtxReset</link>             (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</link>      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</link>            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</link>            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</link>   (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
+<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</link>  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
+<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</link>          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</link>     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</link>     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</link>        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</link>           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlDoc">xmlDocPtr</link> doc);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</link>         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</link>      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+struct              <link linkend="xmlSecTransform">xmlSecTransform</link>;
+<link linkend="xmlSecTransform">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformCreate">xmlSecTransformCreate</link>               (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformDestroy">xmlSecTransformDestroy</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  <link linkend="xmlSecTransformNodeRead">xmlSecTransformNodeRead</link>             (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformPump">xmlSecTransformPump</link>                 (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformSetKey">xmlSecTransformSetKey</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</link>            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformVerify">xmlSecTransformVerify</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  <link linkend="xmlSecTransformGetDataType">xmlSecTransformGetDataType</link>     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformPushBin">xmlSecTransformPushBin</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformPopBin">xmlSecTransformPopBin</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformPushXml">xmlSecTransformPushXml</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformPopXml">xmlSecTransformPopXml</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformExecute">xmlSecTransformExecute</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="int">int</link> last,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformDebugDump">xmlSecTransformDebugDump</link>            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</link>         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecTransformGetName">xmlSecTransformGetName</link>              (transform)
+#define             <link linkend="xmlSecTransformIsValid">xmlSecTransformIsValid</link>              (transform)
+#define             <link linkend="xmlSecTransformCheckType">xmlSecTransformCheckType</link>            (transform, t)
+#define             <link linkend="xmlSecTransformCheckId">xmlSecTransformCheckId</link>              (transform, i)
+#define             <link linkend="xmlSecTransformCheckSize">xmlSecTransformCheckSize</link>            (transform, size)
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformConnect">xmlSecTransformConnect</link>              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformRemove">xmlSecTransformRemove</link>               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  <link linkend="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</link>
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</link>       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</link>       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</link>        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  <link linkend="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</link>   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link>  <link linkend="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</link>
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformInitializeMethod">*xmlSecTransformInitializeMethod</link>)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="void">void</link>                (<link linkend="xmlSecTransformFinalizeMethod">*xmlSecTransformFinalizeMethod</link>)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);
+<link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  (<link linkend="xmlSecTransformGetDataTypeMethod">*xmlSecTransformGetDataTypeMethod</link>)
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformNodeReadMethod">*xmlSecTransformNodeReadMethod</link>)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformNodeWriteMethod">*xmlSecTransformNodeWriteMethod</link>)   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformSetKeyRequirementsMethod">*xmlSecTransformSetKeyRequirementsMethod</link>)
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformSetKeyMethod">*xmlSecTransformSetKeyMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformVerifyMethod">*xmlSecTransformVerifyMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPushBinMethod">*xmlSecTransformPushBinMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPopBinMethod">*xmlSecTransformPopBinMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPushXmlMethod">*xmlSecTransformPushXmlMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformPopXmlMethod">*xmlSecTransformPopXmlMethod</link>)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+<link linkend="int">int</link>                 (<link linkend="xmlSecTransformExecuteMethod">*xmlSecTransformExecuteMethod</link>)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="int">int</link> last,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);
+struct              <link linkend="xmlSecTransformKlass">xmlSecTransformKlass</link>;
+#define             <link linkend="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</link>         (klass)
+#define             <link linkend="xmlSecTransformIdListId">xmlSecTransformIdListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</link>       (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformIdListFind">xmlSecTransformIdListFind</link>           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</link>     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</link>      (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</link>   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</link>
+#define             <link linkend="xmlSecTransformBase64Id">xmlSecTransformBase64Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</link>       (void);
+<link linkend="void">void</link>                <link linkend="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</link>    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> lineSize);
+#define             <link linkend="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</link>   (void);
+#define             <link linkend="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</link>     (void);
+#define             <link linkend="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</link>    (void);
+#define             <link linkend="xmlSecTransformXPathId">xmlSecTransformXPathId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</link>        (void);
+#define             <link linkend="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</link>       (void);
+#define             <link linkend="xmlSecTransformXPointerId">xmlSecTransformXPointerId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</link>     (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expr,
+                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);
+#define             <link linkend="xmlSecTransformXsltId">xmlSecTransformXsltId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</link>         (void);
+#define             <link linkend="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</link>
+                                                        (void);
+#define             <link linkend="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</link>
+<link linkend="xmlSecTransformId">xmlSecTransformId</link>   <link linkend="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</link>   (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</link>      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);
 </synopsis>
 </refsynopsisdiv>
 
@@ -303,87 +275,80 @@ struct      <link linkend="xmlSecTransformKlass">xmlSecTransformKlass</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-transforms.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Transform object definition.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</title>
-<indexterm><primary>XMLSEC_TRANSFORM_BINARY_CHUNK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORM_BINARY_CHUNK			64
+<refsect1 id="xmlsec-transforms.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS" role="macro">
+<title>XMLSEC_TRANSFORM_BINARY_CHUNK</title>
+<indexterm zone="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS"><primary sortas="XMLSEC_TRANSFORM_BINARY_CHUNK">XMLSEC_TRANSFORM_BINARY_CHUNK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORM_BINARY_CHUNK			64
 </programlisting>
 <para>
 The binary data chunks size. XMLSec processes binary data one chunk 
 at a time. Changing this impacts xmlsec memory usage and performance.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdsGet">xmlSecTransformIdsGet ()</title>
-<indexterm><primary>xmlSecTransformIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> xmlSecTransformIdsGet      (void);</programlisting>
+<refsect2 id="xmlSecTransformIdsGet" role="function">
+<title>xmlSecTransformIdsGet ()</title>
+<indexterm zone="xmlSecTransformIdsGet"><primary sortas="xmlSecTransformIdsGet">xmlSecTransformIdsGet</primary></indexterm><programlisting><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>    xmlSecTransformIdsGet               (void);</programlisting>
 <para>
 Gets global registered transform klasses list.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to list of all registered transform klasses.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to list of all registered transform klasses.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdsInit">xmlSecTransformIdsInit ()</title>
-<indexterm><primary>xmlSecTransformIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformIdsInit          (void);</programlisting>
+<refsect2 id="xmlSecTransformIdsInit" role="function">
+<title>xmlSecTransformIdsInit ()</title>
+<indexterm zone="xmlSecTransformIdsInit"><primary sortas="xmlSecTransformIdsInit">xmlSecTransformIdsInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsInit              (void);</programlisting>
 <para>
 Initializes the transform klasses. This function is called from the 
 <link linkend="xmlSecInit"><type>xmlSecInit</type></link> function and the application should not call it directly.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown ()</title>
-<indexterm><primary>xmlSecTransformIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformIdsShutdown      (void);</programlisting>
+<refsect2 id="xmlSecTransformIdsShutdown" role="function">
+<title>xmlSecTransformIdsShutdown ()</title>
+<indexterm zone="xmlSecTransformIdsShutdown"><primary sortas="xmlSecTransformIdsShutdown">xmlSecTransformIdsShutdown</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdsShutdown          (void);</programlisting>
 <para>
 Shuts down the keys data klasses. This function is called from the 
 <link linkend="xmlSecShutdown"><type>xmlSecShutdown</type></link> function and the application should not call it directly.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault ()</title>
-<indexterm><primary>xmlSecTransformIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformIdsRegisterDefault
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformIdsRegisterDefault" role="function">
+<title>xmlSecTransformIdsRegisterDefault ()</title>
+<indexterm zone="xmlSecTransformIdsRegisterDefault"><primary sortas="xmlSecTransformIdsRegisterDefault">xmlSecTransformIdsRegisterDefault</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsRegisterDefault   (void);</programlisting>
 <para>
 Registers default (implemented by XML Security Library)
 transform klasses: XPath transform, Base64 transform, ...</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister ()</title>
-<indexterm><primary>xmlSecTransformIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformIdsRegister      (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<refsect2 id="xmlSecTransformIdsRegister" role="function">
+<title>xmlSecTransformIdsRegister ()</title>
+<indexterm zone="xmlSecTransformIdsRegister"><primary sortas="xmlSecTransformIdsRegister">xmlSecTransformIdsRegister</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdsRegister          (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
 <para>
 Registers <parameter>id</parameter> in the global list of transform klasses.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformStatus">enum xmlSecTransformStatus</title>
-<indexterm><primary>xmlSecTransformStatus</primary></indexterm><programlisting>typedef enum  {
+<refsect2 id="xmlSecTransformStatus" role="enum">
+<title>enum xmlSecTransformStatus</title>
+<indexterm zone="xmlSecTransformStatus"><primary sortas="xmlSecTransformStatus">xmlSecTransformStatus</primary></indexterm><programlisting>typedef enum  {
     xmlSecTransformStatusNone = 0,
     xmlSecTransformStatusWorking,
     xmlSecTransformStatusFinished,
@@ -394,37 +359,36 @@ Registers <parameter>id</parameter> in the global list of transform klasses.</pa
 <para>
 The transform execution status.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecTransformStatusNone" role="constant">
 <term><literal>xmlSecTransformStatusNone</literal></term>
 <listitem><simpara> 		the status unknown.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformStatusWorking" role="constant">
 <term><literal>xmlSecTransformStatusWorking</literal></term>
 <listitem><simpara> 	the transform is executed.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformStatusFinished" role="constant">
 <term><literal>xmlSecTransformStatusFinished</literal></term>
 <listitem><simpara> 	the transform finished
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformStatusOk" role="constant">
 <term><literal>xmlSecTransformStatusOk</literal></term>
 <listitem><simpara> 		the transform succeeded.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformStatusFail" role="constant">
 <term><literal>xmlSecTransformStatusFail</literal></term>
 <listitem><simpara> 		the transform failed (an error occur).
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformMode">enum xmlSecTransformMode</title>
-<indexterm><primary>xmlSecTransformMode</primary></indexterm><programlisting>typedef enum  {
+<refsect2 id="xmlSecTransformMode" role="enum">
+<title>enum xmlSecTransformMode</title>
+<indexterm zone="xmlSecTransformMode"><primary sortas="xmlSecTransformMode">xmlSecTransformMode</primary></indexterm><programlisting>typedef enum  {
     xmlSecTransformModeNone = 0,
     xmlSecTransformModePush,
     xmlSecTransformModePop
@@ -433,27 +397,26 @@ The transform execution status.</para>
 <para>
 The transform operation mode</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecTransformModeNone" role="constant">
 <term><literal>xmlSecTransformModeNone</literal></term>
 <listitem><simpara> 		the mode is unknown.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformModePush" role="constant">
 <term><literal>xmlSecTransformModePush</literal></term>
 <listitem><simpara> 		pushing data thru transform. 
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformModePop" role="constant">
 <term><literal>xmlSecTransformModePop</literal></term>
 <listitem><simpara> 		popping data from transform.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformOperation">enum xmlSecTransformOperation</title>
-<indexterm><primary>xmlSecTransformOperation</primary></indexterm><programlisting>typedef enum  {
+<refsect2 id="xmlSecTransformOperation" role="enum">
+<title>enum xmlSecTransformOperation</title>
+<indexterm zone="xmlSecTransformOperation"><primary sortas="xmlSecTransformOperation">xmlSecTransformOperation</primary></indexterm><programlisting>typedef enum  {
     xmlSecTransformOperationNone = 0,
     xmlSecTransformOperationEncode,
     xmlSecTransformOperationDecode,
@@ -466,268 +429,244 @@ The transform operation mode</para>
 <para>
 The transform operation.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationNone" role="constant">
 <term><literal>xmlSecTransformOperationNone</literal></term>
 <listitem><simpara>	the operation is unknown.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationEncode" role="constant">
 <term><literal>xmlSecTransformOperationEncode</literal></term>
 <listitem><simpara>	the encode operation (for base64 transform).	
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationDecode" role="constant">
 <term><literal>xmlSecTransformOperationDecode</literal></term>
 <listitem><simpara>	the decode operation (for base64 transform).
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationSign" role="constant">
 <term><literal>xmlSecTransformOperationSign</literal></term>
 <listitem><simpara>	the sign or digest operation.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationVerify" role="constant">
 <term><literal>xmlSecTransformOperationVerify</literal></term>
 <listitem><simpara>	the verification of signature or digest operation.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationEncrypt" role="constant">
 <term><literal>xmlSecTransformOperationEncrypt</literal></term>
 <listitem><simpara>	the encryption operation.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecTransformOperationDecrypt" role="constant">
 <term><literal>xmlSecTransformOperationDecrypt</literal></term>
 <listitem><simpara>	the decryption operation.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriType">xmlSecTransformUriType</title>
-<indexterm><primary>xmlSecTransformUriType</primary></indexterm><programlisting>typedef unsigned int				xmlSecTransformUriType;
+<refsect2 id="xmlSecTransformUriType" role="typedef">
+<title>xmlSecTransformUriType</title>
+<indexterm zone="xmlSecTransformUriType"><primary sortas="xmlSecTransformUriType">xmlSecTransformUriType</primary></indexterm><programlisting>typedef unsigned int				xmlSecTransformUriType;
 </programlisting>
 <para>
 URI transform type bit mask.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</title>
-<indexterm><primary>xmlSecTransformUriTypeNone</primary></indexterm><programlisting>#define xmlSecTransformUriTypeNone		0x0000
+<refsect2 id="xmlSecTransformUriTypeNone" role="macro">
+<title>xmlSecTransformUriTypeNone</title>
+<indexterm zone="xmlSecTransformUriTypeNone"><primary sortas="xmlSecTransformUriTypeNone">xmlSecTransformUriTypeNone</primary></indexterm><programlisting>#define xmlSecTransformUriTypeNone		0x0000
 </programlisting>
 <para>
 The URI type is unknown or not set.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</title>
-<indexterm><primary>xmlSecTransformUriTypeEmpty</primary></indexterm><programlisting>#define xmlSecTransformUriTypeEmpty		0x0001
+<refsect2 id="xmlSecTransformUriTypeEmpty" role="macro">
+<title>xmlSecTransformUriTypeEmpty</title>
+<indexterm zone="xmlSecTransformUriTypeEmpty"><primary sortas="xmlSecTransformUriTypeEmpty">xmlSecTransformUriTypeEmpty</primary></indexterm><programlisting>#define xmlSecTransformUriTypeEmpty		0x0001
 </programlisting>
 <para>
 The empty URI ("") type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</title>
-<indexterm><primary>xmlSecTransformUriTypeSameDocument</primary></indexterm><programlisting>#define xmlSecTransformUriTypeSameDocument	0x0002		
+<refsect2 id="xmlSecTransformUriTypeSameDocument" role="macro">
+<title>xmlSecTransformUriTypeSameDocument</title>
+<indexterm zone="xmlSecTransformUriTypeSameDocument"><primary sortas="xmlSecTransformUriTypeSameDocument">xmlSecTransformUriTypeSameDocument</primary></indexterm><programlisting>#define xmlSecTransformUriTypeSameDocument	0x0002		
 </programlisting>
 <para>
 The smae document ("#...") but not empty ("") URI type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</title>
-<indexterm><primary>xmlSecTransformUriTypeLocal</primary></indexterm><programlisting>#define xmlSecTransformUriTypeLocal		0x0004
+<refsect2 id="xmlSecTransformUriTypeLocal" role="macro">
+<title>xmlSecTransformUriTypeLocal</title>
+<indexterm zone="xmlSecTransformUriTypeLocal"><primary sortas="xmlSecTransformUriTypeLocal">xmlSecTransformUriTypeLocal</primary></indexterm><programlisting>#define xmlSecTransformUriTypeLocal		0x0004
 </programlisting>
 <para>
 The local URI ("file:///....") type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</title>
-<indexterm><primary>xmlSecTransformUriTypeRemote</primary></indexterm><programlisting>#define xmlSecTransformUriTypeRemote		0x0008
+<refsect2 id="xmlSecTransformUriTypeRemote" role="macro">
+<title>xmlSecTransformUriTypeRemote</title>
+<indexterm zone="xmlSecTransformUriTypeRemote"><primary sortas="xmlSecTransformUriTypeRemote">xmlSecTransformUriTypeRemote</primary></indexterm><programlisting>#define xmlSecTransformUriTypeRemote		0x0008
 </programlisting>
 <para>
 The remote URI type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</title>
-<indexterm><primary>xmlSecTransformUriTypeAny</primary></indexterm><programlisting>#define xmlSecTransformUriTypeAny		0xFFFF
+<refsect2 id="xmlSecTransformUriTypeAny" role="macro">
+<title>xmlSecTransformUriTypeAny</title>
+<indexterm zone="xmlSecTransformUriTypeAny"><primary sortas="xmlSecTransformUriTypeAny">xmlSecTransformUriTypeAny</primary></indexterm><programlisting>#define xmlSecTransformUriTypeAny		0xFFFF
 </programlisting>
 <para>
 Any URI type.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck ()</title>
-<indexterm><primary>xmlSecTransformUriTypeCheck</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformUriTypeCheck     (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTransformUriTypeCheck" role="function">
+<title>xmlSecTransformUriTypeCheck ()</title>
+<indexterm zone="xmlSecTransformUriTypeCheck"><primary sortas="xmlSecTransformUriTypeCheck">xmlSecTransformUriTypeCheck</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformUriTypeCheck         (<link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> type,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Checks if <parameter>uri</parameter> matches expected type <parameter>type</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>type</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>type</parameter>&#160;:</term>
 <listitem><simpara>		the expected URI type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the uri for checking.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>uri</parameter> matches <parameter>type</parameter>, 0 if not or a negative value
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>uri</parameter> matches <parameter>type</parameter>, 0 if not or a negative value
 if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDataType">xmlSecTransformDataType</title>
-<indexterm><primary>xmlSecTransformDataType</primary></indexterm><programlisting>typedef xmlSecByte				xmlSecTransformDataType;
+<refsect2 id="xmlSecTransformDataType" role="typedef">
+<title>xmlSecTransformDataType</title>
+<indexterm zone="xmlSecTransformDataType"><primary sortas="xmlSecTransformDataType">xmlSecTransformDataType</primary></indexterm><programlisting>typedef xmlSecByte				xmlSecTransformDataType;
 </programlisting>
 <para>
 Transform data type bit mask.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</title>
-<indexterm><primary>xmlSecTransformDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecTransformDataTypeUnknown		0x0000
+<refsect2 id="xmlSecTransformDataTypeUnknown" role="macro">
+<title>xmlSecTransformDataTypeUnknown</title>
+<indexterm zone="xmlSecTransformDataTypeUnknown"><primary sortas="xmlSecTransformDataTypeUnknown">xmlSecTransformDataTypeUnknown</primary></indexterm><programlisting>#define xmlSecTransformDataTypeUnknown		0x0000
 </programlisting>
 <para>
 The transform data type is unknown or nor data expected.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</title>
-<indexterm><primary>xmlSecTransformDataTypeBin</primary></indexterm><programlisting>#define xmlSecTransformDataTypeBin		0x0001
+<refsect2 id="xmlSecTransformDataTypeBin" role="macro">
+<title>xmlSecTransformDataTypeBin</title>
+<indexterm zone="xmlSecTransformDataTypeBin"><primary sortas="xmlSecTransformDataTypeBin">xmlSecTransformDataTypeBin</primary></indexterm><programlisting>#define xmlSecTransformDataTypeBin		0x0001
 </programlisting>
 <para>
 The binary transform data.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</title>
-<indexterm><primary>xmlSecTransformDataTypeXml</primary></indexterm><programlisting>#define xmlSecTransformDataTypeXml		0x0002
+<refsect2 id="xmlSecTransformDataTypeXml" role="macro">
+<title>xmlSecTransformDataTypeXml</title>
+<indexterm zone="xmlSecTransformDataTypeXml"><primary sortas="xmlSecTransformDataTypeXml">xmlSecTransformDataTypeXml</primary></indexterm><programlisting>#define xmlSecTransformDataTypeXml		0x0002
 </programlisting>
 <para>
 The xml transform data.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsage">xmlSecTransformUsage</title>
-<indexterm><primary>xmlSecTransformUsage</primary></indexterm><programlisting>typedef unsigned int				xmlSecTransformUsage;
+<refsect2 id="xmlSecTransformUsage" role="typedef">
+<title>xmlSecTransformUsage</title>
+<indexterm zone="xmlSecTransformUsage"><primary sortas="xmlSecTransformUsage">xmlSecTransformUsage</primary></indexterm><programlisting>typedef unsigned int				xmlSecTransformUsage;
 </programlisting>
 <para>
 The transform usage bit mask.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</title>
-<indexterm><primary>xmlSecTransformUsageUnknown</primary></indexterm><programlisting>#define xmlSecTransformUsageUnknown		0x0000
+<refsect2 id="xmlSecTransformUsageUnknown" role="macro">
+<title>xmlSecTransformUsageUnknown</title>
+<indexterm zone="xmlSecTransformUsageUnknown"><primary sortas="xmlSecTransformUsageUnknown">xmlSecTransformUsageUnknown</primary></indexterm><programlisting>#define xmlSecTransformUsageUnknown		0x0000
 </programlisting>
 <para>
 Transforms usage is unknown or undefined.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</title>
-<indexterm><primary>xmlSecTransformUsageDSigTransform</primary></indexterm><programlisting>#define xmlSecTransformUsageDSigTransform	0x0001
+<refsect2 id="xmlSecTransformUsageDSigTransform" role="macro">
+<title>xmlSecTransformUsageDSigTransform</title>
+<indexterm zone="xmlSecTransformUsageDSigTransform"><primary sortas="xmlSecTransformUsageDSigTransform">xmlSecTransformUsageDSigTransform</primary></indexterm><programlisting>#define xmlSecTransformUsageDSigTransform	0x0001
 </programlisting>
 <para>
 Transform could be used in &lt;dsig:Transform&gt;.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</title>
-<indexterm><primary>xmlSecTransformUsageC14NMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageC14NMethod		0x0002
+<refsect2 id="xmlSecTransformUsageC14NMethod" role="macro">
+<title>xmlSecTransformUsageC14NMethod</title>
+<indexterm zone="xmlSecTransformUsageC14NMethod"><primary sortas="xmlSecTransformUsageC14NMethod">xmlSecTransformUsageC14NMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageC14NMethod		0x0002
 </programlisting>
 <para>
 Transform could be used in &lt;dsig:CanonicalizationMethod&gt;.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</title>
-<indexterm><primary>xmlSecTransformUsageDigestMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageDigestMethod	0x0004
+<refsect2 id="xmlSecTransformUsageDigestMethod" role="macro">
+<title>xmlSecTransformUsageDigestMethod</title>
+<indexterm zone="xmlSecTransformUsageDigestMethod"><primary sortas="xmlSecTransformUsageDigestMethod">xmlSecTransformUsageDigestMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageDigestMethod	0x0004
 </programlisting>
 <para>
 Transform could be used in &lt;dsig:DigestMethod&gt;.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</title>
-<indexterm><primary>xmlSecTransformUsageSignatureMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageSignatureMethod	0x0008
+<refsect2 id="xmlSecTransformUsageSignatureMethod" role="macro">
+<title>xmlSecTransformUsageSignatureMethod</title>
+<indexterm zone="xmlSecTransformUsageSignatureMethod"><primary sortas="xmlSecTransformUsageSignatureMethod">xmlSecTransformUsageSignatureMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageSignatureMethod	0x0008
 </programlisting>
 <para>
 Transform could be used in &lt;dsig:SignatureMethod&gt;.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</title>
-<indexterm><primary>xmlSecTransformUsageEncryptionMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageEncryptionMethod	0x0010
+<refsect2 id="xmlSecTransformUsageEncryptionMethod" role="macro">
+<title>xmlSecTransformUsageEncryptionMethod</title>
+<indexterm zone="xmlSecTransformUsageEncryptionMethod"><primary sortas="xmlSecTransformUsageEncryptionMethod">xmlSecTransformUsageEncryptionMethod</primary></indexterm><programlisting>#define xmlSecTransformUsageEncryptionMethod	0x0010
 </programlisting>
 <para>
 Transform could be used in &lt;enc:EncryptionMethod&gt;.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformUsageAny">xmlSecTransformUsageAny</title>
-<indexterm><primary>xmlSecTransformUsageAny</primary></indexterm><programlisting>#define xmlSecTransformUsageAny			0xFFFF
+<refsect2 id="xmlSecTransformUsageAny" role="macro">
+<title>xmlSecTransformUsageAny</title>
+<indexterm zone="xmlSecTransformUsageAny"><primary sortas="xmlSecTransformUsageAny">xmlSecTransformUsageAny</primary></indexterm><programlisting>#define xmlSecTransformUsageAny			0xFFFF
 </programlisting>
 <para>
 Transform could be used for operation.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback ()</title>
-<indexterm><primary>xmlSecTransformCtxPreExecuteCallback</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformCtxPreExecuteCallback)
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformCtxPreExecuteCallback" role="function">
+<title>xmlSecTransformCtxPreExecuteCallback ()</title>
+<indexterm zone="xmlSecTransformCtxPreExecuteCallback"><primary sortas="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformCtxPreExecuteCallback)
+                                                        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The callback called after creating transforms chain but before
 starting data processing. Application can use this callback to
 do additional transforms chain verification or modification and
 aborting transforms execution (if necessary).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform's context. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success and a negative value otherwise (in this case,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success and a negative value otherwise (in this case,
 transforms chain will not be executed and xmlsec processing stops).
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</title>
-<indexterm><primary>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK		0x00000001
+<refsect2 id="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS" role="macro">
+<title>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</title>
+<indexterm zone="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS"><primary sortas="XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK		0x00000001
 </programlisting>
 <para>
 If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
 documents that don't follow XML, XPointer and XML DSig specifications.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtx">struct xmlSecTransformCtx</title>
-<indexterm><primary>xmlSecTransformCtx</primary></indexterm><programlisting>struct xmlSecTransformCtx {
-
+<refsect2 id="xmlSecTransformCtx" role="struct">
+<title>struct xmlSecTransformCtx</title>
+<indexterm zone="xmlSecTransformCtx"><primary sortas="xmlSecTransformCtx">xmlSecTransformCtx</primary></indexterm><programlisting>struct xmlSecTransformCtx {
     /* user settings */
     void*					userData;
     unsigned int				flags;
@@ -752,39 +691,38 @@ documents that don't follow XML, XPointer and XML DSig specifications.</para>
 <para>
 The transform execution context.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>userData</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
 <listitem><simpara> 		the pointer to user data (xmlsec and xmlsec-crypto never 
 		touch this).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
 <listitem><simpara> 		the bit mask flags to control transforms execution 
 		(reserved for the future).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags2</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
 <listitem><simpara> 		the bit mask flags to control transforms execution 
 			(reserved for the future).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> <structfield>enabledUris</structfield></term>
+<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>&#160;<structfield>enabledUris</structfield>;</term>
 <listitem><simpara> 	the allowed transform data source uri types.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>enabledTransforms</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>enabledTransforms</structfield>;</term>
 <listitem><simpara> 	the list of enabled transforms; if list is empty (default)
 		then all registered transforms are enabled.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link> <structfield>preExecCallback</structfield></term>
+<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link>&#160;<structfield>preExecCallback</structfield>;</term>
 <listitem><simpara>	the callback called after preparing transform chain
 		and right before actual data processing; application
 		can use this callback to change transforms parameters,
@@ -794,136 +732,129 @@ The transform execution context.</para>
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <structfield>result</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
 <listitem><simpara>		the pointer to transforms result buffer.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link> <structfield>status</structfield></term>
+<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>&#160;<structfield>status</structfield>;</term>
 <listitem><simpara>		the transforms chain processng status.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>uri</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>uri</structfield>;</term>
 <listitem><simpara>		the data source URI without xpointer expression.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>xptrExpr</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>xptrExpr</structfield>;</term>
 <listitem><simpara>		the xpointer expression from data source URI (if any).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>first</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>first</structfield>;</term>
 <listitem><simpara>		the first transform in the chain.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>last</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>last</structfield>;</term>
 <listitem><simpara>		the last transform in the chain.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate ()</title>
-<indexterm><primary>xmlSecTransformCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> xmlSecTransformCtxCreate
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformCtxCreate" role="function">
+<title>xmlSecTransformCtxCreate ()</title>
+<indexterm zone="xmlSecTransformCtxCreate"><primary sortas="xmlSecTransformCtxCreate">xmlSecTransformCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link>  xmlSecTransformCtxCreate         (void);</programlisting>
 <para>
 Creates transforms chain processing context.
 The caller is responsible for destroying returend object by calling 
 <link linkend="xmlSecTransformCtxDestroy"><type>xmlSecTransformCtxDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated context object or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy ()</title>
-<indexterm><primary>xmlSecTransformCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformCtxDestroy       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecTransformCtxDestroy" role="function">
+<title>xmlSecTransformCtxDestroy ()</title>
+<indexterm zone="xmlSecTransformCtxDestroy"><primary sortas="xmlSecTransformCtxDestroy">xmlSecTransformCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDestroy           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
 <para>
 Destroy context object created with <link linkend="xmlSecTransformCtxCreate"><type>xmlSecTransformCtxCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize ()</title>
-<indexterm><primary>xmlSecTransformCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxInitialize    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecTransformCtxInitialize" role="function">
+<title>xmlSecTransformCtxInitialize ()</title>
+<indexterm zone="xmlSecTransformCtxInitialize"><primary sortas="xmlSecTransformCtxInitialize">xmlSecTransformCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxInitialize        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
 <para>
 Initializes transforms chain processing context.
 The caller is responsible for cleaing up returend object by calling 
 <link linkend="xmlSecTransformCtxFinalize"><type>xmlSecTransformCtxFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize ()</title>
-<indexterm><primary>xmlSecTransformCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformCtxFinalize      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecTransformCtxFinalize" role="function">
+<title>xmlSecTransformCtxFinalize ()</title>
+<indexterm zone="xmlSecTransformCtxFinalize"><primary sortas="xmlSecTransformCtxFinalize">xmlSecTransformCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxFinalize          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
 <para>
 Cleans up <parameter>ctx</parameter> object initialized with <link linkend="xmlSecTransformCtxInitialize"><type>xmlSecTransformCtxInitialize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxReset">xmlSecTransformCtxReset ()</title>
-<indexterm><primary>xmlSecTransformCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformCtxReset         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
+<refsect2 id="xmlSecTransformCtxReset" role="function">
+<title>xmlSecTransformCtxReset ()</title>
+<indexterm zone="xmlSecTransformCtxReset"><primary sortas="xmlSecTransformCtxReset">xmlSecTransformCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxReset             (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx);</programlisting>
 <para>
 Resets transfroms context for new processing.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref ()</title>
-<indexterm><primary>xmlSecTransformCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxCopyUserPref  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);</programlisting>
+<refsect2 id="xmlSecTransformCtxCopyUserPref" role="function">
+<title>xmlSecTransformCtxCopyUserPref ()</title>
+<indexterm zone="xmlSecTransformCtxCopyUserPref"><primary sortas="xmlSecTransformCtxCopyUserPref">xmlSecTransformCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxCopyUserPref      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> dst,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> src);</programlisting>
 <para>
 Copies user settings from <parameter>src</parameter> context to <parameter>dst</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri ()</title>
-<indexterm><primary>xmlSecTransformCtxSetUri</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxSetUri        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri,
-                                             <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
+<refsect2 id="xmlSecTransformCtxSetUri" role="function">
+<title>xmlSecTransformCtxSetUri ()</title>
+<indexterm zone="xmlSecTransformCtxSetUri"><primary sortas="xmlSecTransformCtxSetUri">xmlSecTransformCtxSetUri</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxSetUri            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
 <para>
 Parses uri and adds xpointer transforms if required.
 </para>
@@ -959,276 +890,258 @@ identifies a node-set containing the element with ID attribute value
 (and its applications) modify this node-set to include the element plus 
 all descendents including namespaces and attributes -- but not comments.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the URI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hereNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>hereNode</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to "here" node required by some 
 		XML transforms (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend ()</title>
-<indexterm><primary>xmlSecTransformCtxAppend</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxAppend        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformCtxAppend" role="function">
+<title>xmlSecTransformCtxAppend ()</title>
+<indexterm zone="xmlSecTransformCtxAppend"><primary sortas="xmlSecTransformCtxAppend">xmlSecTransformCtxAppend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxAppend            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 Connects the <parameter>transform</parameter> to the end of the chain of transforms in the <parameter>ctx</parameter> 
 (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to new transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend ()</title>
-<indexterm><primary>xmlSecTransformCtxPrepend</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxPrepend       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformCtxPrepend" role="function">
+<title>xmlSecTransformCtxPrepend ()</title>
+<indexterm zone="xmlSecTransformCtxPrepend"><primary sortas="xmlSecTransformCtxPrepend">xmlSecTransformCtxPrepend</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxPrepend           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 Connects the <parameter>transform</parameter> to the beggining of the chain of transforms in the <parameter>ctx</parameter> 
 (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to new transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend ()</title>
-<indexterm><primary>xmlSecTransformCtxCreateAndAppend</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link> xmlSecTransformCtxCreateAndAppend
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<refsect2 id="xmlSecTransformCtxCreateAndAppend" role="function">
+<title>xmlSecTransformCtxCreateAndAppend ()</title>
+<indexterm zone="xmlSecTransformCtxCreateAndAppend"><primary sortas="xmlSecTransformCtxCreateAndAppend">xmlSecTransformCtxCreateAndAppend</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxCreateAndAppend   (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
 <para>
 Creaeates new transform and connects it to the end of the chain of 
 transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the new transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created transform or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend ()</title>
-<indexterm><primary>xmlSecTransformCtxCreateAndPrepend</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link> xmlSecTransformCtxCreateAndPrepend
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<refsect2 id="xmlSecTransformCtxCreateAndPrepend" role="function">
+<title>xmlSecTransformCtxCreateAndPrepend ()</title>
+<indexterm zone="xmlSecTransformCtxCreateAndPrepend"><primary sortas="xmlSecTransformCtxCreateAndPrepend">xmlSecTransformCtxCreateAndPrepend</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxCreateAndPrepend  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
 <para>
 Creaeates new transform and connects it to the end of the chain of 
 transforms in the <parameter>ctx</parameter> (see <link linkend="xmlSecTransformConnect"><type>xmlSecTransformConnect</type></link> function for details).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the new transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created transform or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead ()</title>
-<indexterm><primary>xmlSecTransformCtxNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link> xmlSecTransformCtxNodeRead
-                                            (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecTransformCtxNodeRead" role="function">
+<title>xmlSecTransformCtxNodeRead ()</title>
+<indexterm zone="xmlSecTransformCtxNodeRead"><primary sortas="xmlSecTransformCtxNodeRead">xmlSecTransformCtxNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformCtxNodeRead          (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
 <para>
 Reads the transform from the <parameter>node</parameter> and appends it to the current chain 
 of transforms in <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform's node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the transform's usage (signature, encryption, etc.).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created transform or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead ()</title>
-<indexterm><primary>xmlSecTransformCtxNodesListRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxNodesListRead (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecTransformCtxNodesListRead" role="function">
+<title>xmlSecTransformCtxNodesListRead ()</title>
+<indexterm zone="xmlSecTransformCtxNodesListRead"><primary sortas="xmlSecTransformCtxNodesListRead">xmlSecTransformCtxNodesListRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxNodesListRead     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
 <para>
 Reads transforms from the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> children of the <parameter>node</parameter> and 
 appends them to the current transforms chain in <parameter>ctx</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> nodes parent node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the transform's usage (signature, encryption, etc.).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare ()</title>
-<indexterm><primary>xmlSecTransformCtxPrepare</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxPrepare       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);</programlisting>
+<refsect2 id="xmlSecTransformCtxPrepare" role="function">
+<title>xmlSecTransformCtxPrepare ()</title>
+<indexterm zone="xmlSecTransformCtxPrepare"><primary sortas="xmlSecTransformCtxPrepare">xmlSecTransformCtxPrepare</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxPrepare           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> inputDataType);</programlisting>
 <para>
 Prepares the transform context for processing data of <parameter>inputDataType</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>inputDataType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>inputDataType</parameter>&#160;:</term>
 <listitem><simpara>	the expected input type.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute ()</title>
-<indexterm><primary>xmlSecTransformCtxBinaryExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxBinaryExecute (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
+<refsect2 id="xmlSecTransformCtxBinaryExecute" role="function">
+<title>xmlSecTransformCtxBinaryExecute ()</title>
+<indexterm zone="xmlSecTransformCtxBinaryExecute"><primary sortas="xmlSecTransformCtxBinaryExecute">xmlSecTransformCtxBinaryExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxBinaryExecute     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
 <para>
 Processes binary data using transforms chain in the <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the input binary data buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the input data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute ()</title>
-<indexterm><primary>xmlSecTransformCtxUriExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxUriExecute    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecTransformCtxUriExecute" role="function">
+<title>xmlSecTransformCtxUriExecute ()</title>
+<indexterm zone="xmlSecTransformCtxUriExecute"><primary sortas="xmlSecTransformCtxUriExecute">xmlSecTransformCtxUriExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxUriExecute        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Process binary data from the URI using transforms chain in <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the URI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute ()</title>
-<indexterm><primary>xmlSecTransformCtxXmlExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxXmlExecute    (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);</programlisting>
+<refsect2 id="xmlSecTransformCtxXmlExecute" role="function">
+<title>xmlSecTransformCtxXmlExecute ()</title>
+<indexterm zone="xmlSecTransformCtxXmlExecute"><primary sortas="xmlSecTransformCtxXmlExecute">xmlSecTransformCtxXmlExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxXmlExecute        (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes);</programlisting>
 <para>
 Process <parameter>nodes</parameter> using transforms in the transforms chain in <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>		the input node set.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute ()</title>
-<indexterm><primary>xmlSecTransformCtxExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformCtxExecute       (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
+<refsect2 id="xmlSecTransformCtxExecute" role="function">
+<title>xmlSecTransformCtxExecute ()</title>
+<indexterm zone="xmlSecTransformCtxExecute"><primary sortas="xmlSecTransformCtxExecute">xmlSecTransformCtxExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformCtxExecute           (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="xmlDoc">xmlDocPtr</link> doc);</programlisting>
 <para>
 Executes transforms chain in <parameter>ctx</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to input document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump ()</title>
-<indexterm><primary>xmlSecTransformCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformCtxDebugDump     (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformCtxDebugDump" role="function">
+<title>xmlSecTransformCtxDebugDump ()</title>
+<indexterm zone="xmlSecTransformCtxDebugDump"><primary sortas="xmlSecTransformCtxDebugDump">xmlSecTransformCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDebugDump         (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints transforms context debug information to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecTransformCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformCtxDebugXmlDump  (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformCtxDebugXmlDump" role="function">
+<title>xmlSecTransformCtxDebugXmlDump ()</title>
+<indexterm zone="xmlSecTransformCtxDebugXmlDump"><primary sortas="xmlSecTransformCtxDebugXmlDump">xmlSecTransformCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformCtxDebugXmlDump      (<link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> ctx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints transforms context debug information to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>ctx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ctx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transforms chain processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransform">struct xmlSecTransform</title>
-<indexterm><primary>xmlSecTransform</primary></indexterm><programlisting>struct xmlSecTransform {
-
+<refsect2 id="xmlSecTransform" role="struct">
+<title>struct xmlSecTransform</title>
+<indexterm zone="xmlSecTransform"><primary sortas="xmlSecTransform">xmlSecTransform</primary></indexterm><programlisting>struct xmlSecTransform {
     xmlSecTransformId 			id; 
     xmlSecTransformOperation		operation;
     xmlSecTransformStatus		status;
@@ -1254,101 +1167,98 @@ Prints transforms context debug information to <parameter>output</parameter> in
 <para>
 The transform structure.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>id</structfield></term>
+<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>id</structfield>;</term>
 <listitem><simpara> 		the transform id (pointer to <link linkend="xmlSecTransformId"><type>xmlSecTransformId</type></link>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link> <structfield>operation</structfield></term>
+<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
 <listitem><simpara>		the transform's opertaion.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link> <structfield>status</structfield></term>
+<term><link linkend="xmlSecTransformStatus">xmlSecTransformStatus</link>&#160;<structfield>status</structfield>;</term>
 <listitem><simpara> 		the current status.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>hereNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>hereNode</structfield>;</term>
 <listitem><simpara>		the pointer to transform's <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform ">&lt;dsig:Transform /&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>next</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>next</structfield>;</term>
 <listitem><simpara>		the pointer to next transform in the chain.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>prev</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>prev</structfield>;</term>
 <listitem><simpara>		the pointer to previous transform in the chain.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBuffer</link> <structfield>inBuf</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBuffer</link>&#160;<structfield>inBuf</structfield>;</term>
 <listitem><simpara>		the input binary data buffer.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBuffer</link> <structfield>outBuf</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBuffer</link>&#160;<structfield>outBuf</structfield>;</term>
 <listitem><simpara>		the output binary data buffer.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <structfield>inNodes</structfield></term>
+<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>inNodes</structfield>;</term>
 <listitem><simpara>		the input XML nodes.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> <structfield>outNodes</structfield></term>
+<term><link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link>&#160;<structfield>outNodes</structfield>;</term>
 <listitem><simpara> 		the output XML nodes.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>		reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCreate">xmlSecTransformCreate ()</title>
-<indexterm><primary>xmlSecTransformCreate</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link> xmlSecTransformCreate    (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
+<refsect2 id="xmlSecTransformCreate" role="function">
+<title>xmlSecTransformCreate ()</title>
+<indexterm zone="xmlSecTransformCreate"><primary sortas="xmlSecTransformCreate">xmlSecTransformCreate</primary></indexterm><programlisting><link linkend="xmlSecTransform">xmlSecTransformPtr</link>  xmlSecTransformCreate               (<link linkend="xmlSecTransformId">xmlSecTransformId</link> id);</programlisting>
 <para>
 Creates new transform of the <parameter>id</parameter> klass. The caller is responsible for
 destroying returned tansform using <link linkend="xmlSecTransformDestroy"><type>xmlSecTransformDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara> 		the transform id to create.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created transform or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDestroy">xmlSecTransformDestroy ()</title>
-<indexterm><primary>xmlSecTransformDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformDestroy          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformDestroy" role="function">
+<title>xmlSecTransformDestroy ()</title>
+<indexterm zone="xmlSecTransformDestroy"><primary sortas="xmlSecTransformDestroy">xmlSecTransformDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDestroy              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 Destroys transform created with <link linkend="xmlSecTransformCreate"><type>xmlSecTransformCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformNodeRead">xmlSecTransformNodeRead ()</title>
-<indexterm><primary>xmlSecTransformNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link> xmlSecTransformNodeRead  (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformNodeRead" role="function">
+<title>xmlSecTransformNodeRead ()</title>
+<indexterm zone="xmlSecTransformNodeRead"><primary sortas="xmlSecTransformNodeRead">xmlSecTransformNodeRead</primary></indexterm><programlisting><link linkend="xmlSecTransformPtr">xmlSecTransformPtr</link>  xmlSecTransformNodeRead             (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Reads transform from the <parameter>node</parameter> as follows:
 </para>
@@ -1364,394 +1274,373 @@ Reads transform from the <parameter>node</parameter> as follows:
 <para>
    4) calls transform's read transform node method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the transform's node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the transform usage (signature, encryption, ...).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created transform or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created transform or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPump">xmlSecTransformPump ()</title>
-<indexterm><primary>xmlSecTransformPump</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformPump             (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPump" role="function">
+<title>xmlSecTransformPump ()</title>
+<indexterm zone="xmlSecTransformPump"><primary sortas="xmlSecTransformPump">xmlSecTransformPump</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPump                 (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Pops data from <parameter>left</parameter> transform and pushes to <parameter>right</parameter> transform until
 no more data is available.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>left</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>left</parameter>&#160;:</term>
 <listitem><simpara>		the source pumping transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>right</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>right</parameter>&#160;:</term>
 <listitem><simpara>		the destination pumping transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSetKey">xmlSecTransformSetKey ()</title>
-<indexterm><primary>xmlSecTransformSetKey</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformSetKey           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecTransformSetKey" role="function">
+<title>xmlSecTransformSetKey ()</title>
+<indexterm zone="xmlSecTransformSetKey"><primary sortas="xmlSecTransformSetKey">xmlSecTransformSetKey</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformSetKey               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 Sets the transform's key.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to key. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq ()</title>
-<indexterm><primary>xmlSecTransformSetKeyReq</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformSetKeyReq        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecTransformSetKeyReq" role="function">
+<title>xmlSecTransformSetKeyReq ()</title>
+<indexterm zone="xmlSecTransformSetKeyReq"><primary sortas="xmlSecTransformSetKeyReq">xmlSecTransformSetKeyReq</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformSetKeyReq            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Sets the key requirements for <parameter>transform</parameter> in the <parameter>keyReq</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys requirements object. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVerify">xmlSecTransformVerify ()</title>
-<indexterm><primary>xmlSecTransformVerify</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformVerify           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformVerify" role="function">
+<title>xmlSecTransformVerify ()</title>
+<indexterm zone="xmlSecTransformVerify"><primary sortas="xmlSecTransformVerify">xmlSecTransformVerify</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVerify               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Verifies the data with transform's processing results
 (for digest, HMAC and signature transforms). The verification
 result is stored in the <link linkend="status"><type>status</type></link> member of <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the binary data for verification.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent ()</title>
-<indexterm><primary>xmlSecTransformVerifyNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformVerifyNodeContent
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformVerifyNodeContent" role="function">
+<title>xmlSecTransformVerifyNodeContent ()</title>
+<indexterm zone="xmlSecTransformVerifyNodeContent"><primary sortas="xmlSecTransformVerifyNodeContent">xmlSecTransformVerifyNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVerifyNodeContent    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Gets the <parameter>node</parameter> content, base64 decodes it and calls <link linkend="xmlSecTransformVerify"><type>xmlSecTransformVerify</type></link>
 function to verify binary results.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGetDataType">xmlSecTransformGetDataType ()</title>
-<indexterm><primary>xmlSecTransformGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> xmlSecTransformGetDataType
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformGetDataType" role="function">
+<title>xmlSecTransformGetDataType ()</title>
+<indexterm zone="xmlSecTransformGetDataType"><primary sortas="xmlSecTransformGetDataType">xmlSecTransformGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  xmlSecTransformGetDataType     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Gets transform input (<parameter>mode</parameter> is "push") or output (<parameter>mode</parameter> is "pop") data 
 type (binary or XML).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mode</parameter>&#160;:</term>
 <listitem><simpara>		the data mode (push or pop).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the transform's data type for the <parameter>mode</parameter> operation.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the transform's data type for the <parameter>mode</parameter> operation.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPushBin">xmlSecTransformPushBin ()</title>
-<indexterm><primary>xmlSecTransformPushBin</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformPushBin          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPushBin" role="function">
+<title>xmlSecTransformPushBin ()</title>
+<indexterm zone="xmlSecTransformPushBin"><primary sortas="xmlSecTransformPushBin">xmlSecTransformPushBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPushBin              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Process binary <parameter>data</parameter> and pushes results to next transform.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the input binary data,
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the input data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>final</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>final</parameter>&#160;:</term>
 <listitem><simpara>		the flag: if set to 1 then it's the last
 		data chunk.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPopBin">xmlSecTransformPopBin ()</title>
-<indexterm><primary>xmlSecTransformPopBin</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformPopBin           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPopBin" role="function">
+<title>xmlSecTransformPopBin ()</title>
+<indexterm zone="xmlSecTransformPopBin"><primary sortas="xmlSecTransformPopBin">xmlSecTransformPopBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPopBin               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes data and 
 returns result in the <parameter>data</parameter> buffer. The size of returned data is 
 placed in the <parameter>dataSize</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the buffer to store result data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>maxDataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
 <listitem><simpara>	the size of the buffer <link linkend="data"><type>data</type></link>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to returned data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPushXml">xmlSecTransformPushXml ()</title>
-<indexterm><primary>xmlSecTransformPushXml</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformPushXml          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPushXml" role="function">
+<title>xmlSecTransformPushXml ()</title>
+<indexterm zone="xmlSecTransformPushXml"><primary sortas="xmlSecTransformPushXml">xmlSecTransformPushXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPushXml              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Processes <parameter>nodes</parameter> and pushes result to the next transform in the chain.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>		the input nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPopXml">xmlSecTransformPopXml ()</title>
-<indexterm><primary>xmlSecTransformPopXml</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformPopXml           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPopXml" role="function">
+<title>xmlSecTransformPopXml ()</title>
+<indexterm zone="xmlSecTransformPopXml"><primary sortas="xmlSecTransformPopXml">xmlSecTransformPopXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformPopXml               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes the data and 
 returns result in <parameter>nodes</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExecute">xmlSecTransformExecute ()</title>
-<indexterm><primary>xmlSecTransformExecute</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformExecute          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="int">int</link> last,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformExecute" role="function">
+<title>xmlSecTransformExecute ()</title>
+<indexterm zone="xmlSecTransformExecute"><primary sortas="xmlSecTransformExecute">xmlSecTransformExecute</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformExecute              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="int">int</link> last,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Executes transform (used by default popBin/pushBin/popXml/pushXml methods).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>last</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>last</parameter>&#160;:</term>
 <listitem><simpara>		the flag: if set to 1 then it's the last data chunk.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDebugDump">xmlSecTransformDebugDump ()</title>
-<indexterm><primary>xmlSecTransformDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformDebugDump        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformDebugDump" role="function">
+<title>xmlSecTransformDebugDump ()</title>
+<indexterm zone="xmlSecTransformDebugDump"><primary sortas="xmlSecTransformDebugDump">xmlSecTransformDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDebugDump            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints transform's debug information to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump ()</title>
-<indexterm><primary>xmlSecTransformDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformDebugXmlDump     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformDebugXmlDump" role="function">
+<title>xmlSecTransformDebugXmlDump ()</title>
+<indexterm zone="xmlSecTransformDebugXmlDump"><primary sortas="xmlSecTransformDebugXmlDump">xmlSecTransformDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformDebugXmlDump         (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints transform's debug information to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGetName">xmlSecTransformGetName()</title>
-<indexterm><primary>xmlSecTransformGetName</primary></indexterm><programlisting>#define     xmlSecTransformGetName(transform)</programlisting>
+<refsect2 id="xmlSecTransformGetName" role="macro">
+<title>xmlSecTransformGetName()</title>
+<indexterm zone="xmlSecTransformGetName"><primary sortas="xmlSecTransformGetName">xmlSecTransformGetName</primary></indexterm><programlisting>#define             xmlSecTransformGetName(transform)</programlisting>
 <para>
 Macro. Returns transform name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIsValid">xmlSecTransformIsValid()</title>
-<indexterm><primary>xmlSecTransformIsValid</primary></indexterm><programlisting>#define     xmlSecTransformIsValid(transform)</programlisting>
+<refsect2 id="xmlSecTransformIsValid" role="macro">
+<title>xmlSecTransformIsValid()</title>
+<indexterm zone="xmlSecTransformIsValid"><primary sortas="xmlSecTransformIsValid">xmlSecTransformIsValid</primary></indexterm><programlisting>#define             xmlSecTransformIsValid(transform)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCheckType">xmlSecTransformCheckType()</title>
-<indexterm><primary>xmlSecTransformCheckType</primary></indexterm><programlisting>#define     xmlSecTransformCheckType(transform, t)</programlisting>
+<refsect2 id="xmlSecTransformCheckType" role="macro">
+<title>xmlSecTransformCheckType()</title>
+<indexterm zone="xmlSecTransformCheckType"><primary sortas="xmlSecTransformCheckType">xmlSecTransformCheckType</primary></indexterm><programlisting>#define             xmlSecTransformCheckType(transform, t)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has specified type <parameter>t</parameter> 
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>t</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>t</parameter>&#160;:</term>
 <listitem><simpara> 			the transform type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCheckId">xmlSecTransformCheckId()</title>
-<indexterm><primary>xmlSecTransformCheckId</primary></indexterm><programlisting>#define     xmlSecTransformCheckId(transform, i)</programlisting>
+<refsect2 id="xmlSecTransformCheckId" role="macro">
+<title>xmlSecTransformCheckId()</title>
+<indexterm zone="xmlSecTransformCheckId"><primary sortas="xmlSecTransformCheckId">xmlSecTransformCheckId</primary></indexterm><programlisting>#define             xmlSecTransformCheckId(transform, i)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has specified id <parameter>i</parameter> 
 or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>i</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>i</parameter>&#160;:</term>
 <listitem><simpara>			the transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCheckSize">xmlSecTransformCheckSize()</title>
-<indexterm><primary>xmlSecTransformCheckSize</primary></indexterm><programlisting>#define     xmlSecTransformCheckSize(transform, size)</programlisting>
+<refsect2 id="xmlSecTransformCheckSize" role="macro">
+<title>xmlSecTransformCheckSize()</title>
+<indexterm zone="xmlSecTransformCheckSize"><primary sortas="xmlSecTransformCheckSize">xmlSecTransformCheckSize</primary></indexterm><programlisting>#define             xmlSecTransformCheckSize(transform, size)</programlisting>
 <para>
 Macro. Returns 1 if the <parameter>transform</parameter> is valid and has at least <parameter>size</parameter>
 bytes or 0 otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the transform object size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformConnect">xmlSecTransformConnect ()</title>
-<indexterm><primary>xmlSecTransformConnect</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformConnect          (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
-                                             <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformConnect" role="function">
+<title>xmlSecTransformConnect ()</title>
+<indexterm zone="xmlSecTransformConnect"><primary sortas="xmlSecTransformConnect">xmlSecTransformConnect</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformConnect              (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> left,
+                                                         <link linkend="xmlSecTransform">xmlSecTransformPtr</link> right,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 If the data object is a node-set and the next transform requires octets, 
 the signature application MUST attempt to convert the node-set to an octet 
@@ -1773,506 +1662,478 @@ automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and 
 processing instructions. The output of this transform is an octet stream.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>left</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>left</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to left (prev) transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>right</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>right</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to right (next) transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs. 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs. 
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRemove">xmlSecTransformRemove ()</title>
-<indexterm><primary>xmlSecTransformRemove</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformRemove           (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformRemove" role="function">
+<title>xmlSecTransformRemove ()</title>
+<indexterm zone="xmlSecTransformRemove"><primary sortas="xmlSecTransformRemove">xmlSecTransformRemove</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformRemove               (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 Removes <parameter>transform</parameter> from the chain.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> the pointer to <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> structure.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType ()</title>
-<indexterm><primary>xmlSecTransformDefaultGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> xmlSecTransformDefaultGetDataType
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformDefaultGetDataType" role="function">
+<title>xmlSecTransformDefaultGetDataType ()</title>
+<indexterm zone="xmlSecTransformDefaultGetDataType"><primary sortas="xmlSecTransformDefaultGetDataType">xmlSecTransformDefaultGetDataType</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  xmlSecTransformDefaultGetDataType
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Gets transform input (<parameter>mode</parameter> is "push") or output (<parameter>mode</parameter> is "pop") data 
 type (binary or XML) by analyzing available pushBin/popBin/pushXml/popXml
 methods.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mode</parameter>&#160;:</term>
 <listitem><simpara>		the data mode (push or pop).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the transform's chaing processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the transform's data type for the <parameter>mode</parameter> operation.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the transform's data type for the <parameter>mode</parameter> operation.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin ()</title>
-<indexterm><primary>xmlSecTransformDefaultPushBin</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformDefaultPushBin   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformDefaultPushBin" role="function">
+<title>xmlSecTransformDefaultPushBin ()</title>
+<indexterm zone="xmlSecTransformDefaultPushBin"><primary sortas="xmlSecTransformDefaultPushBin">xmlSecTransformDefaultPushBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPushBin       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Process binary <parameter>data</parameter> by calling transform's execute method and pushes 
 results to next transform.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the input binary data,
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the input data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>final</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>final</parameter>&#160;:</term>
 <listitem><simpara>		the flag: if set to 1 then it's the last
 		data chunk.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin ()</title>
-<indexterm><primary>xmlSecTransformDefaultPopBin</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformDefaultPopBin    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformDefaultPopBin" role="function">
+<title>xmlSecTransformDefaultPopBin ()</title>
+<indexterm zone="xmlSecTransformDefaultPopBin"><primary sortas="xmlSecTransformDefaultPopBin">xmlSecTransformDefaultPopBin</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPopBin        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes data by calling
 transform's execute method and returns result in the <parameter>data</parameter> buffer. The 
 size of returned data is placed in the <parameter>dataSize</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the buffer to store result data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>maxDataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
 <listitem><simpara>	the size of the buffer <link linkend="data"><type>data</type></link>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to returned data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml ()</title>
-<indexterm><primary>xmlSecTransformDefaultPushXml</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformDefaultPushXml   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformDefaultPushXml" role="function">
+<title>xmlSecTransformDefaultPushXml ()</title>
+<indexterm zone="xmlSecTransformDefaultPushXml"><primary sortas="xmlSecTransformDefaultPushXml">xmlSecTransformDefaultPushXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPushXml       (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Processes <parameter>nodes</parameter> by calling transform's execute method and pushes 
 result to the next transform in the chain.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>		the input nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml ()</title>
-<indexterm><primary>xmlSecTransformDefaultPopXml</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformDefaultPopXml    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformDefaultPopXml" role="function">
+<title>xmlSecTransformDefaultPopXml ()</title>
+<indexterm zone="xmlSecTransformDefaultPopXml"><primary sortas="xmlSecTransformDefaultPopXml">xmlSecTransformDefaultPopXml</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformDefaultPopXml        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Pops data from previous transform in the chain, processes the data 
 by calling transform's execute method and returns result in <parameter>nodes</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer ()</title>
-<indexterm><primary>xmlSecTransformCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBuffer">xmlOutputBufferPtr</link> xmlSecTransformCreateOutputBuffer
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformCreateOutputBuffer" role="function">
+<title>xmlSecTransformCreateOutputBuffer ()</title>
+<indexterm zone="xmlSecTransformCreateOutputBuffer"><primary sortas="xmlSecTransformCreateOutputBuffer">xmlSecTransformCreateOutputBuffer</primary></indexterm><programlisting><link linkend="xmlOutputBufferPtr">xmlOutputBufferPtr</link>  xmlSecTransformCreateOutputBuffer   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Creates output buffer to write data to <parameter>transform</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to new output buffer or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new output buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer ()</title>
-<indexterm><primary>xmlSecTransformCreateInputBuffer</primary></indexterm><programlisting><link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link> xmlSecTransformCreateInputBuffer
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformCreateInputBuffer" role="function">
+<title>xmlSecTransformCreateInputBuffer ()</title>
+<indexterm zone="xmlSecTransformCreateInputBuffer"><primary sortas="xmlSecTransformCreateInputBuffer">xmlSecTransformCreateInputBuffer</primary></indexterm><programlisting><link linkend="xmlParserInputBuffer">xmlParserInputBufferPtr</link>  xmlSecTransformCreateInputBuffer
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Creates input buffer to read data from <parameter>transform</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>	the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to new input buffer or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to new input buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod ()</title>
-<indexterm><primary>xmlSecTransformInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformInitializeMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformInitializeMethod" role="function">
+<title>xmlSecTransformInitializeMethod ()</title>
+<indexterm zone="xmlSecTransformInitializeMethod"><primary sortas="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformInitializeMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 The transform specific initialization method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod ()</title>
-<indexterm><primary>xmlSecTransformFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>        (*xmlSecTransformFinalizeMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
+<refsect2 id="xmlSecTransformFinalizeMethod" role="function">
+<title>xmlSecTransformFinalizeMethod ()</title>
+<indexterm zone="xmlSecTransformFinalizeMethod"><primary sortas="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</primary></indexterm><programlisting><link linkend="void">void</link>                (*xmlSecTransformFinalizeMethod)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform);</programlisting>
 <para>
 The transform specific destroy method.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod ()</title>
-<indexterm><primary>xmlSecTransformGetDataTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link> (*xmlSecTransformGetDataTypeMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformGetDataTypeMethod" role="function">
+<title>xmlSecTransformGetDataTypeMethod ()</title>
+<indexterm zone="xmlSecTransformGetDataTypeMethod"><primary sortas="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</primary></indexterm><programlisting><link linkend="xmlSecTransformDataType">xmlSecTransformDataType</link>  (*xmlSecTransformGetDataTypeMethod)
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecTransformMode">xmlSecTransformMode</link> mode,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to query information about transform
 data type in specified mode <parameter>mode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mode</parameter>&#160;:</term>
 <listitem><simpara>			the mode.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>transform data type.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform data type.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod ()</title>
-<indexterm><primary>xmlSecTransformNodeReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformNodeReadMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformNodeReadMethod" role="function">
+<title>xmlSecTransformNodeReadMethod ()</title>
+<indexterm zone="xmlSecTransformNodeReadMethod"><primary sortas="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformNodeReadMethod)    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to read the transform data from 
 the <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod ()</title>
-<indexterm><primary>xmlSecTransformNodeWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformNodeWriteMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformNodeWriteMethod" role="function">
+<title>xmlSecTransformNodeWriteMethod ()</title>
+<indexterm zone="xmlSecTransformNodeWriteMethod"><primary sortas="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformNodeWriteMethod)   (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to write transform information to an XML node <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Transform";>&lt;dsig:Transform/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod ()</title>
-<indexterm><primary>xmlSecTransformSetKeyRequirementsMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformSetKeyRequirementsMethod)
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
+<refsect2 id="xmlSecTransformSetKeyRequirementsMethod" role="function">
+<title>xmlSecTransformSetKeyRequirementsMethod ()</title>
+<indexterm zone="xmlSecTransformSetKeyRequirementsMethod"><primary sortas="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformSetKeyRequirementsMethod)
+                                                        (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKeyReq">xmlSecKeyReqPtr</link> keyReq);</programlisting>
 <para>
 Transform specific method to set transform's key requirements.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyReq</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyReq</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to key requirements structure.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod ()</title>
-<indexterm><primary>xmlSecTransformSetKeyMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformSetKeyMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
+<refsect2 id="xmlSecTransformSetKeyMethod" role="function">
+<title>xmlSecTransformSetKeyMethod ()</title>
+<indexterm zone="xmlSecTransformSetKeyMethod"><primary sortas="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformSetKeyMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecKey">xmlSecKeyPtr</link> key);</programlisting>
 <para>
 The transform specific method to set the key for use.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>key</parameter>&#160;:</term>
 <listitem><simpara> 			the pointer to key.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod ()</title>
-<indexterm><primary>xmlSecTransformVerifyMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformVerifyMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformVerifyMethod" role="function">
+<title>xmlSecTransformVerifyMethod ()</title>
+<indexterm zone="xmlSecTransformVerifyMethod"><primary sortas="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformVerifyMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to verify transform processing results
 (used by digest and signature transforms). This method sets <parameter>status</parameter>
 member of the <link linkend="xmlSecTransform"><type>xmlSecTransform</type></link> structure to either <link linkend="xmlSecTransformStatusOk"><type>xmlSecTransformStatusOk</type></link>
 if verification succeeded or <link linkend="xmlSecTransformStatusFail"><type>xmlSecTransformStatusFail</type></link> otherwise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>			the input buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>			the size of input buffer <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod ()</title>
-<indexterm><primary>xmlSecTransformPushBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformPushBinMethod) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
-                                             <link linkend="int">int</link> final,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPushBinMethod" role="function">
+<title>xmlSecTransformPushBinMethod ()</title>
+<indexterm zone="xmlSecTransformPushBinMethod"><primary sortas="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPushBinMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize,
+                                                         <link linkend="int">int</link> final,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to process data from <parameter>data</parameter> and push
 result to the next transform in the chain.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>			the input binary data,
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>			the input data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>final</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>final</parameter>&#160;:</term>
 <listitem><simpara>			the flag: if set to 1 then it's the last
 			data chunk.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod ()</title>
-<indexterm><primary>xmlSecTransformPopBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformPopBinMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPopBinMethod" role="function">
+<title>xmlSecTransformPopBinMethod ()</title>
+<indexterm zone="xmlSecTransformPopBinMethod"><primary sortas="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPopBinMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> maxDataSize,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> *dataSize,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to pop data from previous transform 
 in the chain and return result in the <parameter>data</parameter> buffer. The size of returned
 data is placed in the <parameter>dataSize</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>			the buffer to store result data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>maxDataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>maxDataSize</parameter>&#160;:</term>
 <listitem><simpara>		the size of the buffer <parameter>data</parameter>.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to returned data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod ()</title>
-<indexterm><primary>xmlSecTransformPushXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformPushXmlMethod) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPushXmlMethod" role="function">
+<title>xmlSecTransformPushXmlMethod ()</title>
+<indexterm zone="xmlSecTransformPushXmlMethod"><primary sortas="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPushXmlMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to process <parameter>nodes</parameter> and push result to the next 
 transform in the chain.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>			the input nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod ()</title>
-<indexterm><primary>xmlSecTransformPopXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformPopXmlMethod)  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformPopXmlMethod" role="function">
+<title>xmlSecTransformPopXmlMethod ()</title>
+<indexterm zone="xmlSecTransformPopXmlMethod"><primary sortas="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformPopXmlMethod)      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecNodeSet">xmlSecNodeSetPtr</link> *nodes,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 The transform specific method to pop data from previous transform in the chain,
 process the data and return result in <parameter>nodes</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodes</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodes</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to store popinter to result nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod ()</title>
-<indexterm><primary>xmlSecTransformExecuteMethod</primary></indexterm><programlisting><link linkend="int">int</link>         (*xmlSecTransformExecuteMethod) (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="int">int</link> last,
-                                             <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
+<refsect2 id="xmlSecTransformExecuteMethod" role="function">
+<title>xmlSecTransformExecuteMethod ()</title>
+<indexterm zone="xmlSecTransformExecuteMethod"><primary sortas="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</primary></indexterm><programlisting><link linkend="int">int</link>                 (*xmlSecTransformExecuteMethod)     (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="int">int</link> last,
+                                                         <link linkend="xmlSecTransformCtx">xmlSecTransformCtxPtr</link> transformCtx);</programlisting>
 <para>
 Transform specific method to process a chunk of data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>			the pointer to transform object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>last</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>last</parameter>&#160;:</term>
 <listitem><simpara>			the flag: if set to 1 then it's the last data chunk.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform context object.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKlass">struct xmlSecTransformKlass</title>
-<indexterm><primary>xmlSecTransformKlass</primary></indexterm><programlisting>struct xmlSecTransformKlass {
-
+<refsect2 id="xmlSecTransformKlass" role="struct">
+<title>struct xmlSecTransformKlass</title>
+<indexterm zone="xmlSecTransformKlass"><primary sortas="xmlSecTransformKlass">xmlSecTransformKlass</primary></indexterm><programlisting>struct xmlSecTransformKlass {
     /* data */
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
@@ -2308,262 +2169,246 @@ Transform specific method to process a chunk of data.</para>
 <para>
 The transform klass desccription structure.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>klassSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>klassSize</structfield>;</term>
 <listitem><simpara>			the transform klass structure size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecSize">xmlSecSize</link> <structfield>objSize</structfield></term>
+<term><link linkend="xmlSecSize">xmlSecSize</link>&#160;<structfield>objSize</structfield>;</term>
 <listitem><simpara>			the transform object size.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>name</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>name</structfield>;</term>
 <listitem><simpara>			the transform's name.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>href</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>href</structfield>;</term>
 <listitem><simpara>			the transform's identification string (href).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> <structfield>usage</structfield></term>
+<term><link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link>&#160;<structfield>usage</structfield>;</term>
 <listitem><simpara>			the allowed transforms usages.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</link> <structfield>initialize</structfield></term>
+<term><link linkend="xmlSecTransformInitializeMethod">xmlSecTransformInitializeMethod</link>&#160;<structfield>initialize</structfield>;</term>
 <listitem><simpara>			the initialization method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</link> <structfield>finalize</structfield></term>
+<term><link linkend="xmlSecTransformFinalizeMethod">xmlSecTransformFinalizeMethod</link>&#160;<structfield>finalize</structfield>;</term>
 <listitem><simpara>			the finmalization (destroy) function.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</link> <structfield>readNode</structfield></term>
+<term><link linkend="xmlSecTransformNodeReadMethod">xmlSecTransformNodeReadMethod</link>&#160;<structfield>readNode</structfield>;</term>
 <listitem><simpara>			the XML node read method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</link> <structfield>writeNode</structfield></term>
+<term><link linkend="xmlSecTransformNodeWriteMethod">xmlSecTransformNodeWriteMethod</link>&#160;<structfield>writeNode</structfield>;</term>
 <listitem><simpara>			the XML node write method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</link> <structfield>setKeyReq</structfield></term>
+<term><link linkend="xmlSecTransformSetKeyRequirementsMethod">xmlSecTransformSetKeyRequirementsMethod</link>&#160;<structfield>setKeyReq</structfield>;</term>
 <listitem><simpara>			the set key requirements method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</link> <structfield>setKey</structfield></term>
+<term><link linkend="xmlSecTransformSetKeyMethod">xmlSecTransformSetKeyMethod</link>&#160;<structfield>setKey</structfield>;</term>
 <listitem><simpara>			the set key method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</link> <structfield>verify</structfield></term>
+<term><link linkend="xmlSecTransformVerifyMethod">xmlSecTransformVerifyMethod</link>&#160;<structfield>verify</structfield>;</term>
 <listitem><simpara>			the verify method (for digest and signature transforms).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</link> <structfield>getDataType</structfield></term>
+<term><link linkend="xmlSecTransformGetDataTypeMethod">xmlSecTransformGetDataTypeMethod</link>&#160;<structfield>getDataType</structfield>;</term>
 <listitem><simpara>		the input/output data type query method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</link> <structfield>pushBin</structfield></term>
+<term><link linkend="xmlSecTransformPushBinMethod">xmlSecTransformPushBinMethod</link>&#160;<structfield>pushBin</structfield>;</term>
 <listitem><simpara>			the binary data "push thru chain" processing method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</link> <structfield>popBin</structfield></term>
+<term><link linkend="xmlSecTransformPopBinMethod">xmlSecTransformPopBinMethod</link>&#160;<structfield>popBin</structfield>;</term>
 <listitem><simpara>			the binary data "pop from chain" procesing method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</link> <structfield>pushXml</structfield></term>
+<term><link linkend="xmlSecTransformPushXmlMethod">xmlSecTransformPushXmlMethod</link>&#160;<structfield>pushXml</structfield>;</term>
 <listitem><simpara>			the XML data "push thru chain" processing method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</link> <structfield>popXml</structfield></term>
+<term><link linkend="xmlSecTransformPopXmlMethod">xmlSecTransformPopXmlMethod</link>&#160;<structfield>popXml</structfield>;</term>
 <listitem><simpara>			the XML data "pop from chain" procesing method.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</link> <structfield>execute</structfield></term>
+<term><link linkend="xmlSecTransformExecuteMethod">xmlSecTransformExecuteMethod</link>&#160;<structfield>execute</structfield>;</term>
 <listitem><simpara>			the low level data processing method used  by default
 			implementations of <parameter>pushBin</parameter>, <parameter>popBin</parameter>, <parameter>pushXml</parameter> and <parameter>popXml</parameter>.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName()</title>
-<indexterm><primary>xmlSecTransformKlassGetName</primary></indexterm><programlisting>#define     xmlSecTransformKlassGetName(klass)</programlisting>
+<refsect2 id="xmlSecTransformKlassGetName" role="macro">
+<title>xmlSecTransformKlassGetName()</title>
+<indexterm zone="xmlSecTransformKlassGetName"><primary sortas="xmlSecTransformKlassGetName">xmlSecTransformKlassGetName</primary></indexterm><programlisting>#define             xmlSecTransformKlassGetName(klass)</programlisting>
 <para>
 Macro. Returns transform klass name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>klass</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>klass</parameter>&#160;:</term>
 <listitem><simpara> 		the transofrm's klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListId">xmlSecTransformIdListId</title>
-<indexterm><primary>xmlSecTransformIdListId</primary></indexterm><programlisting>#define xmlSecTransformIdListId	xmlSecTransformIdListGetKlass()
+<refsect2 id="xmlSecTransformIdListId" role="macro">
+<title>xmlSecTransformIdListId</title>
+<indexterm zone="xmlSecTransformIdListId"><primary sortas="xmlSecTransformIdListId">xmlSecTransformIdListId</primary></indexterm><programlisting>#define xmlSecTransformIdListId	xmlSecTransformIdListGetKlass()
 </programlisting>
 <para>
 Transform klasses list klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass ()</title>
-<indexterm><primary>xmlSecTransformIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecTransformIdListGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformIdListGetKlass" role="function">
+<title>xmlSecTransformIdListGetKlass ()</title>
+<indexterm zone="xmlSecTransformIdListGetKlass"><primary sortas="xmlSecTransformIdListGetKlass">xmlSecTransformIdListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecTransformIdListGetKlass       (void);</programlisting>
 <para>
 The transform id list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the transform id list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the transform id list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListFind">xmlSecTransformIdListFind ()</title>
-<indexterm><primary>xmlSecTransformIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformIdListFind       (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecTransformIdListFind" role="function">
+<title>xmlSecTransformIdListFind ()</title>
+<indexterm zone="xmlSecTransformIdListFind"><primary sortas="xmlSecTransformIdListFind">xmlSecTransformIdListFind</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformIdListFind           (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Lookups <parameter>dataId</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara>	the transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>dataId</parameter> is found in the <parameter>list</parameter>, 0 if not and a negative
 value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref ()</title>
-<indexterm><primary>xmlSecTransformIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformIdListFindByHref
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecTransformIdListFindByHref" role="function">
+<title>xmlSecTransformIdListFindByHref ()</title>
+<indexterm zone="xmlSecTransformIdListFindByHref"><primary sortas="xmlSecTransformIdListFindByHref">xmlSecTransformIdListFindByHref</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformIdListFindByHref     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>href</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>href</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>href</parameter>&#160;:</term>
 <listitem><simpara>		the desired transform klass href.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the desired transform usage.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>transform klass is found and NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName ()</title>
-<indexterm><primary>xmlSecTransformIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformIdListFindByName
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
+<refsect2 id="xmlSecTransformIdListFindByName" role="function">
+<title>xmlSecTransformIdListFindByName ()</title>
+<indexterm zone="xmlSecTransformIdListFindByName"><primary sortas="xmlSecTransformIdListFindByName">xmlSecTransformIdListFindByName</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformIdListFindByName     (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="xmlSecTransformUsage">xmlSecTransformUsage</link> usage);</programlisting>
 <para>
 Lookups data klass in the list with given <parameter>name</parameter> and <parameter>usage</parameter> in <parameter>list</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara>		the desired transform klass name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>usage</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>usage</parameter>&#160;:</term>
 <listitem><simpara>		the desired transform usage.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>transform klass is found and NULL otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> transform klass is found and NULL otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump ()</title>
-<indexterm><primary>xmlSecTransformIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformIdListDebugDump  (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformIdListDebugDump" role="function">
+<title>xmlSecTransformIdListDebugDump ()</title>
+<indexterm zone="xmlSecTransformIdListDebugDump"><primary sortas="xmlSecTransformIdListDebugDump">xmlSecTransformIdListDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdListDebugDump      (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary transform debug information to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump ()</title>
-<indexterm><primary>xmlSecTransformIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformIdListDebugXmlDump
-                                            (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecTransformIdListDebugXmlDump" role="function">
+<title>xmlSecTransformIdListDebugXmlDump ()</title>
+<indexterm zone="xmlSecTransformIdListDebugXmlDump"><primary sortas="xmlSecTransformIdListDebugXmlDump">xmlSecTransformIdListDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformIdListDebugXmlDump   (<link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> list,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints binary transform debug information to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>list</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>list</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to transform ids list.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</title>
-<indexterm><primary>xmlSecTransformIdUnknown</primary></indexterm><programlisting>#define xmlSecTransformIdUnknown			((xmlSecTransformId)NULL)
+<refsect2 id="xmlSecTransformIdUnknown" role="macro">
+<title>xmlSecTransformIdUnknown</title>
+<indexterm zone="xmlSecTransformIdUnknown"><primary sortas="xmlSecTransformIdUnknown">xmlSecTransformIdUnknown</primary></indexterm><programlisting>#define xmlSecTransformIdUnknown			((xmlSecTransformId)NULL)
 </programlisting>
 <para>
 The "unknown" transform id (NULL).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformBase64Id">xmlSecTransformBase64Id</title>
-<indexterm><primary>xmlSecTransformBase64Id</primary></indexterm><programlisting>#define     xmlSecTransformBase64Id</programlisting>
+<refsect2 id="xmlSecTransformBase64Id" role="macro">
+<title>xmlSecTransformBase64Id</title>
+<indexterm zone="xmlSecTransformBase64Id"><primary sortas="xmlSecTransformBase64Id">xmlSecTransformBase64Id</primary></indexterm><programlisting>#define             xmlSecTransformBase64Id</programlisting>
 <para>
 The base64 encode transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass ()</title>
-<indexterm><primary>xmlSecTransformBase64GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformBase64GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformBase64GetKlass" role="function">
+<title>xmlSecTransformBase64GetKlass ()</title>
+<indexterm zone="xmlSecTransformBase64GetKlass"><primary sortas="xmlSecTransformBase64GetKlass">xmlSecTransformBase64GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformBase64GetKlass       (void);</programlisting>
 <para>
 The Base64 transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Base-64"><type>sec-Base-64</type></link>).
 The normative specification for base64 decoding transforms is RFC 2045
@@ -2572,166 +2417,146 @@ no content. The input is decoded by the algorithms. This transform is
 useful if an application needs to sign the raw data associated with 
 the encoded content of an element.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>base64 transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> base64 transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize ()</title>
-<indexterm><primary>xmlSecTransformBase64SetLineSize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecTransformBase64SetLineSize
-                                            (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> lineSize);</programlisting>
+<refsect2 id="xmlSecTransformBase64SetLineSize" role="function">
+<title>xmlSecTransformBase64SetLineSize ()</title>
+<indexterm zone="xmlSecTransformBase64SetLineSize"><primary sortas="xmlSecTransformBase64SetLineSize">xmlSecTransformBase64SetLineSize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecTransformBase64SetLineSize    (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> lineSize);</programlisting>
 <para>
 Sets the max line size to <parameter>lineSize</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to BASE64 encode transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>lineSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>lineSize</parameter>&#160;:</term>
 <listitem><simpara> 		the new max line size.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</title>
-<indexterm><primary>xmlSecTransformInclC14NId</primary></indexterm><programlisting>#define     xmlSecTransformInclC14NId</programlisting>
+<refsect2 id="xmlSecTransformInclC14NId" role="macro">
+<title>xmlSecTransformInclC14NId</title>
+<indexterm zone="xmlSecTransformInclC14NId"><primary sortas="xmlSecTransformInclC14NId">xmlSecTransformInclC14NId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14NId</programlisting>
 <para>
 The regular (inclusive) C14N without comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass ()</title>
-<indexterm><primary>xmlSecTransformInclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformInclC14NGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformInclC14NGetKlass" role="function">
+<title>xmlSecTransformInclC14NGetKlass ()</title>
+<indexterm zone="xmlSecTransformInclC14NGetKlass"><primary sortas="xmlSecTransformInclC14NGetKlass">xmlSecTransformInclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14NGetKlass     (void);</programlisting>
 <para>
 Inclusive (regular) canonicalization that omits comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-c14nAlg"><type>sec-c14nAlg</type></link> and 
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>c14n transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</title>
-<indexterm><primary>xmlSecTransformInclC14NWithCommentsId</primary></indexterm><programlisting>#define     xmlSecTransformInclC14NWithCommentsId</programlisting>
+<refsect2 id="xmlSecTransformInclC14NWithCommentsId" role="macro">
+<title>xmlSecTransformInclC14NWithCommentsId</title>
+<indexterm zone="xmlSecTransformInclC14NWithCommentsId"><primary sortas="xmlSecTransformInclC14NWithCommentsId">xmlSecTransformInclC14NWithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14NWithCommentsId</programlisting>
 <para>
 The regular (inclusive) C14N with comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass ()</title>
-<indexterm><primary>xmlSecTransformInclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformInclC14NWithCommentsGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformInclC14NWithCommentsGetKlass" role="function">
+<title>xmlSecTransformInclC14NWithCommentsGetKlass ()</title>
+<indexterm zone="xmlSecTransformInclC14NWithCommentsGetKlass"><primary sortas="xmlSecTransformInclC14NWithCommentsGetKlass">xmlSecTransformInclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14NWithCommentsGetKlass
+                                                        (void);</programlisting>
 <para>
 Inclusive (regular) canonicalization that includes comments transform klass
 (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-c14nAlg"><type>sec-c14nAlg</type></link> and 
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>c14n with comments transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</title>
-<indexterm><primary>xmlSecTransformInclC14N11Id</primary></indexterm><programlisting>#define     xmlSecTransformInclC14N11Id</programlisting>
+<refsect2 id="xmlSecTransformInclC14N11Id" role="macro">
+<title>xmlSecTransformInclC14N11Id</title>
+<indexterm zone="xmlSecTransformInclC14N11Id"><primary sortas="xmlSecTransformInclC14N11Id">xmlSecTransformInclC14N11Id</primary></indexterm><programlisting>#define             xmlSecTransformInclC14N11Id</programlisting>
 <para>
 The regular (inclusive) C14N 1.1 without comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass ()</title>
-<indexterm><primary>xmlSecTransformInclC14N11GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformInclC14N11GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformInclC14N11GetKlass" role="function">
+<title>xmlSecTransformInclC14N11GetKlass ()</title>
+<indexterm zone="xmlSecTransformInclC14N11GetKlass"><primary sortas="xmlSecTransformInclC14N11GetKlass">xmlSecTransformInclC14N11GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14N11GetKlass   (void);</programlisting>
 <para>
 C14N version 1.1 (http://www.w3.org/TR/xml-c14n11)</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>c14n v1.1 transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n v1.1 transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</title>
-<indexterm><primary>xmlSecTransformInclC14N11WithCommentsId</primary></indexterm><programlisting>#define     xmlSecTransformInclC14N11WithCommentsId</programlisting>
+<refsect2 id="xmlSecTransformInclC14N11WithCommentsId" role="macro">
+<title>xmlSecTransformInclC14N11WithCommentsId</title>
+<indexterm zone="xmlSecTransformInclC14N11WithCommentsId"><primary sortas="xmlSecTransformInclC14N11WithCommentsId">xmlSecTransformInclC14N11WithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformInclC14N11WithCommentsId</programlisting>
 <para>
 The regular (inclusive) C14N 1.1 with comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass ()</title>
-<indexterm><primary>xmlSecTransformInclC14N11WithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformInclC14N11WithCommentsGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformInclC14N11WithCommentsGetKlass" role="function">
+<title>xmlSecTransformInclC14N11WithCommentsGetKlass ()</title>
+<indexterm zone="xmlSecTransformInclC14N11WithCommentsGetKlass"><primary sortas="xmlSecTransformInclC14N11WithCommentsGetKlass">xmlSecTransformInclC14N11WithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformInclC14N11WithCommentsGetKlass
+                                                        (void);</programlisting>
 <para>
 C14N version 1.1 (http://www.w3.org/TR/xml-c14n11) with comments</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>c14n v1.1 with comments transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> c14n v1.1 with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</title>
-<indexterm><primary>xmlSecTransformExclC14NId</primary></indexterm><programlisting>#define     xmlSecTransformExclC14NId</programlisting>
+<refsect2 id="xmlSecTransformExclC14NId" role="macro">
+<title>xmlSecTransformExclC14NId</title>
+<indexterm zone="xmlSecTransformExclC14NId"><primary sortas="xmlSecTransformExclC14NId">xmlSecTransformExclC14NId</primary></indexterm><programlisting>#define             xmlSecTransformExclC14NId</programlisting>
 <para>
 The exclusive C14N without comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass ()</title>
-<indexterm><primary>xmlSecTransformExclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformExclC14NGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformExclC14NGetKlass" role="function">
+<title>xmlSecTransformExclC14NGetKlass ()</title>
+<indexterm zone="xmlSecTransformExclC14NGetKlass"><primary sortas="xmlSecTransformExclC14NGetKlass">xmlSecTransformExclC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformExclC14NGetKlass     (void);</programlisting>
 <para>
 Exclusive canoncicalization that ommits comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>exclusive c14n transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> exclusive c14n transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</title>
-<indexterm><primary>xmlSecTransformExclC14NWithCommentsId</primary></indexterm><programlisting>#define     xmlSecTransformExclC14NWithCommentsId</programlisting>
+<refsect2 id="xmlSecTransformExclC14NWithCommentsId" role="macro">
+<title>xmlSecTransformExclC14NWithCommentsId</title>
+<indexterm zone="xmlSecTransformExclC14NWithCommentsId"><primary sortas="xmlSecTransformExclC14NWithCommentsId">xmlSecTransformExclC14NWithCommentsId</primary></indexterm><programlisting>#define             xmlSecTransformExclC14NWithCommentsId</programlisting>
 <para>
 The exclusive C14N with comments transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass ()</title>
-<indexterm><primary>xmlSecTransformExclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformExclC14NWithCommentsGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformExclC14NWithCommentsGetKlass" role="function">
+<title>xmlSecTransformExclC14NWithCommentsGetKlass ()</title>
+<indexterm zone="xmlSecTransformExclC14NWithCommentsGetKlass"><primary sortas="xmlSecTransformExclC14NWithCommentsGetKlass">xmlSecTransformExclC14NWithCommentsGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformExclC14NWithCommentsGetKlass
+                                                        (void);</programlisting>
 <para>
 Exclusive canoncicalization that includes comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>exclusive c14n with comments transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> exclusive c14n with comments transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</title>
-<indexterm><primary>xmlSecTransformEnvelopedId</primary></indexterm><programlisting>#define     xmlSecTransformEnvelopedId</programlisting>
+<refsect2 id="xmlSecTransformEnvelopedId" role="macro">
+<title>xmlSecTransformEnvelopedId</title>
+<indexterm zone="xmlSecTransformEnvelopedId"><primary sortas="xmlSecTransformEnvelopedId">xmlSecTransformEnvelopedId</primary></indexterm><programlisting>#define             xmlSecTransformEnvelopedId</programlisting>
 <para>
 The "enveloped" transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass ()</title>
-<indexterm><primary>xmlSecTransformEnvelopedGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformEnvelopedGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformEnvelopedGetKlass" role="function">
+<title>xmlSecTransformEnvelopedGetKlass ()</title>
+<indexterm zone="xmlSecTransformEnvelopedGetKlass"><primary sortas="xmlSecTransformEnvelopedGetKlass">xmlSecTransformEnvelopedGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformEnvelopedGetKlass    (void);</programlisting>
 <para>
 The enveloped transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-EnvelopedSignature"><type>sec-EnvelopedSignature</type></link>):
 </para>
@@ -2757,112 +2582,99 @@ expression evaluator to create this transform. However, this transform
 MUST produce output in exactly the same manner as the XPath transform 
 parameterized by the XPath expression above.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>enveloped transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> enveloped transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPathId">xmlSecTransformXPathId</title>
-<indexterm><primary>xmlSecTransformXPathId</primary></indexterm><programlisting>#define     xmlSecTransformXPathId</programlisting>
+<refsect2 id="xmlSecTransformXPathId" role="macro">
+<title>xmlSecTransformXPathId</title>
+<indexterm zone="xmlSecTransformXPathId"><primary sortas="xmlSecTransformXPathId">xmlSecTransformXPathId</primary></indexterm><programlisting>#define             xmlSecTransformXPathId</programlisting>
 <para>
 The XPath transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass ()</title>
-<indexterm><primary>xmlSecTransformXPathGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformXPathGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformXPathGetKlass" role="function">
+<title>xmlSecTransformXPathGetKlass ()</title>
+<indexterm zone="xmlSecTransformXPathGetKlass"><primary sortas="xmlSecTransformXPathGetKlass">xmlSecTransformXPathGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPathGetKlass        (void);</programlisting>
 <para>
 The XPath transform evaluates given XPath expression and 
 intersects the result with the previous nodes set. See 
 http://www.w3.org/TR/xmldsig-core/<link linkend="sec-XPath"><type>sec-XPath</type></link> for more details.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>XPath transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPath transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</title>
-<indexterm><primary>xmlSecTransformXPath2Id</primary></indexterm><programlisting>#define     xmlSecTransformXPath2Id</programlisting>
+<refsect2 id="xmlSecTransformXPath2Id" role="macro">
+<title>xmlSecTransformXPath2Id</title>
+<indexterm zone="xmlSecTransformXPath2Id"><primary sortas="xmlSecTransformXPath2Id">xmlSecTransformXPath2Id</primary></indexterm><programlisting>#define             xmlSecTransformXPath2Id</programlisting>
 <para>
 The XPath2 transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass ()</title>
-<indexterm><primary>xmlSecTransformXPath2GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformXPath2GetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformXPath2GetKlass" role="function">
+<title>xmlSecTransformXPath2GetKlass ()</title>
+<indexterm zone="xmlSecTransformXPath2GetKlass"><primary sortas="xmlSecTransformXPath2GetKlass">xmlSecTransformXPath2GetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPath2GetKlass       (void);</programlisting>
 <para>
 The XPath2 transform (http://www.w3.org/TR/xmldsig-filter2/).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>XPath2 transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPath2 transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPointerId">xmlSecTransformXPointerId</title>
-<indexterm><primary>xmlSecTransformXPointerId</primary></indexterm><programlisting>#define     xmlSecTransformXPointerId</programlisting>
+<refsect2 id="xmlSecTransformXPointerId" role="macro">
+<title>xmlSecTransformXPointerId</title>
+<indexterm zone="xmlSecTransformXPointerId"><primary sortas="xmlSecTransformXPointerId">xmlSecTransformXPointerId</primary></indexterm><programlisting>#define             xmlSecTransformXPointerId</programlisting>
 <para>
 The XPointer transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass ()</title>
-<indexterm><primary>xmlSecTransformXPointerGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformXPointerGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformXPointerGetKlass" role="function">
+<title>xmlSecTransformXPointerGetKlass ()</title>
+<indexterm zone="xmlSecTransformXPointerGetKlass"><primary sortas="xmlSecTransformXPointerGetKlass">xmlSecTransformXPointerGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXPointerGetKlass     (void);</programlisting>
 <para>
 The XPointer transform klass 
 (http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>XPointer transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> XPointer transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr ()</title>
-<indexterm><primary>xmlSecTransformXPointerSetExpr</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformXPointerSetExpr  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *expr,
-                                             <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
-                                             <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
+<refsect2 id="xmlSecTransformXPointerSetExpr" role="function">
+<title>xmlSecTransformXPointerSetExpr ()</title>
+<indexterm zone="xmlSecTransformXPointerSetExpr"><primary sortas="xmlSecTransformXPointerSetExpr">xmlSecTransformXPointerSetExpr</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformXPointerSetExpr      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *expr,
+                                                         <link linkend="xmlSecNodeSetType">xmlSecNodeSetType</link> nodeSetType,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> hereNode);</programlisting>
 <para>
 Sets the XPointer expression for an XPointer <parameter>transform</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to XPointer transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>expr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>expr</parameter>&#160;:</term>
 <listitem><simpara>		the XPointer expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeSetType</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeSetType</parameter>&#160;:</term>
 <listitem><simpara>	the type of evaluated XPointer expression.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>hereNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>hereNode</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to "here" node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXsltId">xmlSecTransformXsltId</title>
-<indexterm><primary>xmlSecTransformXsltId</primary></indexterm><programlisting>#define     xmlSecTransformXsltId</programlisting>
+<refsect2 id="xmlSecTransformXsltId" role="macro">
+<title>xmlSecTransformXsltId</title>
+<indexterm zone="xmlSecTransformXsltId"><primary sortas="xmlSecTransformXsltId">xmlSecTransformXsltId</primary></indexterm><programlisting>#define             xmlSecTransformXsltId</programlisting>
 <para>
 The XSLT transform klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass ()</title>
-<indexterm><primary>xmlSecTransformXsltGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformXsltGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformXsltGetKlass" role="function">
+<title>xmlSecTransformXsltGetKlass ()</title>
+<indexterm zone="xmlSecTransformXsltGetKlass"><primary sortas="xmlSecTransformXsltGetKlass">xmlSecTransformXsltGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformXsltGetKlass         (void);</programlisting>
 <para>
 XSLT transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-XSLT"><type>sec-XSLT</type></link>):
 </para>
@@ -2894,23 +2706,21 @@ to ensure interoperability of the resulting signatures among applications
 that support the XSLT transform. Note that if the output is actually HTML, 
 then the result of these steps is logically equivalent [XHTML].</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to XSLT transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to XSLT transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</title>
-<indexterm><primary>xmlSecTransformRemoveXmlTagsC14NId</primary></indexterm><programlisting>#define     xmlSecTransformRemoveXmlTagsC14NId</programlisting>
+<refsect2 id="xmlSecTransformRemoveXmlTagsC14NId" role="macro">
+<title>xmlSecTransformRemoveXmlTagsC14NId</title>
+<indexterm zone="xmlSecTransformRemoveXmlTagsC14NId"><primary sortas="xmlSecTransformRemoveXmlTagsC14NId">xmlSecTransformRemoveXmlTagsC14NId</primary></indexterm><programlisting>#define             xmlSecTransformRemoveXmlTagsC14NId</programlisting>
 <para>
 The "remove all xml tags" transform klass (used before base64 transforms).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass ()</title>
-<indexterm><primary>xmlSecTransformRemoveXmlTagsC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformRemoveXmlTagsC14NGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformRemoveXmlTagsC14NGetKlass" role="function">
+<title>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</title>
+<indexterm zone="xmlSecTransformRemoveXmlTagsC14NGetKlass"><primary sortas="xmlSecTransformRemoveXmlTagsC14NGetKlass">xmlSecTransformRemoveXmlTagsC14NGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformRemoveXmlTagsC14NGetKlass
+                                                        (void);</programlisting>
 <para>
 The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Base-64"><type>sec-Base-64</type></link>):
 Base64 transform requires an octet stream for input. If an XPath node-set 
@@ -2924,53 +2734,48 @@ automatically strips away the start and end tags of the identified element
 and any of its descendant elements as well as any descendant comments and 
 processing instructions. The output of this transform is an octet stream.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>"remove xml tags" transform id.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> "remove xml tags" transform id.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</title>
-<indexterm><primary>xmlSecTransformVisa3DHackId</primary></indexterm><programlisting>#define     xmlSecTransformVisa3DHackId</programlisting>
+<refsect2 id="xmlSecTransformVisa3DHackId" role="macro">
+<title>xmlSecTransformVisa3DHackId</title>
+<indexterm zone="xmlSecTransformVisa3DHackId"><primary sortas="xmlSecTransformVisa3DHackId">xmlSecTransformVisa3DHackId</primary></indexterm><programlisting>#define             xmlSecTransformVisa3DHackId</programlisting>
 <para>
 Selects node subtree by given node id string. The only reason why we need this 
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows 
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate 
 such expressions thru XPath/XPointer engine, we need to have this hack here.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass ()</title>
-<indexterm><primary>xmlSecTransformVisa3DHackGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link> xmlSecTransformVisa3DHackGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecTransformVisa3DHackGetKlass" role="function">
+<title>xmlSecTransformVisa3DHackGetKlass ()</title>
+<indexterm zone="xmlSecTransformVisa3DHackGetKlass"><primary sortas="xmlSecTransformVisa3DHackGetKlass">xmlSecTransformVisa3DHackGetKlass</primary></indexterm><programlisting><link linkend="xmlSecTransformId">xmlSecTransformId</link>   xmlSecTransformVisa3DHackGetKlass   (void);</programlisting>
 <para>
 The Visa3DHack transform klass. The only reason why we need this 
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows 
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate 
 such expressions thru XPath/XPointer engine, we need to have this hack here.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>Visa3DHack transform klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Visa3DHack transform klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID ()</title>
-<indexterm><primary>xmlSecTransformVisa3DHackSetID</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecTransformVisa3DHackSetID  (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
-                                             const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
+<refsect2 id="xmlSecTransformVisa3DHackSetID" role="function">
+<title>xmlSecTransformVisa3DHackSetID ()</title>
+<indexterm zone="xmlSecTransformVisa3DHackSetID"><primary sortas="xmlSecTransformVisa3DHackSetID">xmlSecTransformVisa3DHackSetID</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecTransformVisa3DHackSetID      (<link linkend="xmlSecTransform">xmlSecTransformPtr</link> transform,
+                                                         const <link linkend="xmlChar">xmlChar</link> *id);</programlisting>
 <para>
 Sets the ID value for an Visa3DHack <parameter>transform</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>transform</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transform</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to Visa3DHack transform.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>id</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>id</parameter>&#160;:</term>
 <listitem><simpara>			the ID value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/version.sgml b/docs/api/sgml/version.sgml
index 589d4d2..635e4f8 100644
--- a/docs/api/sgml/version.sgml
+++ b/docs/api/sgml/version.sgml
@@ -1,25 +1,24 @@
 <refentry id="xmlsec-version">
 <refmeta>
-<refentrytitle>version</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-version.top_of_page">version</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>version</refname><refpurpose>Version macros.</refpurpose>
+<refname>version</refname>
+<refpurpose>Version macros.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-version.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-VERSION-CAPS">XMLSEC_VERSION</link>
-#define     <link linkend="XMLSEC-VERSION-MAJOR-CAPS">XMLSEC_VERSION_MAJOR</link>
-#define     <link linkend="XMLSEC-VERSION-MINOR-CAPS">XMLSEC_VERSION_MINOR</link>
-#define     <link linkend="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC_VERSION_SUBMINOR</link>
-#define     <link linkend="XMLSEC-VERSION-INFO-CAPS">XMLSEC_VERSION_INFO</link>
+#define             <link linkend="XMLSEC-VERSION--CAPS">XMLSEC_VERSION</link>
+#define             <link linkend="XMLSEC-VERSION-MAJOR--CAPS">XMLSEC_VERSION_MAJOR</link>
+#define             <link linkend="XMLSEC-VERSION-MINOR--CAPS">XMLSEC_VERSION_MINOR</link>
+#define             <link linkend="XMLSEC-VERSION-SUBMINOR--CAPS">XMLSEC_VERSION_SUBMINOR</link>
+#define             <link linkend="XMLSEC-VERSION-INFO--CAPS">XMLSEC_VERSION_INFO</link>
 </synopsis>
 </refsynopsisdiv>
 
@@ -31,61 +30,56 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-version.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Version macros.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-VERSION-CAPS">XMLSEC_VERSION</title>
-<indexterm><primary>XMLSEC_VERSION</primary></indexterm><programlisting>#define XMLSEC_VERSION			"1.2.13"
+<refsect1 id="xmlsec-version.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-VERSION--CAPS" role="macro">
+<title>XMLSEC_VERSION</title>
+<indexterm zone="XMLSEC-VERSION--CAPS"><primary sortas="XMLSEC_VERSION">XMLSEC_VERSION</primary></indexterm><programlisting>#define XMLSEC_VERSION			"1.2.13"
 </programlisting>
 <para>
 The library version string in the format
 "&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-VERSION-MAJOR-CAPS">XMLSEC_VERSION_MAJOR</title>
-<indexterm><primary>XMLSEC_VERSION_MAJOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MAJOR		1
+<refsect2 id="XMLSEC-VERSION-MAJOR--CAPS" role="macro">
+<title>XMLSEC_VERSION_MAJOR</title>
+<indexterm zone="XMLSEC-VERSION-MAJOR--CAPS"><primary sortas="XMLSEC_VERSION_MAJOR">XMLSEC_VERSION_MAJOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MAJOR		1
 </programlisting>
 <para>
 The library major version number.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-VERSION-MINOR-CAPS">XMLSEC_VERSION_MINOR</title>
-<indexterm><primary>XMLSEC_VERSION_MINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MINOR		2
+<refsect2 id="XMLSEC-VERSION-MINOR--CAPS" role="macro">
+<title>XMLSEC_VERSION_MINOR</title>
+<indexterm zone="XMLSEC-VERSION-MINOR--CAPS"><primary sortas="XMLSEC_VERSION_MINOR">XMLSEC_VERSION_MINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_MINOR		2
 </programlisting>
 <para>
 The library minor version number.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC_VERSION_SUBMINOR</title>
-<indexterm><primary>XMLSEC_VERSION_SUBMINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_SUBMINOR		13
+<refsect2 id="XMLSEC-VERSION-SUBMINOR--CAPS" role="macro">
+<title>XMLSEC_VERSION_SUBMINOR</title>
+<indexterm zone="XMLSEC-VERSION-SUBMINOR--CAPS"><primary sortas="XMLSEC_VERSION_SUBMINOR">XMLSEC_VERSION_SUBMINOR</primary></indexterm><programlisting>#define XMLSEC_VERSION_SUBMINOR		13
 </programlisting>
 <para>
 The library sub-minor version number.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-VERSION-INFO-CAPS">XMLSEC_VERSION_INFO</title>
-<indexterm><primary>XMLSEC_VERSION_INFO</primary></indexterm><programlisting>#define XMLSEC_VERSION_INFO		"3:13:2"
+<refsect2 id="XMLSEC-VERSION-INFO--CAPS" role="macro">
+<title>XMLSEC_VERSION_INFO</title>
+<indexterm zone="XMLSEC-VERSION-INFO--CAPS"><primary sortas="XMLSEC_VERSION_INFO">XMLSEC_VERSION_INFO</primary></indexterm><programlisting>#define XMLSEC_VERSION_INFO		"3:13:2"
 </programlisting>
 <para>
 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;".</para>
 <para>
-
 </para></refsect2>
 
 </refsect1>
diff --git a/docs/api/sgml/x509.sgml b/docs/api/sgml/x509.sgml
index 79dba31..5192129 100644
--- a/docs/api/sgml/x509.sgml
+++ b/docs/api/sgml/x509.sgml
@@ -1,29 +1,28 @@
 <refentry id="xmlsec-x509">
 <refmeta>
-<refentrytitle>x509</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-x509.top_of_page">x509</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>x509</refname><refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node parser.</refpurpose>
+<refname>x509</refname>
+<refpurpose><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node parser.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-x509.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</link>
-#define     <link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</link>
-#define     <link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</link>
-#define     <link linkend="XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC_X509DATA_SKI_NODE</link>
-#define     <link linkend="XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC_X509DATA_CRL_NODE</link>
-#define     <link linkend="XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC_X509DATA_DEFAULT</link>
-<link linkend="int">int</link>         <link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link>    (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> deleteChildren,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
+#define             <link linkend="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-SKI-NODE--CAPS">XMLSEC_X509DATA_SKI_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-CRL-NODE--CAPS">XMLSEC_X509DATA_CRL_NODE</link>
+#define             <link linkend="XMLSEC-X509DATA-DEFAULT--CAPS">XMLSEC_X509DATA_DEFAULT</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</link>        (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> deleteChildren,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);
 </synopsis>
 </refsynopsisdiv>
 
@@ -35,90 +34,83 @@
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-x509.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node parser.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</title>
-<indexterm><primary>XMLSEC_X509DATA_CERTIFICATE_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CERTIFICATE_NODE			0x00000001
+<refsect1 id="xmlsec-x509.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS" role="macro">
+<title>XMLSEC_X509DATA_CERTIFICATE_NODE</title>
+<indexterm zone="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_CERTIFICATE_NODE">XMLSEC_X509DATA_CERTIFICATE_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CERTIFICATE_NODE			0x00000001
 </programlisting>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate";>&lt;dsig:X509Certificate/&gt;</ulink> node found or would be written back.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</title>
-<indexterm><primary>XMLSEC_X509DATA_SUBJECTNAME_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SUBJECTNAME_NODE			0x00000002
+<refsect2 id="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS" role="macro">
+<title>XMLSEC_X509DATA_SUBJECTNAME_NODE</title>
+<indexterm zone="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_SUBJECTNAME_NODE">XMLSEC_X509DATA_SUBJECTNAME_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SUBJECTNAME_NODE			0x00000002
 </programlisting>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName";>&lt;dsig:X509SubjectName/&gt;</ulink> node found or would be written back.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</title>
-<indexterm><primary>XMLSEC_X509DATA_ISSUERSERIAL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_ISSUERSERIAL_NODE			0x00000004
+<refsect2 id="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS" role="macro">
+<title>XMLSEC_X509DATA_ISSUERSERIAL_NODE</title>
+<indexterm zone="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_ISSUERSERIAL_NODE">XMLSEC_X509DATA_ISSUERSERIAL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_ISSUERSERIAL_NODE			0x00000004
 </programlisting>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial";>&lt;dsig:X509IssuerSerial/&gt;</ulink> node found or would be written back.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC_X509DATA_SKI_NODE</title>
-<indexterm><primary>XMLSEC_X509DATA_SKI_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SKI_NODE				0x00000008
+<refsect2 id="XMLSEC-X509DATA-SKI-NODE--CAPS" role="macro">
+<title>XMLSEC_X509DATA_SKI_NODE</title>
+<indexterm zone="XMLSEC-X509DATA-SKI-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_SKI_NODE">XMLSEC_X509DATA_SKI_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_SKI_NODE				0x00000008
 </programlisting>
 <para>
 &lt;dsig:/X509SKI&gt; node found or would be written back.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC_X509DATA_CRL_NODE</title>
-<indexterm><primary>XMLSEC_X509DATA_CRL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CRL_NODE				0x00000010
+<refsect2 id="XMLSEC-X509DATA-CRL-NODE--CAPS" role="macro">
+<title>XMLSEC_X509DATA_CRL_NODE</title>
+<indexterm zone="XMLSEC-X509DATA-CRL-NODE--CAPS"><primary sortas="XMLSEC_X509DATA_CRL_NODE">XMLSEC_X509DATA_CRL_NODE</primary></indexterm><programlisting>#define XMLSEC_X509DATA_CRL_NODE				0x00000010
 </programlisting>
 <para>
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL";>&lt;dsig:X509CRL/&gt;</ulink> node found or would be written back.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC_X509DATA_DEFAULT</title>
-<indexterm><primary>XMLSEC_X509DATA_DEFAULT</primary></indexterm><programlisting>#define     XMLSEC_X509DATA_DEFAULT</programlisting>
+<refsect2 id="XMLSEC-X509DATA-DEFAULT--CAPS" role="macro">
+<title>XMLSEC_X509DATA_DEFAULT</title>
+<indexterm zone="XMLSEC-X509DATA-DEFAULT--CAPS"><primary sortas="XMLSEC_X509DATA_DEFAULT">XMLSEC_X509DATA_DEFAULT</primary></indexterm><programlisting>#define             XMLSEC_X509DATA_DEFAULT</programlisting>
 <para>
 Default set of nodes to write in case of empty
 <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node template.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent ()</title>
-<indexterm><primary>xmlSecX509DataGetNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecX509DataGetNodeContent    (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> deleteChildren,
-                                             <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
+<refsect2 id="xmlSecX509DataGetNodeContent" role="function">
+<title>xmlSecX509DataGetNodeContent ()</title>
+<indexterm zone="xmlSecX509DataGetNodeContent"><primary sortas="xmlSecX509DataGetNodeContent">xmlSecX509DataGetNodeContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecX509DataGetNodeContent        (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> deleteChildren,
+                                                         <link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtxPtr</link> keyInfoCtx);</programlisting>
 <para>
 Reads the contents of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node and returns it as
 a bits mask.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>deleteChildren</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>deleteChildren</parameter>&#160;:</term>
 <listitem><simpara>	the flag that indicates whether to remove node children after reading.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keyInfoCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keyInfoCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the bit mask representing the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node content
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the bit mask representing the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-X509Data";>&lt;dsig:X509Data/&gt;</ulink> node content
 or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/xmldsig.sgml b/docs/api/sgml/xmldsig.sgml
index addef6a..3447fb5 100644
--- a/docs/api/sgml/xmldsig.sgml
+++ b/docs/api/sgml/xmldsig.sgml
@@ -1,72 +1,65 @@
 <refentry id="xmlsec-xmldsig">
 <refmeta>
-<refentrytitle>xmldsig</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-xmldsig.top_of_page">xmldsig</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>xmldsig</refname><refpurpose>XML Digital Signature support.</refpurpose>
+<refname>xmldsig</refname>
+<refpurpose>XML Digital Signature support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-xmldsig.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-enum        <link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>;
-#define     <link linkend="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</link>
-#define     <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</link>
-#define     <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</link>
-#define     <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</link>
-#define     <link linkend="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</link>
-struct      <link linkend="xmlSecDSigCtx">xmlSecDSigCtx</link>;
-<link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link> <link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link>        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</link>            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</link>         (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</link>           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigCtxSign">xmlSecDSigCtxSign</link>               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</link>             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</link>
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</link>
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</link>
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</link>          (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</link>       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-enum        <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link>;
-struct      <link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</link>;
-<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> <link linkend="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</link>
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</link>   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</link>
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</link>  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</link>
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <link linkend="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</link>
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</link> (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</link>
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-#define     <link linkend="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</link>
-<link linkend="xmlSecPtrListId">xmlSecPtrListId</link> <link linkend="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</link>
-                                            (void);
+enum                <link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>;
+#define             <link linkend="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</link>
+#define             <link linkend="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</link>
+struct              <link linkend="xmlSecDSigCtx">xmlSecDSigCtx</link>;
+<link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link>    <link linkend="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</link>                 (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</link>                (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</link>             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</link>               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxSign">xmlSecDSigCtxSign</link>                   (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</link>                 (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</link>
+                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</link>
+                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);
+<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</link>       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</link>              (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</link>           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+enum                <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link>;
+struct              <link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</link>;
+<link linkend="xmlSecDSigReferenceCtxPtr">xmlSecDSigReferenceCtxPtr</link>  <link linkend="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</link> (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</link>       (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</link>    (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</link>      (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</link>   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     <link linkend="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</link>
+                                                        (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</link>     (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</link>  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</link>
+<link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     <link linkend="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</link>  (void);
 </synopsis>
 </refsynopsisdiv>
 
@@ -78,18 +71,18 @@ struct      <link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</link>
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-xmldsig.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 XML Digital Signature support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecDSigStatus">enum xmlSecDSigStatus</title>
-<indexterm><primary>xmlSecDSigStatus</primary></indexterm><programlisting>typedef enum {
+<refsect1 id="xmlsec-xmldsig.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecDSigStatus" role="enum">
+<title>enum xmlSecDSigStatus</title>
+<indexterm zone="xmlSecDSigStatus"><primary sortas="xmlSecDSigStatus">xmlSecDSigStatus</primary></indexterm><programlisting>typedef enum {
     xmlSecDSigStatusUnknown = 0,
     xmlSecDSigStatusSucceeded,
     xmlSecDSigStatusInvalid
@@ -98,78 +91,71 @@ XML Digital Signature support.
 <para>
 XML Digital signature processing status.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecDSigStatusUnknown" role="constant">
 <term><literal>xmlSecDSigStatusUnknown</literal></term>
 <listitem><simpara> 	the status is unknow.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecDSigStatusSucceeded" role="constant">
 <term><literal>xmlSecDSigStatusSucceeded</literal></term>
 <listitem><simpara>	the processing succeeded.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecDSigStatusInvalid" role="constant">
 <term><literal>xmlSecDSigStatusInvalid</literal></term>
 <listitem><simpara>	the processing failed.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</title>
-<indexterm><primary>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS			0x00000001
+<refsect2 id="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS" role="macro">
+<title>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</title>
+<indexterm zone="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS			0x00000001
 </programlisting>
 <para>
 If this flag is set then <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifests";>&lt;dsig:Manifests/&gt;</ulink> nodes will not be processed.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</title>
-<indexterm><primary>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES		0x00000002
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS" role="macro">
+<title>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</title>
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES		0x00000002
 </programlisting>
 <para>
 If this flag is set then pre-digest buffer for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> child
 of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo";>&lt;dsig:KeyInfo/&gt;</ulink> element will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</title>
-<indexterm><primary>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES		0x00000004
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS" role="macro">
+<title>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</title>
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES		0x00000004
 </programlisting>
 <para>
 If this flag is set then pre-digest buffer for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> child
 of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> element will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</title>
-<indexterm><primary>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNATURE			0x00000008
+<refsect2 id="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS" role="macro">
+<title>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</title>
+<indexterm zone="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_STORE_SIGNATURE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_STORE_SIGNATURE			0x00000008
 </programlisting>
 <para>
 If this flag is set then pre-signature buffer for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink>
 element processing will be stored in <link linkend="xmlSecDSigCtx"><type>xmlSecDSigCtx</type></link>.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</title>
-<indexterm><primary>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK			0x00000010
+<refsect2 id="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS" role="macro">
+<title>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</title>
+<indexterm zone="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS"><primary sortas="XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</primary></indexterm><programlisting>#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK			0x00000010
 </programlisting>
 <para>
 If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
 documents that don't follow XML, XPointer and XML DSig specifications.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtx">struct xmlSecDSigCtx</title>
-<indexterm><primary>xmlSecDSigCtx</primary></indexterm><programlisting>struct xmlSecDSigCtx {
-
+<refsect2 id="xmlSecDSigCtx" role="struct">
+<title>struct xmlSecDSigCtx</title>
+<indexterm zone="xmlSecDSigCtx"><primary sortas="xmlSecDSigCtx">xmlSecDSigCtx</primary></indexterm><programlisting>struct xmlSecDSigCtx {
     /* these data user can set before performing the operation */
     void*			userData;
     unsigned int		flags;
@@ -200,332 +186,319 @@ documents that don't follow XML, XPointer and XML DSig specifications.</para>
     /* reserved for future */
     void*			reserved0;
     void*			reserved1;    
-};						
+};
 </programlisting>
 <para>
 XML DSig processing context.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>userData</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
 <listitem><simpara>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
 <listitem><simpara>			the XML Digital Signature processing flags.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags2</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
 <listitem><simpara>			the XML Digital Signature processing flags.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoReadCtx</structfield></term>
+<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoReadCtx</structfield>;</term>
 <listitem><simpara>		the reading key context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoWriteCtx</structfield></term>
+<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoWriteCtx</structfield>;</term>
 <listitem><simpara>		the writing key context (not used for signature verification).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>transformCtx</structfield></term>
+<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
 <listitem><simpara>		the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node processing context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link> <structfield>enabledReferenceUris</structfield></term>
+<term><link linkend="xmlSecTransformUriType">xmlSecTransformUriType</link>&#160;<structfield>enabledReferenceUris</structfield>;</term>
 <listitem><simpara>	the URI types allowed for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link> <structfield>enabledReferenceTransforms</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrListPtr</link>&#160;<structfield>enabledReferenceTransforms</structfield>;</term>
 <listitem><simpara>	the list of transforms allowed in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link> <structfield>referencePreExecuteCallback</structfield></term>
+<term><link linkend="xmlSecTransformCtxPreExecuteCallback">xmlSecTransformCtxPreExecuteCallback</link>&#160;<structfield>referencePreExecuteCallback</structfield>;</term>
 <listitem><simpara>the callback for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node processing.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>defSignMethodId</structfield></term>
+<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defSignMethodId</structfield>;</term>
 <listitem><simpara>		the default signing method klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>defC14NMethodId</structfield></term>
+<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defC14NMethodId</structfield>;</term>
 <listitem><simpara>		the default c14n method klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>defDigestMethodId</structfield></term>
+<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defDigestMethodId</structfield>;</term>
 <listitem><simpara>		the default digest method klass.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKey">xmlSecKeyPtr</link> <structfield>signKey</structfield></term>
+<term><link linkend="xmlSecKey">xmlSecKeyPtr</link>&#160;<structfield>signKey</structfield>;</term>
 <listitem><simpara>			the signature key; application may set <link linkend="signKey"><type>signKey</type></link>
 			before calling <link linkend="xmlSecDSigCtxSign"><type>xmlSecDSigCtxSign</type></link> or <link linkend="xmlSecDSigCtxVerify"><type>xmlSecDSigCtxVerify</type></link>
 			functions.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link> <structfield>operation</structfield></term>
+<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
 <listitem><simpara>			the operation: sign or verify.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <structfield>result</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
 <listitem><simpara>			the pointer to signature (not valid for signature verificaction).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link> <structfield>status</structfield></term>
+<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>&#160;<structfield>status</structfield>;</term>
 <listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire";>&lt;dsig:Signatuire/&gt;</ulink> procesisng status.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>signMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>signMethod</structfield>;</term>
 <listitem><simpara>			the pointer to signature transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>c14nMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>c14nMethod</structfield>;</term>
 <listitem><simpara>			the pointer to c14n transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>preSignMemBufMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>preSignMemBufMethod</structfield>;</term>
 <listitem><simpara>	the pointer to binary buffer right before signature
-			(valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> flag is set).
+			(valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> flag is set).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>signValueNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>signValueNode</structfield>;</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue";>&lt;dsig:SignatureValue/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
 <listitem><simpara>				the pointer to Id attribute of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>signedInfoReferences</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>signedInfoReferences</structfield>;</term>
 <listitem><simpara>	the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> node.		
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecPtrList">xmlSecPtrList</link> <structfield>manifestReferences</structfield></term>
+<term><link linkend="xmlSecPtrList">xmlSecPtrList</link>&#160;<structfield>manifestReferences</structfield>;</term>
 <listitem><simpara>		the list of references in <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> nodes.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate ()</title>
-<indexterm><primary>xmlSecDSigCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link> xmlSecDSigCtxCreate        (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecDSigCtxCreate" role="function">
+<title>xmlSecDSigCtxCreate ()</title>
+<indexterm zone="xmlSecDSigCtxCreate"><primary sortas="xmlSecDSigCtxCreate">xmlSecDSigCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigCtxPtr">xmlSecDSigCtxPtr</link>    xmlSecDSigCtxCreate                 (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> element processing context.
 The caller is responsible for destroying returend object by calling 
 <link linkend="xmlSecDSigCtxDestroy"><type>xmlSecDSigCtxDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated context object or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy ()</title>
-<indexterm><primary>xmlSecDSigCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigCtxDestroy            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
+<refsect2 id="xmlSecDSigCtxDestroy" role="function">
+<title>xmlSecDSigCtxDestroy ()</title>
+<indexterm zone="xmlSecDSigCtxDestroy"><primary sortas="xmlSecDSigCtxDestroy">xmlSecDSigCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDestroy                (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
 <para>
 Destroy context object created with <link linkend="xmlSecDSigCtxCreate"><type>xmlSecDSigCtxCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize ()</title>
-<indexterm><primary>xmlSecDSigCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigCtxInitialize         (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecDSigCtxInitialize" role="function">
+<title>xmlSecDSigCtxInitialize ()</title>
+<indexterm zone="xmlSecDSigCtxInitialize"><primary sortas="xmlSecDSigCtxInitialize">xmlSecDSigCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxInitialize             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> element processing context.
 The caller is responsible for cleaing up returend object by calling 
 <link linkend="xmlSecDSigCtxFinalize"><type>xmlSecDSigCtxFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize ()</title>
-<indexterm><primary>xmlSecDSigCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigCtxFinalize           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
+<refsect2 id="xmlSecDSigCtxFinalize" role="function">
+<title>xmlSecDSigCtxFinalize ()</title>
+<indexterm zone="xmlSecDSigCtxFinalize"><primary sortas="xmlSecDSigCtxFinalize">xmlSecDSigCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxFinalize               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
 <para>
 Cleans up <parameter>dsigCtx</parameter> object initialized with <link linkend="xmlSecDSigCtxInitialize"><type>xmlSecDSigCtxInitialize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxSign">xmlSecDSigCtxSign ()</title>
-<indexterm><primary>xmlSecDSigCtxSign</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigCtxSign               (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl);</programlisting>
+<refsect2 id="xmlSecDSigCtxSign" role="function">
+<title>xmlSecDSigCtxSign ()</title>
+<indexterm zone="xmlSecDSigCtxSign"><primary sortas="xmlSecDSigCtxSign">xmlSecDSigCtxSign</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxSign                   (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl);</programlisting>
 <para>
 Signs the data as described in <parameter>tmpl</parameter> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>tmpl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>tmpl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node with signature template.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify ()</title>
-<indexterm><primary>xmlSecDSigCtxVerify</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigCtxVerify             (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecDSigCtxVerify" role="function">
+<title>xmlSecDSigCtxVerify ()</title>
+<indexterm zone="xmlSecDSigCtxVerify"><primary sortas="xmlSecDSigCtxVerify">xmlSecDSigCtxVerify</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxVerify                 (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Vaidates signature in the <parameter>node</parameter>. The verification result is returned
 in <link linkend="status"><type>status</type></link> member of the <parameter>dsigCtx</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer with <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success (check <link linkend="status"><type>status</type></link> member of <parameter>dsigCtx</parameter> to get 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success (check <link linkend="status"><type>status</type></link> member of <parameter>dsigCtx</parameter> to get 
 signature verification result) or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform ()</title>
-<indexterm><primary>xmlSecDSigCtxEnableReferenceTransform</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigCtxEnableReferenceTransform
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecDSigCtxEnableReferenceTransform" role="function">
+<title>xmlSecDSigCtxEnableReferenceTransform ()</title>
+<indexterm zone="xmlSecDSigCtxEnableReferenceTransform"><primary sortas="xmlSecDSigCtxEnableReferenceTransform">xmlSecDSigCtxEnableReferenceTransform</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxEnableReferenceTransform
+                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> elements processing.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara>	the transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform ()</title>
-<indexterm><primary>xmlSecDSigCtxEnableSignatureTransform</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigCtxEnableSignatureTransform
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
+<refsect2 id="xmlSecDSigCtxEnableSignatureTransform" role="function">
+<title>xmlSecDSigCtxEnableSignatureTransform ()</title>
+<indexterm zone="xmlSecDSigCtxEnableSignatureTransform"><primary sortas="xmlSecDSigCtxEnableSignatureTransform">xmlSecDSigCtxEnableSignatureTransform</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigCtxEnableSignatureTransform
+                                                        (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecTransformId">xmlSecTransformId</link> transformId);</programlisting>
 <para>
 Enables <parameter>transformId</parameter> for <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> element processing.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transformId</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>transformId</parameter>&#160;:</term>
 <listitem><simpara>	the transform klass.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer ()</title>
-<indexterm><primary>xmlSecDSigCtxGetPreSignBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecDSigCtxGetPreSignBuffer
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
+<refsect2 id="xmlSecDSigCtxGetPreSignBuffer" role="function">
+<title>xmlSecDSigCtxGetPreSignBuffer ()</title>
+<indexterm zone="xmlSecDSigCtxGetPreSignBuffer"><primary sortas="xmlSecDSigCtxGetPreSignBuffer">xmlSecDSigCtxGetPreSignBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecDSigCtxGetPreSignBuffer       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx);</programlisting>
 <para>
 Gets pointer to the buffer with serialized <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> element
 just before signature claculation (valid if and only if 
-<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> context flag is set.</para>
+<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</type></link> context flag is set.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump ()</title>
-<indexterm><primary>xmlSecDSigCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigCtxDebugDump          (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecDSigCtxDebugDump" role="function">
+<title>xmlSecDSigCtxDebugDump ()</title>
+<indexterm zone="xmlSecDSigCtxDebugDump"><primary sortas="xmlSecDSigCtxDebugDump">xmlSecDSigCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDebugDump              (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecDSigCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigCtxDebugXmlDump       (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecDSigCtxDebugXmlDump" role="function">
+<title>xmlSecDSigCtxDebugXmlDump ()</title>
+<indexterm zone="xmlSecDSigCtxDebugXmlDump"><primary sortas="xmlSecDSigCtxDebugXmlDump">xmlSecDSigCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigCtxDebugXmlDump           (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceOrigin">enum xmlSecDSigReferenceOrigin</title>
-<indexterm><primary>xmlSecDSigReferenceOrigin</primary></indexterm><programlisting>typedef enum  {
+<refsect2 id="xmlSecDSigReferenceOrigin" role="enum">
+<title>enum xmlSecDSigReferenceOrigin</title>
+<indexterm zone="xmlSecDSigReferenceOrigin"><primary sortas="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</primary></indexterm><programlisting>typedef enum  {
     xmlSecDSigReferenceOriginSignedInfo,
     xmlSecDSigReferenceOriginManifest
 } xmlSecDSigReferenceOrigin;
@@ -534,23 +507,21 @@ Prints the debug information about <parameter>dsigCtx</parameter> to <parameter>
 The possible <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node locations: in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> 
 node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlSecDSigReferenceOriginSignedInfo" role="constant">
 <term><literal>xmlSecDSigReferenceOriginSignedInfo</literal></term>
 <listitem><simpara>reference in &lt;dsig:SignedInfo&gt; node.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecDSigReferenceOriginManifest" role="constant">
 <term><literal>xmlSecDSigReferenceOriginManifest</literal></term>
 <listitem><simpara> 	reference &lt;dsig:Manifest&gt; node.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtx">struct xmlSecDSigReferenceCtx</title>
-<indexterm><primary>xmlSecDSigReferenceCtx</primary></indexterm><programlisting>struct xmlSecDSigReferenceCtx {
-
+<refsect2 id="xmlSecDSigReferenceCtx" role="struct">
+<title>struct xmlSecDSigReferenceCtx</title>
+<indexterm zone="xmlSecDSigReferenceCtx"><primary sortas="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtx</primary></indexterm><programlisting>struct xmlSecDSigReferenceCtx {
     void*			userData;
     xmlSecDSigCtxPtr		dsigCtx;
     xmlSecDSigReferenceOrigin	origin;
@@ -572,153 +543,145 @@ node or in the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> processing context.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>userData</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
 <listitem><simpara>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> <structfield>dsigCtx</structfield></term>
+<term><link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link>&#160;<structfield>dsigCtx</structfield>;</term>
 <listitem><simpara>			the pointer to "parent" <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> processing context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> <structfield>origin</structfield></term>
+<term><link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link>&#160;<structfield>origin</structfield>;</term>
 <listitem><simpara>			the signature origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink>).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>transformCtx</structfield></term>
+<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
 <listitem><simpara>		the reference processing transforms context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>digestMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>digestMethod</structfield>;</term>
 <listitem><simpara>		the pointer to digest transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <structfield>result</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
 <listitem><simpara>			the pointer to digest result.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link> <structfield>status</structfield></term>
+<term><link linkend="xmlSecDSigStatus">xmlSecDSigStatus</link>&#160;<structfield>status</structfield>;</term>
 <listitem><simpara>			the reference processing status.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>preDigestMemBufMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>preDigestMemBufMethod</structfield>;</term>
 <listitem><simpara>	the pointer to binary buffer right before digest
 			(valid only if either
-			<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
-			<link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flags are set).
+			<link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
+			<link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flags are set).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
 <listitem><simpara>				the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node ID attribute. 
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>uri</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>uri</structfield>;</term>
 <listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node URI attribute. 
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>type</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>type</structfield>;</term>
 <listitem><simpara>			the <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node Type attribute. 
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved0</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved0</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> xmlSecDSigReferenceCtxCreate
-                                            (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxCreate" role="function">
+<title>xmlSecDSigReferenceCtxCreate ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxCreate"><primary sortas="xmlSecDSigReferenceCtxCreate">xmlSecDSigReferenceCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecDSigReferenceCtxPtr">xmlSecDSigReferenceCtxPtr</link>  xmlSecDSigReferenceCtxCreate (<link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
 <para>
 Creates new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context. Caller is responsible
 for destroying the returned context by calling <link linkend="xmlSecDSigReferenceCtxDestroy"><type>xmlSecDSigReferenceCtxDestroy</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>origin</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>origin</parameter>&#160;:</term>
 <listitem><simpara>		the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly created context or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly created context or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigReferenceCtxDestroy   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxDestroy" role="function">
+<title>xmlSecDSigReferenceCtxDestroy ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxDestroy"><primary sortas="xmlSecDSigReferenceCtxDestroy">xmlSecDSigReferenceCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDestroy       (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
 <para>
 Destroy context object created with <link linkend="xmlSecDSigReferenceCtxCreate"><type>xmlSecDSigReferenceCtxCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigReferenceCtxInitialize
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
-                                             <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxInitialize" role="function">
+<title>xmlSecDSigReferenceCtxInitialize ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxInitialize"><primary sortas="xmlSecDSigReferenceCtxInitialize">xmlSecDSigReferenceCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigReferenceCtxInitialize    (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="xmlSecDSigCtx">xmlSecDSigCtxPtr</link> dsigCtx,
+                                                         <link linkend="xmlSecDSigReferenceOrigin">xmlSecDSigReferenceOrigin</link> origin);</programlisting>
 <para>
 Initializes new <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context. Caller is responsible
 for cleaning up the returned context by calling <link linkend="xmlSecDSigReferenceCtxFinalize"><type>xmlSecDSigReferenceCtxFinalize</type></link>
 function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dsigCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to parent <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Signature";>&lt;dsig:Signature/&gt;</ulink> node processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>origin</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>origin</parameter>&#160;:</term>
 <listitem><simpara>		the reference origin (<ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo";>&lt;dsig:SignedInfo/&gt;</ulink> or <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Manifest";>&lt;dsig:Manifest/&gt;</ulink> node).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on succes or aa negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on succes or aa negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigReferenceCtxFinalize  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxFinalize" role="function">
+<title>xmlSecDSigReferenceCtxFinalize ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxFinalize"><primary sortas="xmlSecDSigReferenceCtxFinalize">xmlSecDSigReferenceCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxFinalize      (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
 <para>
 Cleans up context object created with <link linkend="xmlSecDSigReferenceCtxInitialize"><type>xmlSecDSigReferenceCtxInitialize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxProcessNode</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecDSigReferenceCtxProcessNode
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxProcessNode" role="function">
+<title>xmlSecDSigReferenceCtxProcessNode ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxProcessNode"><primary sortas="xmlSecDSigReferenceCtxProcessNode">xmlSecDSigReferenceCtxProcessNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecDSigReferenceCtxProcessNode   (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 The Reference Element (http://www.w3.org/TR/xmldsig-core/<link linkend="sec-Reference"><type>sec-Reference</type></link>)
 </para>
@@ -734,86 +697,78 @@ external data, an application may wish to signal that the referent is a
 Manifest. An optional ID attribute permits a Reference to be referenced 
 from elsewhere.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on succes or aa negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on succes or aa negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxGetPreDigestBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> xmlSecDSigReferenceCtxGetPreDigestBuffer
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxGetPreDigestBuffer" role="function">
+<title>xmlSecDSigReferenceCtxGetPreDigestBuffer ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxGetPreDigestBuffer"><primary sortas="xmlSecDSigReferenceCtxGetPreDigestBuffer">xmlSecDSigReferenceCtxGetPreDigestBuffer</primary></indexterm><programlisting><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>     xmlSecDSigReferenceCtxGetPreDigestBuffer
+                                                        (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx);</programlisting>
 <para>
 Gets the results of <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> node processing just before digesting
-(valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
-<link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flas of signature context
+(valid only if <link linkend="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</type></link> or
+<link linkend="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><type>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</type></link> flas of signature context
 is set).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the buffer or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the buffer or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigReferenceCtxDebugDump (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxDebugDump" role="function">
+<title>xmlSecDSigReferenceCtxDebugDump ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxDebugDump"><primary sortas="xmlSecDSigReferenceCtxDebugDump">xmlSecDSigReferenceCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDebugDump     (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecDSigReferenceCtxDebugXmlDump
-                                            (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxDebugXmlDump" role="function">
+<title>xmlSecDSigReferenceCtxDebugXmlDump ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxDebugXmlDump"><primary sortas="xmlSecDSigReferenceCtxDebugXmlDump">xmlSecDSigReferenceCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecDSigReferenceCtxDebugXmlDump  (<link linkend="xmlSecDSigReferenceCtx">xmlSecDSigReferenceCtxPtr</link> dsigRefCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>dsigRefCtx</parameter> to <parameter>output</parameter> in output format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dsigRefCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dsigRefCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</title>
-<indexterm><primary>xmlSecDSigReferenceCtxListId</primary></indexterm><programlisting>#define     xmlSecDSigReferenceCtxListId</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxListId" role="macro">
+<title>xmlSecDSigReferenceCtxListId</title>
+<indexterm zone="xmlSecDSigReferenceCtxListId"><primary sortas="xmlSecDSigReferenceCtxListId">xmlSecDSigReferenceCtxListId</primary></indexterm><programlisting>#define             xmlSecDSigReferenceCtxListId</programlisting>
 <para>
 The references list klass.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass ()</title>
-<indexterm><primary>xmlSecDSigReferenceCtxListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link> xmlSecDSigReferenceCtxListGetKlass
-                                            (void);</programlisting>
+<refsect2 id="xmlSecDSigReferenceCtxListGetKlass" role="function">
+<title>xmlSecDSigReferenceCtxListGetKlass ()</title>
+<indexterm zone="xmlSecDSigReferenceCtxListGetKlass"><primary sortas="xmlSecDSigReferenceCtxListGetKlass">xmlSecDSigReferenceCtxListGetKlass</primary></indexterm><programlisting><link linkend="xmlSecPtrListId">xmlSecPtrListId</link>     xmlSecDSigReferenceCtxListGetKlass  (void);</programlisting>
 <para>
 The <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing contexts list klass.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara><ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context list klass.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <ulink URL="http://www.w3.org/TR/xmldsig-core/#sec-Reference";>&lt;dsig:Reference/&gt;</ulink> element processing context list klass.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
diff --git a/docs/api/sgml/xmlenc.sgml b/docs/api/sgml/xmlenc.sgml
index 070b1a0..f5bf7b5 100644
--- a/docs/api/sgml/xmlenc.sgml
+++ b/docs/api/sgml/xmlenc.sgml
@@ -1,49 +1,48 @@
 <refentry id="xmlsec-xmlenc">
 <refmeta>
-<refentrytitle>xmlenc</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-xmlenc.top_of_page">xmlenc</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>xmlenc</refname><refpurpose>XML Encryption support.</refpurpose>
+<refname>xmlenc</refname>
+<refpurpose>XML Encryption support.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-xmlenc.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-enum        <link linkend="xmlEncCtxMode">xmlEncCtxMode</link>;
-#define     <link linkend="XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</link>
-struct      <link linkend="xmlSecEncCtx">xmlSecEncCtx</link>;
-<link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link> <link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link>          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</link>             (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</link>          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
-<link linkend="void">void</link>        <link linkend="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</link>            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</link>        (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
-                                             <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);
-<link linkend="void">void</link>        <link linkend="xmlSecEncCtxReset">xmlSecEncCtxReset</link>               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</link>       (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</link>          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</link>          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);
-<link linkend="int">int</link>         <link linkend="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</link>             (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link> <link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link> (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="void">void</link>        <link linkend="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</link>           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</link>        (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
+enum                <link linkend="xmlEncCtxMode">xmlEncCtxMode</link>;
+#define             <link linkend="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</link>
+struct              <link linkend="xmlSecEncCtx">xmlSecEncCtx</link>;
+<link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link>     <link linkend="xmlSecEncCtxCreate">xmlSecEncCtxCreate</link>                  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</link>                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);
+<link linkend="void">void</link>                <link linkend="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</link>                (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</link>            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
+                                                         <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);
+<link linkend="void">void</link>                <link linkend="xmlSecEncCtxReset">xmlSecEncCtxReset</link>                   (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</link>           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</link>              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);
+<link linkend="int">int</link>                 <link linkend="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</link>                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     <link linkend="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</link>         (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</link>               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</link>            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
 </synopsis>
 </refsynopsisdiv>
 
@@ -55,18 +54,18 @@ struct      <link linkend="xmlSecEncCtx">xmlSecEncCtx</link>;
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-xmlenc.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 XML Encryption support.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlEncCtxMode">enum xmlEncCtxMode</title>
-<indexterm><primary>xmlEncCtxMode</primary></indexterm><programlisting>typedef enum {
+<refsect1 id="xmlsec-xmlenc.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlEncCtxMode" role="enum">
+<title>enum xmlEncCtxMode</title>
+<indexterm zone="xmlEncCtxMode"><primary sortas="xmlEncCtxMode">xmlEncCtxMode</primary></indexterm><programlisting>typedef enum {
     xmlEncCtxModeEncryptedData = 0,
     xmlEncCtxModeEncryptedKey
 } xmlEncCtxMode;
@@ -74,32 +73,29 @@ XML Encryption support.
 <para>
 The <link linkend="xmlSecEncCtx"><type>xmlSecEncCtx</type></link> mode.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
+<varlistentry id="xmlEncCtxModeEncryptedData" role="constant">
 <term><literal>xmlEncCtxModeEncryptedData</literal></term>
 <listitem><simpara>	the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element procesing.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlEncCtxModeEncryptedKey" role="constant">
 <term><literal>xmlEncCtxModeEncryptedKey</literal></term>
 <listitem><simpara>	the <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> element processing.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</title>
-<indexterm><primary>XMLSEC_ENC_RETURN_REPLACED_NODE</primary></indexterm><programlisting>#define XMLSEC_ENC_RETURN_REPLACED_NODE			0x00000001
+<refsect2 id="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS" role="macro">
+<title>XMLSEC_ENC_RETURN_REPLACED_NODE</title>
+<indexterm zone="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS"><primary sortas="XMLSEC_ENC_RETURN_REPLACED_NODE">XMLSEC_ENC_RETURN_REPLACED_NODE</primary></indexterm><programlisting>#define XMLSEC_ENC_RETURN_REPLACED_NODE			0x00000001
 </programlisting>
 <para>
 If this flag is set, then the replaced node will be returned in the replacedNodeList</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtx">struct xmlSecEncCtx</title>
-<indexterm><primary>xmlSecEncCtx</primary></indexterm><programlisting>struct xmlSecEncCtx {
-
+<refsect2 id="xmlSecEncCtx" role="struct">
+<title>struct xmlSecEncCtx</title>
+<indexterm zone="xmlSecEncCtx"><primary sortas="xmlSecEncCtx">xmlSecEncCtx</primary></indexterm><programlisting>struct xmlSecEncCtx {
     /* these data user can set before performing the operation */
     void*			userData;
     unsigned int		flags;
@@ -139,375 +135,361 @@ If this flag is set, then the replaced node will be returned in the replacedNode
 <para>
 XML Encrypiton context.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>userData</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>userData</structfield>;</term>
 <listitem><simpara>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags</structfield>;</term>
 <listitem><simpara>			the XML Encryption processing flags.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>unsigned <link linkend="int">int</link> <structfield>flags2</structfield></term>
+<term>unsigned&#160;<link linkend="int">int</link>&#160;<structfield>flags2</structfield>;</term>
 <listitem><simpara>			the XML Encryption processing flags.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlEncCtxMode">xmlEncCtxMode</link> <structfield>mode</structfield></term>
+<term><link linkend="xmlEncCtxMode">xmlEncCtxMode</link>&#160;<structfield>mode</structfield>;</term>
 <listitem><simpara>			the mode.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoReadCtx</structfield></term>
+<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoReadCtx</structfield>;</term>
 <listitem><simpara>		the reading key context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link> <structfield>keyInfoWriteCtx</structfield></term>
+<term><link linkend="xmlSecKeyInfoCtx">xmlSecKeyInfoCtx</link>&#160;<structfield>keyInfoWriteCtx</structfield>;</term>
 <listitem><simpara>		the writing key context (not used for signature verification).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link> <structfield>transformCtx</structfield></term>
+<term><link linkend="xmlSecTransformCtx">xmlSecTransformCtx</link>&#160;<structfield>transformCtx</structfield>;</term>
 <listitem><simpara>		the transforms processing context.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformId">xmlSecTransformId</link> <structfield>defEncMethodId</structfield></term>
+<term><link linkend="xmlSecTransformId">xmlSecTransformId</link>&#160;<structfield>defEncMethodId</structfield>;</term>
 <listitem><simpara>		the default encryption method (used if
 			<ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node is not present).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecKey">xmlSecKeyPtr</link> <structfield>encKey</structfield></term>
+<term><link linkend="xmlSecKey">xmlSecKeyPtr</link>&#160;<structfield>encKey</structfield>;</term>
 <listitem><simpara>			the signature key; application may set <link linkend="encKey"><type>encKey</type></link>
 			before calling encryption/decryption functions.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link> <structfield>operation</structfield></term>
+<term><link linkend="xmlSecTransformOperation">xmlSecTransformOperation</link>&#160;<structfield>operation</structfield>;</term>
 <listitem><simpara>			the operation: encrypt or decrypt.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link> <structfield>result</structfield></term>
+<term><link linkend="xmlSecBuffer">xmlSecBufferPtr</link>&#160;<structfield>result</structfield>;</term>
 <listitem><simpara>			the pointer to signature (not valid for signature verificaction).
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>resultBase64Encoded</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>resultBase64Encoded</structfield>;</term>
 <listitem><simpara>	the flag: if set then result in <link linkend="result"><type>result</type></link> is base64 encoded.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>resultReplaced</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>resultReplaced</structfield>;</term>
 <listitem><simpara>		the flag: if set then resulted <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node is added to the document.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link> <structfield>encMethod</structfield></term>
+<term><link linkend="xmlSecTransform">xmlSecTransformPtr</link>&#160;<structfield>encMethod</structfield>;</term>
 <listitem><simpara>			the pointer to encryption transform.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>id</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>id</structfield>;</term>
 <listitem><simpara>				the ID attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>type</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>type</structfield>;</term>
 <listitem><simpara>			the Type attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>mimeType</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>mimeType</structfield>;</term>
 <listitem><simpara>			the MimeType attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>encoding</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>encoding</structfield>;</term>
 <listitem><simpara>			the Encoding attributeof <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node. 
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>recipient</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>recipient</structfield>;</term>
 <listitem><simpara>			the Recipient attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node..
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlChar">xmlChar</link> *<structfield>carriedKeyName</structfield></term>
+<term><link linkend="xmlChar">xmlChar</link>&#160;*<structfield>carriedKeyName</structfield>;</term>
 <listitem><simpara>		the CarriedKeyName attribute of <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>encDataNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>encDataNode</structfield>;</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink>
 			or <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey";>&lt;enc:EncryptedKey/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>encMethodNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>encMethodNode</structfield>;</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod";>&lt;enc:EncryptionMethod/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>keyInfoNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>keyInfoNode</structfield>;</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo";>&lt;enc:KeyInfo/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>cipherValueNode</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>cipherValueNode</structfield>;</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue";>&lt;enc:CipherValue/&gt;</ulink> node.
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlNode">xmlNodePtr</link> <structfield>replacedNodeList</structfield></term>
+<term><link linkend="xmlNode">xmlNodePtr</link>&#160;<structfield>replacedNodeList</structfield>;</term>
 <listitem><simpara> the first node of the list of replaced nodes depending on the nodeReplacementMode
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="void">void</link> *<structfield>reserved1</structfield></term>
+<term><link linkend="void">void</link>&#160;*<structfield>reserved1</structfield>;</term>
 <listitem><simpara>			reserved for the future.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxCreate">xmlSecEncCtxCreate ()</title>
-<indexterm><primary>xmlSecEncCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link> xmlSecEncCtxCreate          (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecEncCtxCreate" role="function">
+<title>xmlSecEncCtxCreate ()</title>
+<indexterm zone="xmlSecEncCtxCreate"><primary sortas="xmlSecEncCtxCreate">xmlSecEncCtxCreate</primary></indexterm><programlisting><link linkend="xmlSecEncCtxPtr">xmlSecEncCtxPtr</link>     xmlSecEncCtxCreate                  (<link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Creates <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element processing context.
 The caller is responsible for destroying returend object by calling 
 <link linkend="xmlSecEncCtxDestroy"><type>xmlSecEncCtxDestroy</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated context object or NULL if an error
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated context object or NULL if an error
 occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy ()</title>
-<indexterm><primary>xmlSecEncCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecEncCtxDestroy             (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
+<refsect2 id="xmlSecEncCtxDestroy" role="function">
+<title>xmlSecEncCtxDestroy ()</title>
+<indexterm zone="xmlSecEncCtxDestroy"><primary sortas="xmlSecEncCtxDestroy">xmlSecEncCtxDestroy</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDestroy                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
 <para>
 Destroy context object created with <link linkend="xmlSecEncCtxCreate"><type>xmlSecEncCtxCreate</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize ()</title>
-<indexterm><primary>xmlSecEncCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxInitialize          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
+<refsect2 id="xmlSecEncCtxInitialize" role="function">
+<title>xmlSecEncCtxInitialize ()</title>
+<indexterm zone="xmlSecEncCtxInitialize"><primary sortas="xmlSecEncCtxInitialize">xmlSecEncCtxInitialize</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxInitialize              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlSecKeysMngr">xmlSecKeysMngrPtr</link> keysMngr);</programlisting>
 <para>
 Initializes <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> element processing context.
 The caller is responsible for cleaing up returend object by calling 
 <link linkend="xmlSecEncCtxFinalize"><type>xmlSecEncCtxFinalize</type></link> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>keysMngr</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>keysMngr</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to keys manager.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize ()</title>
-<indexterm><primary>xmlSecEncCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecEncCtxFinalize            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
+<refsect2 id="xmlSecEncCtxFinalize" role="function">
+<title>xmlSecEncCtxFinalize ()</title>
+<indexterm zone="xmlSecEncCtxFinalize"><primary sortas="xmlSecEncCtxFinalize">xmlSecEncCtxFinalize</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxFinalize                (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
 <para>
 Cleans up <parameter>encCtx</parameter> object.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref ()</title>
-<indexterm><primary>xmlSecEncCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxCopyUserPref        (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
-                                             <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);</programlisting>
+<refsect2 id="xmlSecEncCtxCopyUserPref" role="function">
+<title>xmlSecEncCtxCopyUserPref ()</title>
+<indexterm zone="xmlSecEncCtxCopyUserPref"><primary sortas="xmlSecEncCtxCopyUserPref">xmlSecEncCtxCopyUserPref</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxCopyUserPref            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> dst,
+                                                         <link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> src);</programlisting>
 <para>
 Copies user preference from <parameter>src</parameter> context to <parameter>dst</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>dst</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dst</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to destination context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>src</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>src</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to source context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxReset">xmlSecEncCtxReset ()</title>
-<indexterm><primary>xmlSecEncCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecEncCtxReset               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
+<refsect2 id="xmlSecEncCtxReset" role="function">
+<title>xmlSecEncCtxReset ()</title>
+<indexterm zone="xmlSecEncCtxReset"><primary sortas="xmlSecEncCtxReset">xmlSecEncCtxReset</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxReset                   (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx);</programlisting>
 <para>
 Resets <parameter>encCtx</parameter> object, user settings are not touched.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt ()</title>
-<indexterm><primary>xmlSecEncCtxBinaryEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxBinaryEncrypt       (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *data,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
+<refsect2 id="xmlSecEncCtxBinaryEncrypt" role="function">
+<title>xmlSecEncCtxBinaryEncrypt ()</title>
+<indexterm zone="xmlSecEncCtxBinaryEncrypt"><primary sortas="xmlSecEncCtxBinaryEncrypt">xmlSecEncCtxBinaryEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxBinaryEncrypt           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *data,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> dataSize);</programlisting>
 <para>
 Encrypts <parameter>data</parameter> according to template <parameter>tmpl</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>tmpl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>tmpl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>data</parameter>&#160;:</term>
 <listitem><simpara>		the pointer for binary buffer.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>dataSize</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>dataSize</parameter>&#160;:</term>
 <listitem><simpara>		the <parameter>data</parameter> buffer size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt ()</title>
-<indexterm><primary>xmlSecEncCtxXmlEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxXmlEncrypt          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecEncCtxXmlEncrypt" role="function">
+<title>xmlSecEncCtxXmlEncrypt ()</title>
+<indexterm zone="xmlSecEncCtxXmlEncrypt"><primary sortas="xmlSecEncCtxXmlEncrypt">xmlSecEncCtxXmlEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxXmlEncrypt              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Encrypts <parameter>node</parameter> according to template <parameter>tmpl</parameter>. If requested, <parameter>node</parameter> is replaced
 with result <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>tmpl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>tmpl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to node for encryption.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt ()</title>
-<indexterm><primary>xmlSecEncCtxUriEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxUriEncrypt          (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> tmpl,
-                                             const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
+<refsect2 id="xmlSecEncCtxUriEncrypt" role="function">
+<title>xmlSecEncCtxUriEncrypt ()</title>
+<indexterm zone="xmlSecEncCtxUriEncrypt"><primary sortas="xmlSecEncCtxUriEncrypt">xmlSecEncCtxUriEncrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxUriEncrypt              (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> tmpl,
+                                                         const <link linkend="xmlChar">xmlChar</link> *uri);</programlisting>
 <para>
 Encrypts data from <parameter>uri</parameter> according to template <parameter>tmpl</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>tmpl</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>tmpl</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> template node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>uri</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>uri</parameter>&#160;:</term>
 <listitem><simpara>		the URI.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt ()</title>
-<indexterm><primary>xmlSecEncCtxDecrypt</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecEncCtxDecrypt             (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecEncCtxDecrypt" role="function">
+<title>xmlSecEncCtxDecrypt ()</title>
+<indexterm zone="xmlSecEncCtxDecrypt"><primary sortas="xmlSecEncCtxDecrypt">xmlSecEncCtxDecrypt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecEncCtxDecrypt                 (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Decrypts <parameter>node</parameter> and if necessary replaces <parameter>node</parameter> with decrypted data.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer ()</title>
-<indexterm><primary>xmlSecEncCtxDecryptToBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link> xmlSecEncCtxDecryptToBuffer (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecEncCtxDecryptToBuffer" role="function">
+<title>xmlSecEncCtxDecryptToBuffer ()</title>
+<indexterm zone="xmlSecEncCtxDecryptToBuffer"><primary sortas="xmlSecEncCtxDecryptToBuffer">xmlSecEncCtxDecryptToBuffer</primary></indexterm><programlisting><link linkend="xmlSecBufferPtr">xmlSecBufferPtr</link>     xmlSecEncCtxDecryptToBuffer         (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Decrypts <parameter>node</parameter> data to the <parameter>encCtx</parameter> buffer.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump ()</title>
-<indexterm><primary>xmlSecEncCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecEncCtxDebugDump           (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecEncCtxDebugDump" role="function">
+<title>xmlSecEncCtxDebugDump ()</title>
+<indexterm zone="xmlSecEncCtxDebugDump"><primary sortas="xmlSecEncCtxDebugDump">xmlSecEncCtxDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDebugDump               (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump ()</title>
-<indexterm><primary>xmlSecEncCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecEncCtxDebugXmlDump        (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecEncCtxDebugXmlDump" role="function">
+<title>xmlSecEncCtxDebugXmlDump ()</title>
+<indexterm zone="xmlSecEncCtxDebugXmlDump"><primary sortas="xmlSecEncCtxDebugXmlDump">xmlSecEncCtxDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecEncCtxDebugXmlDump            (<link linkend="xmlSecEncCtx">xmlSecEncCtxPtr</link> encCtx,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints the debug information about <parameter>encCtx</parameter> to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>encCtx</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>encCtx</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to <ulink URL="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData";>&lt;enc:EncryptedData/&gt;</ulink> processing context.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/sgml/xmlsec-doc.bottom b/docs/api/sgml/xmlsec-doc.bottom
index 4c452e3..0ddc3cc 100644
--- a/docs/api/sgml/xmlsec-doc.bottom
+++ b/docs/api/sgml/xmlsec-doc.bottom
@@ -1,26 +1,26 @@
-    &xmlsec-app;
-    &xmlsec-base64;
-    &xmlsec-bn;
-    &xmlsec-buffer;
-    &xmlsec-dl;
-    &xmlsec-errors;
+    &xmlsec-templates;
     &xmlsec-exports;
     &xmlsec-io;
-    &xmlsec-keyinfo;
-    &xmlsec-keysdata;
-    &xmlsec-keys;
-    &xmlsec-keysmngr;
-    &xmlsec-list;
+    &xmlsec-transforms;
+    &xmlsec-buffer;
     &xmlsec-membuf;
-    &xmlsec-nodeset;
-    &xmlsec-parser;
-    &xmlsec-private;
+    &xmlsec-dl;
     &xmlsec-soap;
-    &xmlsec-templates;
-    &xmlsec-transforms;
-    &xmlsec-version;
-    &xmlsec-x509;
-    &xmlsec-xmldsig;
     &xmlsec-xmlenc;
+    &xmlsec-xmldsig;
+    &xmlsec-keyinfo;
+    &xmlsec-x509;
+    &xmlsec-app;
+    &xmlsec-errors;
+    &xmlsec-keysmngr;
     &xmlsec-xmlsec;
     &xmlsec-xmltree;
+    &xmlsec-base64;
+    &xmlsec-keys;
+    &xmlsec-private;
+    &xmlsec-nodeset;
+    &xmlsec-keysdata;
+    &xmlsec-bn;
+    &xmlsec-list;
+    &xmlsec-version;
+    &xmlsec-parser;
diff --git a/docs/api/sgml/xmlsec-doc.top b/docs/api/sgml/xmlsec-doc.top
index 902a736..147f1f1 100644
--- a/docs/api/sgml/xmlsec-doc.top
+++ b/docs/api/sgml/xmlsec-doc.top
@@ -1,26 +1,26 @@
-<!ENTITY xmlsec-app SYSTEM "sgml/app.sgml">
-<!ENTITY xmlsec-base64 SYSTEM "sgml/base64.sgml">
-<!ENTITY xmlsec-bn SYSTEM "sgml/bn.sgml">
-<!ENTITY xmlsec-buffer SYSTEM "sgml/buffer.sgml">
-<!ENTITY xmlsec-dl SYSTEM "sgml/dl.sgml">
-<!ENTITY xmlsec-errors SYSTEM "sgml/errors.sgml">
+<!ENTITY xmlsec-templates SYSTEM "sgml/templates.sgml">
 <!ENTITY xmlsec-exports SYSTEM "sgml/exports.sgml">
 <!ENTITY xmlsec-io SYSTEM "sgml/io.sgml">
-<!ENTITY xmlsec-keyinfo SYSTEM "sgml/keyinfo.sgml">
-<!ENTITY xmlsec-keysdata SYSTEM "sgml/keysdata.sgml">
-<!ENTITY xmlsec-keys SYSTEM "sgml/keys.sgml">
-<!ENTITY xmlsec-keysmngr SYSTEM "sgml/keysmngr.sgml">
-<!ENTITY xmlsec-list SYSTEM "sgml/list.sgml">
+<!ENTITY xmlsec-transforms SYSTEM "sgml/transforms.sgml">
+<!ENTITY xmlsec-buffer SYSTEM "sgml/buffer.sgml">
 <!ENTITY xmlsec-membuf SYSTEM "sgml/membuf.sgml">
-<!ENTITY xmlsec-nodeset SYSTEM "sgml/nodeset.sgml">
-<!ENTITY xmlsec-parser SYSTEM "sgml/parser.sgml">
-<!ENTITY xmlsec-private SYSTEM "sgml/private.sgml">
+<!ENTITY xmlsec-dl SYSTEM "sgml/dl.sgml">
 <!ENTITY xmlsec-soap SYSTEM "sgml/soap.sgml">
-<!ENTITY xmlsec-templates SYSTEM "sgml/templates.sgml">
-<!ENTITY xmlsec-transforms SYSTEM "sgml/transforms.sgml">
-<!ENTITY xmlsec-version SYSTEM "sgml/version.sgml">
-<!ENTITY xmlsec-x509 SYSTEM "sgml/x509.sgml">
-<!ENTITY xmlsec-xmldsig SYSTEM "sgml/xmldsig.sgml">
 <!ENTITY xmlsec-xmlenc SYSTEM "sgml/xmlenc.sgml">
+<!ENTITY xmlsec-xmldsig SYSTEM "sgml/xmldsig.sgml">
+<!ENTITY xmlsec-keyinfo SYSTEM "sgml/keyinfo.sgml">
+<!ENTITY xmlsec-x509 SYSTEM "sgml/x509.sgml">
+<!ENTITY xmlsec-app SYSTEM "sgml/app.sgml">
+<!ENTITY xmlsec-errors SYSTEM "sgml/errors.sgml">
+<!ENTITY xmlsec-keysmngr SYSTEM "sgml/keysmngr.sgml">
 <!ENTITY xmlsec-xmlsec SYSTEM "sgml/xmlsec.sgml">
 <!ENTITY xmlsec-xmltree SYSTEM "sgml/xmltree.sgml">
+<!ENTITY xmlsec-base64 SYSTEM "sgml/base64.sgml">
+<!ENTITY xmlsec-keys SYSTEM "sgml/keys.sgml">
+<!ENTITY xmlsec-private SYSTEM "sgml/private.sgml">
+<!ENTITY xmlsec-nodeset SYSTEM "sgml/nodeset.sgml">
+<!ENTITY xmlsec-keysdata SYSTEM "sgml/keysdata.sgml">
+<!ENTITY xmlsec-bn SYSTEM "sgml/bn.sgml">
+<!ENTITY xmlsec-list SYSTEM "sgml/list.sgml">
+<!ENTITY xmlsec-version SYSTEM "sgml/version.sgml">
+<!ENTITY xmlsec-parser SYSTEM "sgml/parser.sgml">
diff --git a/docs/api/sgml/xmlsec.sgml b/docs/api/sgml/xmlsec.sgml
index 0a61b92..a99c83f 100644
--- a/docs/api/sgml/xmlsec.sgml
+++ b/docs/api/sgml/xmlsec.sgml
@@ -1,33 +1,32 @@
 <refentry id="xmlsec-xmlsec">
 <refmeta>
-<refentrytitle>xmlsec</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-xmlsec.top_of_page">xmlsec</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>xmlsec</refname><refpurpose>Utility functions.</refpurpose>
+<refname>xmlsec</refname>
+<refpurpose>Utility functions.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-xmlsec.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-typedef     <link linkend="xmlSec">xmlSecPtr</link>;
-#define     <link linkend="xmlSecSize">xmlSecSize</link>
-#define     <link linkend="xmlSecByte">xmlSecByte</link>
-<link linkend="int">int</link>         <link linkend="xmlSecInit">xmlSecInit</link>                      (void);
-<link linkend="int">int</link>         <link linkend="xmlSecShutdown">xmlSecShutdown</link>                  (void);
-#define     <link linkend="xmlSecCheckVersionExact">xmlSecCheckVersionExact</link>         ()
-#define     <link linkend="xmlSecCheckVersion">xmlSecCheckVersion</link>              ()
-enum        <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link>;
-<link linkend="int">int</link>         <link linkend="xmlSecCheckVersionExt">xmlSecCheckVersionExt</link>           (<link linkend="int">int</link> major,
-                                             <link linkend="int">int</link> minor,
-                                             <link linkend="int">int</link> subminor,
-                                             <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);
-#define     <link linkend="ATTRIBUTE-UNUSED-CAPS">ATTRIBUTE_UNUSED</link>
+typedef             <link linkend="xmlSec">xmlSecPtr</link>;
+#define             <link linkend="xmlSecSize">xmlSecSize</link>
+#define             <link linkend="xmlSecByte">xmlSecByte</link>
+<link linkend="int">int</link>                 <link linkend="xmlSecInit">xmlSecInit</link>                          (void);
+<link linkend="int">int</link>                 <link linkend="xmlSecShutdown">xmlSecShutdown</link>                      (void);
+#define             <link linkend="xmlSecCheckVersionExact">xmlSecCheckVersionExact</link>             ()
+#define             <link linkend="xmlSecCheckVersion">xmlSecCheckVersion</link>                  ()
+enum                <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link>;
+<link linkend="int">int</link>                 <link linkend="xmlSecCheckVersionExt">xmlSecCheckVersionExt</link>               (<link linkend="int">int</link> major,
+                                                         <link linkend="int">int</link> minor,
+                                                         <link linkend="int">int</link> subminor,
+                                                         <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);
+#define             <link linkend="ATTRIBUTE-UNUSED--CAPS">ATTRIBUTE_UNUSED</link>
 </synopsis>
 </refsynopsisdiv>
 
@@ -39,143 +38,133 @@ enum        <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link>
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-xmlsec.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 Utility functions.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecPtr">xmlSecPtr</title>
-<indexterm><primary>xmlSecPtr</primary></indexterm><programlisting>typedef void*					xmlSecPtr;
+<refsect1 id="xmlsec-xmlsec.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecPtr" role="typedef">
+<title>xmlSecPtr</title>
+<indexterm zone="xmlSecPtr"><primary sortas="xmlSecPtr">xmlSecPtr</primary></indexterm><programlisting>typedef void*					xmlSecPtr;
 </programlisting>
 <para>
 Void pointer.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecSize">xmlSecSize</title>
-<indexterm><primary>xmlSecSize</primary></indexterm><programlisting>#define     xmlSecSize</programlisting>
+<refsect2 id="xmlSecSize" role="macro">
+<title>xmlSecSize</title>
+<indexterm zone="xmlSecSize"><primary sortas="xmlSecSize">xmlSecSize</primary></indexterm><programlisting>#define             xmlSecSize</programlisting>
 <para>
 Size of something. Should be typedef instead of define
 but it will break ABI (todo).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecByte">xmlSecByte</title>
-<indexterm><primary>xmlSecByte</primary></indexterm><programlisting>#define xmlSecByte				unsigned char
+<refsect2 id="xmlSecByte" role="macro">
+<title>xmlSecByte</title>
+<indexterm zone="xmlSecByte"><primary sortas="xmlSecByte">xmlSecByte</primary></indexterm><programlisting>#define xmlSecByte				unsigned char
 </programlisting>
 <para>
 One byte. Should be typedef instead of define
 but it will break ABI (todo).</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecInit">xmlSecInit ()</title>
-<indexterm><primary>xmlSecInit</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecInit                      (void);</programlisting>
+<refsect2 id="xmlSecInit" role="function">
+<title>xmlSecInit ()</title>
+<indexterm zone="xmlSecInit"><primary sortas="xmlSecInit">xmlSecInit</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecInit                          (void);</programlisting>
 <para>
 Initializes XML Security Library. The depended libraries
 (LibXML and LibXSLT) must be initialized before.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecShutdown">xmlSecShutdown ()</title>
-<indexterm><primary>xmlSecShutdown</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecShutdown                  (void);</programlisting>
+<refsect2 id="xmlSecShutdown" role="function">
+<title>xmlSecShutdown ()</title>
+<indexterm zone="xmlSecShutdown"><primary sortas="xmlSecShutdown">xmlSecShutdown</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecShutdown                      (void);</programlisting>
 <para>
 Clean ups the XML Security Library.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCheckVersionExact">xmlSecCheckVersionExact()</title>
-<indexterm><primary>xmlSecCheckVersionExact</primary></indexterm><programlisting>#define     xmlSecCheckVersionExact()</programlisting>
+<refsect2 id="xmlSecCheckVersionExact" role="macro">
+<title>xmlSecCheckVersionExact()</title>
+<indexterm zone="xmlSecCheckVersionExact"><primary sortas="xmlSecCheckVersionExact">xmlSecCheckVersionExact</primary></indexterm><programlisting>#define             xmlSecCheckVersionExact()</programlisting>
 <para>
 Macro. Returns 1 if the loaded xmlsec library version exactly matches 
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCheckVersion">xmlSecCheckVersion()</title>
-<indexterm><primary>xmlSecCheckVersion</primary></indexterm><programlisting>#define     xmlSecCheckVersion()</programlisting>
+<refsect2 id="xmlSecCheckVersion" role="macro">
+<title>xmlSecCheckVersion()</title>
+<indexterm zone="xmlSecCheckVersion"><primary sortas="xmlSecCheckVersion">xmlSecCheckVersion</primary></indexterm><programlisting>#define             xmlSecCheckVersion()</programlisting>
 <para>
 Macro. Returns 1 if the loaded xmlsec library version ABI compatible with
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCheckVersionMode">enum xmlSecCheckVersionMode</title>
-<indexterm><primary>xmlSecCheckVersionMode</primary></indexterm><programlisting>typedef enum {
-    xmlSecCheckVersionExact = 0,
+<refsect2 id="xmlSecCheckVersionMode" role="enum">
+<title>enum xmlSecCheckVersionMode</title>
+<indexterm zone="xmlSecCheckVersionMode"><primary sortas="xmlSecCheckVersionMode">xmlSecCheckVersionMode</primary></indexterm><programlisting>typedef enum {
+    xmlSecCheckVersionExactMatch = 0,
     xmlSecCheckVersionABICompatible
 } xmlSecCheckVersionMode;
 </programlisting>
 <para>
 The xmlsec library version mode.</para>
 <para>
-
 </para><variablelist role="enum">
-<varlistentry>
-<term><literal>xmlSecCheckVersionExact</literal></term>
-<listitem><simpara>		the version should match exactly.
+<varlistentry id="xmlSecCheckVersionExactMatch" role="constant">
+<term><literal>xmlSecCheckVersionExactMatch</literal></term>
+<listitem><simpara>	the version should match exactly.
 </simpara></listitem>
 </varlistentry>
-<varlistentry>
+<varlistentry id="xmlSecCheckVersionABICompatible" role="constant">
 <term><literal>xmlSecCheckVersionABICompatible</literal></term>
 <listitem><simpara>	the version should be ABI compatible.
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCheckVersionExt">xmlSecCheckVersionExt ()</title>
-<indexterm><primary>xmlSecCheckVersionExt</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCheckVersionExt           (<link linkend="int">int</link> major,
-                                             <link linkend="int">int</link> minor,
-                                             <link linkend="int">int</link> subminor,
-                                             <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);</programlisting>
+<refsect2 id="xmlSecCheckVersionExt" role="function">
+<title>xmlSecCheckVersionExt ()</title>
+<indexterm zone="xmlSecCheckVersionExt"><primary sortas="xmlSecCheckVersionExt">xmlSecCheckVersionExt</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCheckVersionExt               (<link linkend="int">int</link> major,
+                                                         <link linkend="int">int</link> minor,
+                                                         <link linkend="int">int</link> subminor,
+                                                         <link linkend="xmlSecCheckVersionMode">xmlSecCheckVersionMode</link> mode);</programlisting>
 <para>
 Checks if the loaded version of xmlsec library could be used.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>major</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>major</parameter>&#160;:</term>
 <listitem><simpara>		the major version number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>minor</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>minor</parameter>&#160;:</term>
 <listitem><simpara>		the minor version number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>subminor</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>subminor</parameter>&#160;:</term>
 <listitem><simpara>		the subminor version number.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mode</parameter>&#160;:</term>
 <listitem><simpara>		the version check mode.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if the loaded xmlsec library version is OK to use
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the loaded xmlsec library version is OK to use
 0 if it is not or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="ATTRIBUTE-UNUSED-CAPS">ATTRIBUTE_UNUSED</title>
-<indexterm><primary>ATTRIBUTE_UNUSED</primary></indexterm><programlisting>#define     ATTRIBUTE_UNUSED</programlisting>
+<refsect2 id="ATTRIBUTE-UNUSED--CAPS" role="macro">
+<title>ATTRIBUTE_UNUSED</title>
+<indexterm zone="ATTRIBUTE-UNUSED--CAPS"><primary sortas="ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</primary></indexterm><programlisting>#define             ATTRIBUTE_UNUSED</programlisting>
 <para>
 Macro used to signal to GCC unused function parameters</para>
 <para>
-
 </para></refsect2>
 
 </refsect1>
diff --git a/docs/api/sgml/xmltree.sgml b/docs/api/sgml/xmltree.sgml
index 5709753..376f50a 100644
--- a/docs/api/sgml/xmltree.sgml
+++ b/docs/api/sgml/xmltree.sgml
@@ -1,166 +1,164 @@
 <refentry id="xmlsec-xmltree">
 <refmeta>
-<refentrytitle>xmltree</refentrytitle>
+<refentrytitle role="top_of_page" id="xmlsec-xmltree.top_of_page">xmltree</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>XMLSEC Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>xmltree</refname><refpurpose>XML tree operations.</refpurpose>
+<refname>xmltree</refname>
+<refpurpose>XML tree operations.</refpurpose>
 </refnamediv>
 
-<refsynopsisdiv><title>Synopsis</title>
+<refsynopsisdiv id="xmlsec-xmltree.synopsis" role="synopsis">
+<title role="synopsis.title">Synopsis</title>
 
 <synopsis>
-
-
-
-#define     <link linkend="xmlSecNodeGetName">xmlSecNodeGetName</link>               (node)
-const <link linkend="xmlChar">xmlChar</link>* <link linkend="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</link>          (const <link linkend="xmlNode">xmlNodePtr</link> cur);
-<link linkend="int">int</link>         <link linkend="xmlSecCheckNodeName">xmlSecCheckNodeName</link>             (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link>        (<link linkend="xmlNode">xmlNodePtr</link> cur);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecFindChild">xmlSecFindChild</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecFindParent">xmlSecFindParent</link>                (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecFindNode">xmlSecFindNode</link>                  (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecAddChild">xmlSecAddChild</link>                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>              (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="xmlNode">xmlNodePtr</link> child);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link>            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="xmlNodePtr">xmlNodePtr</link>  <link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link>            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceNode">xmlSecReplaceNode</link>               (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</link>      (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceContent">xmlSecReplaceContent</link>            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</link>   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</link>         (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);
-<link linkend="int">int</link>         <link linkend="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</link>
-                                            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);
-<link linkend="int">int</link>         <link linkend="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</link>   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *buffer);
-<link linkend="void">void</link>        <link linkend="xmlSecAddIDs">xmlSecAddIDs</link>                    (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> **ids);
-<link linkend="int">int</link>         <link linkend="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link>          (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecGenerateID">xmlSecGenerateID</link>                (const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);
-<link linkend="xmlDoc">xmlDocPtr</link>   <link linkend="xmlSecCreateTree">xmlSecCreateTree</link>                (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);
-<link linkend="int">int</link>         <link linkend="xmlSecIsEmptyNode">xmlSecIsEmptyNode</link>               (<link linkend="xmlNode">xmlNodePtr</link> node);
-<link linkend="int">int</link>         <link linkend="xmlSecIsEmptyString">xmlSecIsEmptyString</link>             (const <link linkend="xmlChar">xmlChar</link> *str);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecGetQName">xmlSecGetQName</link>                  (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             const <link linkend="xmlChar">xmlChar</link> *local);
-#define     <link linkend="xmlSecIsHex">xmlSecIsHex</link>                     (c)
-#define     <link linkend="xmlSecGetHex">xmlSecGetHex</link>                    (c)
-typedef     <link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>;
-struct      <link linkend="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</link>;
-<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> <link linkend="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</link>
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</link>   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                             <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</link>
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *qname,
-                                             <link linkend="int">int</link> *intValue);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</link>
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</link>     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</link>    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="int">int</link> intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</link>
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             <link linkend="int">int</link> *intValue);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</link>
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             <link linkend="int">int</link> intValue);
-<link linkend="void">void</link>        <link linkend="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</link>    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</link> (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-typedef     <link linkend="xmlSecBitMask">xmlSecBitMask</link>;
-typedef     <link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>;
-struct      <link linkend="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</link>;
-<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> <link linkend="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</link>
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</link>   (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</link>    (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="int">int</link> stopOnUnknown,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link>
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *qname,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
-<link linkend="xmlChar">xmlChar</link>*    <link linkend="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</link>
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="int">int</link>         <link linkend="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</link>   (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
-<link linkend="void">void</link>        <link linkend="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link>    (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
-<link linkend="void">void</link>        <link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link> (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);
+#define             <link linkend="xmlSecNodeGetName">xmlSecNodeGetName</link>                   (node)
+const <link linkend="xmlChar">xmlChar</link>*      <link linkend="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> cur);
+<link linkend="int">int</link>                 <link linkend="xmlSecCheckNodeName">xmlSecCheckNodeName</link>                 (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecGetNextElementNode">xmlSecGetNextElementNode</link>            (<link linkend="xmlNode">xmlNodePtr</link> cur);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindChild">xmlSecFindChild</link>                     (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindParent">xmlSecFindParent</link>                    (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecFindNode">xmlSecFindNode</link>                      (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddChild">xmlSecAddChild</link>                      (<link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddChildNode">xmlSecAddChildNode</link>                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> child);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddNextSibling">xmlSecAddNextSibling</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="xmlNodePtr">xmlNodePtr</link>          <link linkend="xmlSecAddPrevSibling">xmlSecAddPrevSibling</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNode">xmlSecReplaceNode</link>                   (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</link>          (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceContent">xmlSecReplaceContent</link>                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</link>       (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</link>             (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);
+<link linkend="int">int</link>                 <link linkend="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</link>    (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);
+<link linkend="int">int</link>                 <link linkend="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</link>       (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *buffer);
+<link linkend="void">void</link>                <link linkend="xmlSecAddIDs">xmlSecAddIDs</link>                        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> **ids);
+<link linkend="int">int</link>                 <link linkend="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</link>              (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecGenerateID">xmlSecGenerateID</link>                    (const <link linkend="xmlChar">xmlChar</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);
+<link linkend="xmlDoc">xmlDocPtr</link>           <link linkend="xmlSecCreateTree">xmlSecCreateTree</link>                    (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);
+<link linkend="int">int</link>                 <link linkend="xmlSecIsEmptyNode">xmlSecIsEmptyNode</link>                   (<link linkend="xmlNode">xmlNodePtr</link> node);
+<link linkend="int">int</link>                 <link linkend="xmlSecIsEmptyString">xmlSecIsEmptyString</link>                 (const <link linkend="xmlChar">xmlChar</link> *str);
+<link linkend="xmlChar">xmlChar</link>*            <link linkend="xmlSecGetQName">xmlSecGetQName</link>                      (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         const <link linkend="xmlChar">xmlChar</link> *local);
+<link linkend="int">int</link>                 <link linkend="xmlSecPrintXmlString">xmlSecPrintXmlString</link>                (<link linkend="FILE--CAPS">FILE</link> *fd,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);
+#define             <link linkend="xmlSecIsHex">xmlSecIsHex</link>                         (c)
+#define             <link linkend="xmlSecGetHex">xmlSecGetHex</link>                        (c)
+struct              <link linkend="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</link>;
+typedef             <link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>;
+<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>  <link linkend="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</link>
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</link>       (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
+                                                         <link linkend="int">int</link> *intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</link>
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
+                                                         <link linkend="int">int</link> *intValue);
+<link linkend="xmlChar">xmlChar</link> *           <link linkend="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</link>
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</link>         (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> *intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</link>        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="int">int</link> intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</link>    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         <link linkend="int">int</link> *intValue);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</link>   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         <link linkend="int">int</link> intValue);
+<link linkend="void">void</link>                <link linkend="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</link>        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</link>     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+typedef             <link linkend="xmlSecBitMask">xmlSecBitMask</link>;
+struct              <link linkend="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</link>;
+typedef             <link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>;
+<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>  <link linkend="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</link>
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</link>       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</link>        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="int">int</link> stopOnUnknown,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</link>
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);
+<link linkend="xmlChar">xmlChar</link> *           <link linkend="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</link>
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
+<link linkend="int">int</link>                 <link linkend="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</link>       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);
+<link linkend="void">void</link>                <link linkend="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</link>        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
+<link linkend="void">void</link>                <link linkend="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</link>     (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);
 </synopsis>
 </refsynopsisdiv>
 
@@ -172,554 +170,533 @@ struct      <link linkend="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</lin
 
 
 
-<refsect1>
-<title>Description</title>
+<refsect1 id="xmlsec-xmltree.description" role="desc">
+<title role="desc.title">Description</title>
 <para>
 XML tree operations.
 </para>
 </refsect1>
 
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="xmlSecNodeGetName">xmlSecNodeGetName()</title>
-<indexterm><primary>xmlSecNodeGetName</primary></indexterm><programlisting>#define     xmlSecNodeGetName(node)</programlisting>
+<refsect1 id="xmlsec-xmltree.details" role="details">
+<title role="details.title">Details</title>
+<refsect2 id="xmlSecNodeGetName" role="macro">
+<title>xmlSecNodeGetName()</title>
+<indexterm zone="xmlSecNodeGetName"><primary sortas="xmlSecNodeGetName">xmlSecNodeGetName</primary></indexterm><programlisting>#define             xmlSecNodeGetName(node)</programlisting>
 <para>
 Macro. Returns node's name.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to node.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref ()</title>
-<indexterm><primary>xmlSecGetNodeNsHref</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>* xmlSecGetNodeNsHref          (const <link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
+<refsect2 id="xmlSecGetNodeNsHref" role="function">
+<title>xmlSecGetNodeNsHref ()</title>
+<indexterm zone="xmlSecGetNodeNsHref"><primary sortas="xmlSecGetNodeNsHref">xmlSecGetNodeNsHref</primary></indexterm><programlisting>const <link linkend="xmlChar">xmlChar</link>*      xmlSecGetNodeNsHref                 (const <link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
 <para>
 Get's node's namespace href.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara>		the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>node's namespace href.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> node's namespace href.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCheckNodeName">xmlSecCheckNodeName ()</title>
-<indexterm><primary>xmlSecCheckNodeName</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecCheckNodeName             (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecCheckNodeName" role="function">
+<title>xmlSecCheckNodeName ()</title>
+<indexterm zone="xmlSecCheckNodeName"><primary sortas="xmlSecCheckNodeName">xmlSecCheckNodeName</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecCheckNodeName                 (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Checks that the node has a given name and a given namespace href.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the name,
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the namespace href.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if the node matches or 0 otherwise.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if the node matches or 0 otherwise.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGetNextElementNode">xmlSecGetNextElementNode ()</title>
-<indexterm><primary>xmlSecGetNextElementNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecGetNextElementNode        (<link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
+<refsect2 id="xmlSecGetNextElementNode" role="function">
+<title>xmlSecGetNextElementNode ()</title>
+<indexterm zone="xmlSecGetNextElementNode"><primary sortas="xmlSecGetNextElementNode">xmlSecGetNextElementNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecGetNextElementNode            (<link linkend="xmlNode">xmlNodePtr</link> cur);</programlisting>
 <para>
 Seraches for the next element node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to next element node or NULL if it is not found.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to next element node or NULL if it is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecFindChild">xmlSecFindChild ()</title>
-<indexterm><primary>xmlSecFindChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecFindChild                 (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecFindChild" role="function">
+<title>xmlSecFindChild ()</title>
+<indexterm zone="xmlSecFindChild"><primary sortas="xmlSecFindChild">xmlSecFindChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindChild                     (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Searches a direct child of the <parameter>parent</parameter> node having given name and 
 namespace href.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the found node or NULL if an error occurs or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or 
 node is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecFindParent">xmlSecFindParent ()</title>
-<indexterm><primary>xmlSecFindParent</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecFindParent                (const <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecFindParent" role="function">
+<title>xmlSecFindParent ()</title>
+<indexterm zone="xmlSecFindParent"><primary sortas="xmlSecFindParent">xmlSecFindParent</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindParent                    (const <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Searches the ancestors axis of the <parameter>cur</parameter> node for a node having given name 
 and namespace href.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the found node or NULL if an error occurs or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or 
 node is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecFindNode">xmlSecFindNode ()</title>
-<indexterm><primary>xmlSecFindNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecFindNode                  (const <link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecFindNode" role="function">
+<title>xmlSecFindNode ()</title>
+<indexterm zone="xmlSecFindNode"><primary sortas="xmlSecFindNode">xmlSecFindNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecFindNode                      (const <link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Searches all children of the <parameter>parent</parameter> node having given name and 
 namespace href.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the namespace href (may be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the pointer to the found node or NULL if an error occurs or 
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the pointer to the found node or NULL if an error occurs or 
 node is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAddChild">xmlSecAddChild ()</title>
-<indexterm><primary>xmlSecAddChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecAddChild                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecAddChild" role="function">
+<title>xmlSecAddChild ()</title>
+<indexterm zone="xmlSecAddChild"><primary sortas="xmlSecAddChild">xmlSecAddChild</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddChild                      (<link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Adds a child to the node <parameter>parent</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the new node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the new node namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the new node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAddChildNode">xmlSecAddChildNode ()</title>
-<indexterm><primary>xmlSecAddChildNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecAddChildNode              (<link linkend="xmlNode">xmlNodePtr</link> parent,
-                                             <link linkend="xmlNode">xmlNodePtr</link> child);</programlisting>
+<refsect2 id="xmlSecAddChildNode" role="function">
+<title>xmlSecAddChildNode ()</title>
+<indexterm zone="xmlSecAddChildNode"><primary sortas="xmlSecAddChildNode">xmlSecAddChildNode</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddChildNode                  (<link linkend="xmlNode">xmlNodePtr</link> parent,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> child);</programlisting>
 <para>
 Adds <parameter>child</parameter> node to the <parameter>parent</parameter> node.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>parent</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>parent</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>child</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>child</parameter>&#160;:</term>
 <listitem><simpara> 		the new node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the new node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAddNextSibling">xmlSecAddNextSibling ()</title>
-<indexterm><primary>xmlSecAddNextSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecAddNextSibling            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecAddNextSibling" role="function">
+<title>xmlSecAddNextSibling ()</title>
+<indexterm zone="xmlSecAddNextSibling"><primary sortas="xmlSecAddNextSibling">xmlSecAddNextSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddNextSibling                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Adds next sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the new node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the new node namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the new node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAddPrevSibling">xmlSecAddPrevSibling ()</title>
-<indexterm><primary>xmlSecAddPrevSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>  xmlSecAddPrevSibling            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
+<refsect2 id="xmlSecAddPrevSibling" role="function">
+<title>xmlSecAddPrevSibling ()</title>
+<indexterm zone="xmlSecAddPrevSibling"><primary sortas="xmlSecAddPrevSibling">xmlSecAddPrevSibling</primary></indexterm><programlisting><link linkend="xmlNodePtr">xmlNodePtr</link>          xmlSecAddPrevSibling                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         const <link linkend="xmlChar">xmlChar</link> *ns);</programlisting>
 <para>
 Adds prev sibling to the node <parameter>node</parameter> with given <parameter>name</parameter> and namespace <parameter>ns</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the new node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ns</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ns</parameter>&#160;:</term>
 <listitem><simpara> 		the new node namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the new node or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the new node or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceNode">xmlSecReplaceNode ()</title>
-<indexterm><primary>xmlSecReplaceNode</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceNode               (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
+<refsect2 id="xmlSecReplaceNode" role="function">
+<title>xmlSecReplaceNode ()</title>
+<indexterm zone="xmlSecReplaceNode"><primary sortas="xmlSecReplaceNode">xmlSecReplaceNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNode                   (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
 <para>
 Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNode</parameter>&#160;:</term>
 <listitem><simpara> 		the new node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn ()</title>
-<indexterm><primary>xmlSecReplaceNodeAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceNodeAndReturn      (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
+<refsect2 id="xmlSecReplaceNodeAndReturn" role="function">
+<title>xmlSecReplaceNodeAndReturn ()</title>
+<indexterm zone="xmlSecReplaceNodeAndReturn"><primary sortas="xmlSecReplaceNodeAndReturn">xmlSecReplaceNodeAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeAndReturn          (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
 <para>
 Swaps the <parameter>node</parameter> and <parameter>newNode</parameter> in the XML tree.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNode</parameter>&#160;:</term>
 <listitem><simpara> 		the new node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>replaced</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>replaced</parameter>&#160;:</term>
 <listitem><simpara>   	the replaced node, or release it if NULL is given
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceContent">xmlSecReplaceContent ()</title>
-<indexterm><primary>xmlSecReplaceContent</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceContent            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
+<refsect2 id="xmlSecReplaceContent" role="function">
+<title>xmlSecReplaceContent ()</title>
+<indexterm zone="xmlSecReplaceContent"><primary sortas="xmlSecReplaceContent">xmlSecReplaceContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceContent                (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode);</programlisting>
 <para>
 Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNode</parameter>&#160;:</term>
 <listitem><simpara> 		the new node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn ()</title>
-<indexterm><primary>xmlSecReplaceContentAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceContentAndReturn   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlNode">xmlNodePtr</link> newNode,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
+<refsect2 id="xmlSecReplaceContentAndReturn" role="function">
+<title>xmlSecReplaceContentAndReturn ()</title>
+<indexterm zone="xmlSecReplaceContentAndReturn"><primary sortas="xmlSecReplaceContentAndReturn">xmlSecReplaceContentAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceContentAndReturn       (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> newNode,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
 <para>
 Swaps the content of <parameter>node</parameter> and <parameter>newNode</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>newNode</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>newNode</parameter>&#160;:</term>
 <listitem><simpara> 		the new node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>replaced</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>replaced</parameter>&#160;:</term>
 <listitem><simpara>   	the replaced nodes, or release them if NULL is given
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer ()</title>
-<indexterm><primary>xmlSecReplaceNodeBuffer</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceNodeBuffer         (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
+<refsect2 id="xmlSecReplaceNodeBuffer" role="function">
+<title>xmlSecReplaceNodeBuffer ()</title>
+<indexterm zone="xmlSecReplaceNodeBuffer"><primary sortas="xmlSecReplaceNodeBuffer">xmlSecReplaceNodeBuffer</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeBuffer             (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size);</programlisting>
 <para>
 Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara> 		the XML data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the XML data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn ()</title>
-<indexterm><primary>xmlSecReplaceNodeBufferAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecReplaceNodeBufferAndReturn
-                                            (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> size,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
+<refsect2 id="xmlSecReplaceNodeBufferAndReturn" role="function">
+<title>xmlSecReplaceNodeBufferAndReturn ()</title>
+<indexterm zone="xmlSecReplaceNodeBufferAndReturn"><primary sortas="xmlSecReplaceNodeBufferAndReturn">xmlSecReplaceNodeBufferAndReturn</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecReplaceNodeBufferAndReturn    (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlSecByte">xmlSecByte</link> *buffer,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> size,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *replaced);</programlisting>
 <para>
 Swaps the <parameter>node</parameter> and the parsed XML data from the <parameter>buffer</parameter> in the XML tree.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		the current node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara> 		the XML data.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>size</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>size</parameter>&#160;:</term>
 <listitem><simpara> 		the XML data size.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>replaced</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>replaced</parameter>&#160;:</term>
 <listitem><simpara> 		the replaced nodes, or release them if NULL is given
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent ()</title>
-<indexterm><primary>xmlSecNodeEncodeAndSetContent</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecNodeEncodeAndSetContent   (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *buffer);</programlisting>
+<refsect2 id="xmlSecNodeEncodeAndSetContent" role="function">
+<title>xmlSecNodeEncodeAndSetContent ()</title>
+<indexterm zone="xmlSecNodeEncodeAndSetContent"><primary sortas="xmlSecNodeEncodeAndSetContent">xmlSecNodeEncodeAndSetContent</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecNodeEncodeAndSetContent       (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *buffer);</programlisting>
 <para>
 Encodes "special" characters in the <parameter>buffer</parameter> and sets the result
 as the node content.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara> 		    the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>buffer</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>buffer</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to the node content.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecAddIDs">xmlSecAddIDs ()</title>
-<indexterm><primary>xmlSecAddIDs</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecAddIDs                    (<link linkend="xmlDoc">xmlDocPtr</link> doc,
-                                             <link linkend="xmlNode">xmlNodePtr</link> cur,
-                                             const <link linkend="xmlChar">xmlChar</link> **ids);</programlisting>
+<refsect2 id="xmlSecAddIDs" role="function">
+<title>xmlSecAddIDs ()</title>
+<indexterm zone="xmlSecAddIDs"><primary sortas="xmlSecAddIDs">xmlSecAddIDs</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecAddIDs                        (<link linkend="xmlDoc">xmlDocPtr</link> doc,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> cur,
+                                                         const <link linkend="xmlChar">xmlChar</link> **ids);</programlisting>
 <para>
 Walks thru all children of the <parameter>cur</parameter> node and adds all attributes 
 from the <parameter>ids</parameter> list to the <parameter>doc</parameter> document IDs attributes hash.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>doc</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>doc</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML document.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cur</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>cur</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to an XML node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>ids</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>ids</parameter>&#160;:</term>
 <listitem><simpara> 		the pointer to a NULL terminated list of ID attributes.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID ()</title>
-<indexterm><primary>xmlSecGenerateAndAddID</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecGenerateAndAddID          (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<refsect2 id="xmlSecGenerateAndAddID" role="function">
+<title>xmlSecGenerateAndAddID ()</title>
+<indexterm zone="xmlSecGenerateAndAddID"><primary sortas="xmlSecGenerateAndAddID">xmlSecGenerateAndAddID</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecGenerateAndAddID              (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
 <para>
 Generates a unique ID in the format &lt;<parameter>prefix</parameter>&gt;base64-encoded(<parameter>len</parameter> random bytes)
 and puts it in the attribute <parameter>attrName</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>			the node to ID attr to.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>attrName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>attrName</parameter>&#160;:</term>
 <listitem><simpara>			the ID attr name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>prefix</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>prefix</parameter>&#160;:</term>
 <listitem><simpara>			the prefix to add to the generated ID (can be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>len</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>len</parameter>&#160;:</term>
 <listitem><simpara>			the length of ID.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGenerateID">xmlSecGenerateID ()</title>
-<indexterm><primary>xmlSecGenerateID</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecGenerateID                (const <link linkend="xmlChar">xmlChar</link> *prefix,
-                                             <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
+<refsect2 id="xmlSecGenerateID" role="function">
+<title>xmlSecGenerateID ()</title>
+<indexterm zone="xmlSecGenerateID"><primary sortas="xmlSecGenerateID">xmlSecGenerateID</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecGenerateID                    (const <link linkend="xmlChar">xmlChar</link> *prefix,
+                                                         <link linkend="xmlSecSize">xmlSecSize</link> len);</programlisting>
 <para>
 Generates a unique ID in the format &lt;<parameter>prefix</parameter>&gt;base64-encoded(<parameter>len</parameter> random bytes).
 The caller is responsible for freeing returned string using <parameter>xmlFree</parameter> function.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>prefix</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>prefix</parameter>&#160;:</term>
 <listitem><simpara>			the prefix to add to the generated ID (can be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>len</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>len</parameter>&#160;:</term>
 <listitem><simpara>			the length of ID.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to generated ID string or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to generated ID string or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecCreateTree">xmlSecCreateTree ()</title>
-<indexterm><primary>xmlSecCreateTree</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>   xmlSecCreateTree                (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);</programlisting>
+<refsect2 id="xmlSecCreateTree" role="function">
+<title>xmlSecCreateTree ()</title>
+<indexterm zone="xmlSecCreateTree"><primary sortas="xmlSecCreateTree">xmlSecCreateTree</primary></indexterm><programlisting><link linkend="xmlDoc">xmlDocPtr</link>           xmlSecCreateTree                    (const <link linkend="xmlChar">xmlChar</link> *rootNodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *rootNodeNs);</programlisting>
 <para>
 Creates a new XML tree with one root node <parameter>rootNodeName</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>rootNodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>rootNodeName</parameter>&#160;:</term>
 <listitem><simpara>	the root node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>rootNodeNs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>rootNodeNs</parameter>&#160;:</term>
 <listitem><simpara>		the root node namespace (otpional).
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the newly created tree or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the newly created tree or NULL if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIsEmptyNode">xmlSecIsEmptyNode ()</title>
-<indexterm><primary>xmlSecIsEmptyNode</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecIsEmptyNode               (<link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
+<refsect2 id="xmlSecIsEmptyNode" role="function">
+<title>xmlSecIsEmptyNode ()</title>
+<indexterm zone="xmlSecIsEmptyNode"><primary sortas="xmlSecIsEmptyNode">xmlSecIsEmptyNode</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIsEmptyNode                   (<link linkend="xmlNode">xmlNodePtr</link> node);</programlisting>
 <para>
 Checks whethere the <parameter>node</parameter> is empty (i.e. has only whitespaces children).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the node to check
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>node</parameter> is empty, 0 otherwise or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>node</parameter> is empty, 0 otherwise or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIsEmptyString">xmlSecIsEmptyString ()</title>
-<indexterm><primary>xmlSecIsEmptyString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecIsEmptyString             (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
+<refsect2 id="xmlSecIsEmptyString" role="function">
+<title>xmlSecIsEmptyString ()</title>
+<indexterm zone="xmlSecIsEmptyString"><primary sortas="xmlSecIsEmptyString">xmlSecIsEmptyString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecIsEmptyString                 (const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
 <para>
 Checks whethere the <parameter>str</parameter> is empty (i.e. has only whitespaces children).</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>str</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
 <listitem><simpara>		the string to check
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>1 if <parameter>str</parameter> is empty, 0 otherwise or a negative value if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 1 if <parameter>str</parameter> is empty, 0 otherwise or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGetQName">xmlSecGetQName ()</title>
-<indexterm><primary>xmlSecGetQName</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecGetQName                  (<link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *href,
-                                             const <link linkend="xmlChar">xmlChar</link> *local);</programlisting>
+<refsect2 id="xmlSecGetQName" role="function">
+<title>xmlSecGetQName ()</title>
+<indexterm zone="xmlSecGetQName"><primary sortas="xmlSecGetQName">xmlSecGetQName</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*            xmlSecGetQName                      (<link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *href,
+                                                         const <link linkend="xmlChar">xmlChar</link> *local);</programlisting>
 <para>
 Creates QName (prefix:local) from <parameter>href</parameter> and <parameter>local</parameter> in the context of the <parameter>node</parameter>.
 Caller is responsible for freeing returned string with xmlFree.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>		the context node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>href</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>href</parameter>&#160;:</term>
 <listitem><simpara>		the QName href (can be NULL).
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>local</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>local</parameter>&#160;:</term>
 <listitem><simpara>		the QName local part.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>qname or NULL if an error occurs.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> qname or NULL if an error occurs.
+</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="xmlSecPrintXmlString" role="function">
+<title>xmlSecPrintXmlString ()</title>
+<indexterm zone="xmlSecPrintXmlString"><primary sortas="xmlSecPrintXmlString">xmlSecPrintXmlString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecPrintXmlString                (<link linkend="FILE--CAPS">FILE</link> *fd,
+                                                         const <link linkend="xmlChar">xmlChar</link> *str);</programlisting>
+<para>
+Encodes the <parameter>str</parameter> (e.g. replaces '&amp;' with '&amp;amp;') and writes it to <parameter>fd</parameter>.</para>
+<para>
+</para><variablelist role="params">
+<varlistentry><term><parameter>fd</parameter>&#160;:</term>
+<listitem><simpara>                the file descriptor to write the XML string to
+</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>str</parameter>&#160;:</term>
+<listitem><simpara>               the string
+</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> he number of bytes transmitted or a negative value if an error occurs.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecIsHex">xmlSecIsHex()</title>
-<indexterm><primary>xmlSecIsHex</primary></indexterm><programlisting>#define     xmlSecIsHex(c)</programlisting>
+<refsect2 id="xmlSecIsHex" role="macro">
+<title>xmlSecIsHex()</title>
+<indexterm zone="xmlSecIsHex"><primary sortas="xmlSecIsHex">xmlSecIsHex</primary></indexterm><programlisting>#define             xmlSecIsHex(c)</programlisting>
 <para>
 Macro. Returns 1 if <parameter>c</parameter> is a hex digit or 0 other wise.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>c</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>c</parameter>&#160;:</term>
 <listitem><simpara> 			the character.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecGetHex">xmlSecGetHex()</title>
-<indexterm><primary>xmlSecGetHex</primary></indexterm><programlisting>#define     xmlSecGetHex(c)</programlisting>
+<refsect2 id="xmlSecGetHex" role="macro">
+<title>xmlSecGetHex()</title>
+<indexterm zone="xmlSecGetHex"><primary sortas="xmlSecGetHex">xmlSecGetHex</primary></indexterm><programlisting>#define             xmlSecGetHex(c)</programlisting>
 <para>
 Macro. Returns the hex value of the <parameter>c</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>c</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>c</parameter>&#160;:</term>
 <listitem><simpara> 			the character,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerInfoConstPtr">xmlSecQName2IntegerInfoConstPtr</title>
-<indexterm><primary>xmlSecQName2IntegerInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2IntegerInfo *		xmlSecQName2IntegerInfoConstPtr;
-</programlisting>
-<para>
-Pointer to constant QName &lt;-&gt; Integer conversion definition.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerInfo">struct xmlSecQName2IntegerInfo</title>
-<indexterm><primary>xmlSecQName2IntegerInfo</primary></indexterm><programlisting>struct xmlSecQName2IntegerInfo {
-
+<refsect2 id="xmlSecQName2IntegerInfo" role="struct">
+<title>struct xmlSecQName2IntegerInfo</title>
+<indexterm zone="xmlSecQName2IntegerInfo"><primary sortas="xmlSecQName2IntegerInfo">xmlSecQName2IntegerInfo</primary></indexterm><programlisting>struct xmlSecQName2IntegerInfo {
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     int       		intValue;
@@ -728,300 +705,284 @@ Pointer to constant QName &lt;-&gt; Integer conversion definition.</para>
 <para>
 QName &lt;-&gt; Integer conversion definition.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>qnameHref</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameHref</structfield>;</term>
 <listitem><simpara>		the QName href
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>qnameLocalPart</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameLocalPart</structfield>;</term>
 <listitem><simpara>	the QName local
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="int">int</link> <structfield>intValue</structfield></term>
+<term><link linkend="int">int</link>&#160;<structfield>intValue</structfield>;</term>
 <listitem><simpara>		the integer value
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo ()</title>
-<indexterm><primary>xmlSecQName2IntegerGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> xmlSecQName2IntegerGetInfo
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerInfoConstPtr" role="typedef">
+<title>xmlSecQName2IntegerInfoConstPtr</title>
+<indexterm zone="xmlSecQName2IntegerInfoConstPtr"><primary sortas="xmlSecQName2IntegerInfoConstPtr">xmlSecQName2IntegerInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2IntegerInfo *		xmlSecQName2IntegerInfoConstPtr;
+</programlisting>
+<para>
+Pointer to constant QName &lt;-&gt; Integer conversion definition.</para>
+<para>
+</para></refsect2>
+<refsect2 id="xmlSecQName2IntegerGetInfo" role="function">
+<title>xmlSecQName2IntegerGetInfo ()</title>
+<indexterm zone="xmlSecQName2IntegerGetInfo"><primary sortas="xmlSecQName2IntegerGetInfo">xmlSecQName2IntegerGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link>  xmlSecQName2IntegerGetInfo
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue);</programlisting>
 <para>
 Maps integer <parameter>intValue</parameter> to a QName prefix.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>the QName info that is mapped to <parameter>intValue</parameter> or NULL if such value
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> the QName info that is mapped to <parameter>intValue</parameter> or NULL if such value
 is not found.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger ()</title>
-<indexterm><primary>xmlSecQName2IntegerGetInteger</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerGetInteger   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                             <link linkend="int">int</link> *intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerGetInteger" role="function">
+<title>xmlSecQName2IntegerGetInteger ()</title>
+<indexterm zone="xmlSecQName2IntegerGetInteger"><primary sortas="xmlSecQName2IntegerGetInteger">xmlSecQName2IntegerGetInteger</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerGetInteger       (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
+                                                         <link linkend="int">int</link> *intValue);</programlisting>
 <para>
 Maps qname qname to an integer and returns it in <parameter>intValue</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qnameHref</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qnameHref</parameter>&#160;:</term>
 <listitem><simpara>          the qname href value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qnameLocalPart</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qnameLocalPart</parameter>&#160;:</term>
 <listitem><simpara>     the qname local part value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to result integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString ()</title>
-<indexterm><primary>xmlSecQName2IntegerGetIntegerFromString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerGetIntegerFromString
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *qname,
-                                             <link linkend="int">int</link> *intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerGetIntegerFromString" role="function">
+<title>xmlSecQName2IntegerGetIntegerFromString ()</title>
+<indexterm zone="xmlSecQName2IntegerGetIntegerFromString"><primary sortas="xmlSecQName2IntegerGetIntegerFromString">xmlSecQName2IntegerGetIntegerFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerGetIntegerFromString
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
+                                                         <link linkend="int">int</link> *intValue);</programlisting>
 <para>
 Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qname</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qname</parameter>&#160;:</term>
 <listitem><simpara>              the qname string.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to result integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger ()</title>
-<indexterm><primary>xmlSecQName2IntegerGetStringFromInteger</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecQName2IntegerGetStringFromInteger
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerGetStringFromInteger" role="function">
+<title>xmlSecQName2IntegerGetStringFromInteger ()</title>
+<indexterm zone="xmlSecQName2IntegerGetStringFromInteger"><primary sortas="xmlSecQName2IntegerGetStringFromInteger">xmlSecQName2IntegerGetStringFromInteger</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link> *           xmlSecQName2IntegerGetStringFromInteger
+                                                        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> intValue);</programlisting>
 <para>
 Creates qname string for <parameter>intValue</parameter> in context of given <parameter>node</parameter>. Caller
 is responsible for freeing returned string with <parameter>xmlFree</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated string on success or NULL if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated string on success or NULL if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead ()</title>
-<indexterm><primary>xmlSecQName2IntegerNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerNodeRead     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="int">int</link> *intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerNodeRead" role="function">
+<title>xmlSecQName2IntegerNodeRead ()</title>
+<indexterm zone="xmlSecQName2IntegerNodeRead"><primary sortas="xmlSecQName2IntegerNodeRead">xmlSecQName2IntegerNodeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerNodeRead         (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="int">int</link> *intValue);</programlisting>
 <para>
 Reads the content of <parameter>node</parameter> and converts it to an integer using mapping 
 from <parameter>info</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to result integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite ()</title>
-<indexterm><primary>xmlSecQName2IntegerNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerNodeWrite    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="int">int</link> intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerNodeWrite" role="function">
+<title>xmlSecQName2IntegerNodeWrite ()</title>
+<indexterm zone="xmlSecQName2IntegerNodeWrite"><primary sortas="xmlSecQName2IntegerNodeWrite">xmlSecQName2IntegerNodeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerNodeWrite        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="int">int</link> intValue);</programlisting>
 <para>
 Creates new child node in <parameter>node</parameter> and sets its value to <parameter>intValue</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the parent node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
 <listitem><simpara>           the child node name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeNs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
 <listitem><simpara>             the child node namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead ()</title>
-<indexterm><primary>xmlSecQName2IntegerAttributeRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerAttributeRead
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             <link linkend="int">int</link> *intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerAttributeRead" role="function">
+<title>xmlSecQName2IntegerAttributeRead ()</title>
+<indexterm zone="xmlSecQName2IntegerAttributeRead"><primary sortas="xmlSecQName2IntegerAttributeRead">xmlSecQName2IntegerAttributeRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerAttributeRead    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         <link linkend="int">int</link> *intValue);</programlisting>
 <para>
 Gets the value of <parameter>attrName</parameter> atrtibute from <parameter>node</parameter> and converts it to integer
 according to <parameter>info</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the element node. 
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>attrName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>attrName</parameter>&#160;:</term>
 <listitem><simpara>           the attribute name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the pointer to result integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite ()</title>
-<indexterm><primary>xmlSecQName2IntegerAttributeWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2IntegerAttributeWrite
-                                            (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *attrName,
-                                             <link linkend="int">int</link> intValue);</programlisting>
+<refsect2 id="xmlSecQName2IntegerAttributeWrite" role="function">
+<title>xmlSecQName2IntegerAttributeWrite ()</title>
+<indexterm zone="xmlSecQName2IntegerAttributeWrite"><primary sortas="xmlSecQName2IntegerAttributeWrite">xmlSecQName2IntegerAttributeWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2IntegerAttributeWrite   (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *attrName,
+                                                         <link linkend="int">int</link> intValue);</programlisting>
 <para>
 Converts <parameter>intValue</parameter> to a qname and sets it to the value of 
 attribute <parameter>attrName</parameter> in <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the parent node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>attrName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>attrName</parameter>&#160;:</term>
 <listitem><simpara>           the name of attribute.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump ()</title>
-<indexterm><primary>xmlSecQName2IntegerDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecQName2IntegerDebugDump    (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecQName2IntegerDebugDump" role="function">
+<title>xmlSecQName2IntegerDebugDump ()</title>
+<indexterm zone="xmlSecQName2IntegerDebugDump"><primary sortas="xmlSecQName2IntegerDebugDump">xmlSecQName2IntegerDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2IntegerDebugDump        (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints <parameter>intValue</parameter> into <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the value name to print.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump ()</title>
-<indexterm><primary>xmlSecQName2IntegerDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecQName2IntegerDebugXmlDump (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
-                                             <link linkend="int">int</link> intValue,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecQName2IntegerDebugXmlDump" role="function">
+<title>xmlSecQName2IntegerDebugXmlDump ()</title>
+<indexterm zone="xmlSecQName2IntegerDebugXmlDump"><primary sortas="xmlSecQName2IntegerDebugXmlDump">xmlSecQName2IntegerDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2IntegerDebugXmlDump     (<link linkend="xmlSecQName2IntegerInfoConst">xmlSecQName2IntegerInfoConstPtr</link> info,
+                                                         <link linkend="int">int</link> intValue,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints <parameter>intValue</parameter> into <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>intValue</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>intValue</parameter>&#160;:</term>
 <listitem><simpara>           the integer value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the value name to print.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecBitMask">xmlSecBitMask</title>
-<indexterm><primary>xmlSecBitMask</primary></indexterm><programlisting>typedef unsigned int                            	xmlSecBitMask;
+<refsect2 id="xmlSecBitMask" role="typedef">
+<title>xmlSecBitMask</title>
+<indexterm zone="xmlSecBitMask"><primary sortas="xmlSecBitMask">xmlSecBitMask</primary></indexterm><programlisting>typedef unsigned int                            	xmlSecBitMask;
 </programlisting>
 <para>
 Bitmask datatype.</para>
 <para>
-
 </para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskInfoConstPtr">xmlSecQName2BitMaskInfoConstPtr</title>
-<indexterm><primary>xmlSecQName2BitMaskInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2BitMaskInfo*		xmlSecQName2BitMaskInfoConstPtr;
-</programlisting>
-<para>
-Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</para>
-<para>
-
-</para></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskInfo">struct xmlSecQName2BitMaskInfo</title>
-<indexterm><primary>xmlSecQName2BitMaskInfo</primary></indexterm><programlisting>struct xmlSecQName2BitMaskInfo {
-
+<refsect2 id="xmlSecQName2BitMaskInfo" role="struct">
+<title>struct xmlSecQName2BitMaskInfo</title>
+<indexterm zone="xmlSecQName2BitMaskInfo"><primary sortas="xmlSecQName2BitMaskInfo">xmlSecQName2BitMaskInfo</primary></indexterm><programlisting>struct xmlSecQName2BitMaskInfo {
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     xmlSecBitMask       mask;
@@ -1030,232 +991,231 @@ Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</para>
 <para>
 QName &lt;-&gt; Bitmask conversion definition.</para>
 <para>
-
 </para><variablelist role="struct">
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>qnameHref</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameHref</structfield>;</term>
 <listitem><simpara>		the QName href
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term>const <link linkend="xmlChar">xmlChar</link> *<structfield>qnameLocalPart</structfield></term>
+<term>const&#160;<link linkend="xmlChar">xmlChar</link>&#160;*<structfield>qnameLocalPart</structfield>;</term>
 <listitem><simpara>	the QName local
 </simpara></listitem>
 </varlistentry>
 <varlistentry>
-<term><link linkend="xmlSecBitMask">xmlSecBitMask</link> <structfield>mask</structfield></term>
+<term><link linkend="xmlSecBitMask">xmlSecBitMask</link>&#160;<structfield>mask</structfield>;</term>
 <listitem><simpara>		the bitmask value
 </simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo ()</title>
-<indexterm><primary>xmlSecQName2BitMaskGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> xmlSecQName2BitMaskGetInfo
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskInfoConstPtr" role="typedef">
+<title>xmlSecQName2BitMaskInfoConstPtr</title>
+<indexterm zone="xmlSecQName2BitMaskInfoConstPtr"><primary sortas="xmlSecQName2BitMaskInfoConstPtr">xmlSecQName2BitMaskInfoConstPtr</primary></indexterm><programlisting>typedef const xmlSecQName2BitMaskInfo*		xmlSecQName2BitMaskInfoConstPtr;
+</programlisting>
+<para>
+Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</para>
+<para>
+</para></refsect2>
+<refsect2 id="xmlSecQName2BitMaskGetInfo" role="function">
+<title>xmlSecQName2BitMaskGetInfo ()</title>
+<indexterm zone="xmlSecQName2BitMaskGetInfo"><primary sortas="xmlSecQName2BitMaskGetInfo">xmlSecQName2BitMaskGetInfo</primary></indexterm><programlisting><link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link>  xmlSecQName2BitMaskGetInfo
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
 <para>
 Converts <parameter>mask</parameter> to qname.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the bit mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to the qname info for <parameter>mask</parameter> or NULL if mask is unknown.
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to the qname info for <parameter>mask</parameter> or NULL if mask is unknown.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask ()</title>
-<indexterm><primary>xmlSecQName2BitMaskGetBitMask</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2BitMaskGetBitMask   (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
-                                             const <link linkend="xmlChar">xmlChar</link> *qnameHref,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskGetBitMask" role="function">
+<title>xmlSecQName2BitMaskGetBitMask ()</title>
+<indexterm zone="xmlSecQName2BitMaskGetBitMask"><primary sortas="xmlSecQName2BitMaskGetBitMask">xmlSecQName2BitMaskGetBitMask</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskGetBitMask       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameLocalPart,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qnameHref,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
 <para>
 Converts <parameter>qnameLocalPart</parameter> to <parameter>mask</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qnameLocalPart</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qnameLocalPart</parameter>&#160;:</term>
 <listitem><simpara>     the qname LocalPart value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qnameHref</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qnameHref</parameter>&#160;:</term>
 <listitem><simpara>          the qname Href value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to result mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead ()</title>
-<indexterm><primary>xmlSecQName2BitMaskNodesRead</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2BitMaskNodesRead    (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> *node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="int">int</link> stopOnUnknown,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskNodesRead" role="function">
+<title>xmlSecQName2BitMaskNodesRead ()</title>
+<indexterm zone="xmlSecQName2BitMaskNodesRead"><primary sortas="xmlSecQName2BitMaskNodesRead">xmlSecQName2BitMaskNodesRead</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskNodesRead        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> *node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="int">int</link> stopOnUnknown,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
 <para>
 Reads &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elements and puts the result bit mask
 into <parameter>mask</parameter>. When function exits, <parameter>node</parameter> points to the first element node
 after all the &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elements.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the start.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
 <listitem><simpara>           the mask nodes name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeNs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
 <listitem><simpara>             the mask nodes namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>stopOnUnknown</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>stopOnUnknown</parameter>&#160;:</term>
 <listitem><simpara>	if this flag is set then function exits if unknown
 		value was found.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to result mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString ()</title>
-<indexterm><primary>xmlSecQName2BitMaskGetBitMaskFromString</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2BitMaskGetBitMaskFromString
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *qname,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskGetBitMaskFromString" role="function">
+<title>xmlSecQName2BitMaskGetBitMaskFromString ()</title>
+<indexterm zone="xmlSecQName2BitMaskGetBitMaskFromString"><primary sortas="xmlSecQName2BitMaskGetBitMaskFromString">xmlSecQName2BitMaskGetBitMaskFromString</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskGetBitMaskFromString
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *qname,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> *mask);</programlisting>
 <para>
 Converts <parameter>qname</parameter> into integer in context of <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>qname</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>qname</parameter>&#160;:</term>
 <listitem><simpara>              the qname string.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to result msk value.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask ()</title>
-<indexterm><primary>xmlSecQName2BitMaskGetStringFromBitMask</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link>*    xmlSecQName2BitMaskGetStringFromBitMask
-                                            (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskGetStringFromBitMask" role="function">
+<title>xmlSecQName2BitMaskGetStringFromBitMask ()</title>
+<indexterm zone="xmlSecQName2BitMaskGetStringFromBitMask"><primary sortas="xmlSecQName2BitMaskGetStringFromBitMask">xmlSecQName2BitMaskGetStringFromBitMask</primary></indexterm><programlisting><link linkend="xmlChar">xmlChar</link> *           xmlSecQName2BitMaskGetStringFromBitMask
+                                                        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
 <para>
 Creates qname string for <parameter>mask</parameter> in context of given <parameter>node</parameter>. Caller
 is responsible for freeing returned string with <parameter>xmlFree</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;integer mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the pointer to node.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>pointer to newly allocated string on success or NULL if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> pointer to newly allocated string on success or NULL if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite ()</title>
-<indexterm><primary>xmlSecQName2BitMaskNodesWrite</primary></indexterm><programlisting><link linkend="int">int</link>         xmlSecQName2BitMaskNodesWrite   (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlNode">xmlNodePtr</link> node,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeName,
-                                             const <link linkend="xmlChar">xmlChar</link> *nodeNs,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskNodesWrite" role="function">
+<title>xmlSecQName2BitMaskNodesWrite ()</title>
+<indexterm zone="xmlSecQName2BitMaskNodesWrite"><primary sortas="xmlSecQName2BitMaskNodesWrite">xmlSecQName2BitMaskNodesWrite</primary></indexterm><programlisting><link linkend="int">int</link>                 xmlSecQName2BitMaskNodesWrite       (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlNode">xmlNodePtr</link> node,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeName,
+                                                         const <link linkend="xmlChar">xmlChar</link> *nodeNs,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask);</programlisting>
 <para>
 Writes &lt;<parameter>nodeNs</parameter>:<parameter>nodeName</parameter>&gt; elemnts with values from <parameter>mask</parameter> to <parameter>node</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>node</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>node</parameter>&#160;:</term>
 <listitem><simpara>               the parent element for mask nodes.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeName</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeName</parameter>&#160;:</term>
 <listitem><simpara>           the mask nodes name.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>nodeNs</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>nodeNs</parameter>&#160;:</term>
 <listitem><simpara>             the mask nodes namespace.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the bit mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara>0 on success or a negative value if an error occurs,
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> 0 on success or a negative value if an error occurs,
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump ()</title>
-<indexterm><primary>xmlSecQName2BitMaskDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecQName2BitMaskDebugDump    (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskDebugDump" role="function">
+<title>xmlSecQName2BitMaskDebugDump ()</title>
+<indexterm zone="xmlSecQName2BitMaskDebugDump"><primary sortas="xmlSecQName2BitMaskDebugDump">xmlSecQName2BitMaskDebugDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2BitMaskDebugDump        (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter>.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the bit mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the value name to print.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2>
-<title><anchor id="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump ()</title>
-<indexterm><primary>xmlSecQName2BitMaskDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>        xmlSecQName2BitMaskDebugXmlDump (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
-                                             <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
-                                             const <link linkend="xmlChar">xmlChar</link> *name,
-                                             <link linkend="FILE-CAPS">FILE</link> *output);</programlisting>
+<refsect2 id="xmlSecQName2BitMaskDebugXmlDump" role="function">
+<title>xmlSecQName2BitMaskDebugXmlDump ()</title>
+<indexterm zone="xmlSecQName2BitMaskDebugXmlDump"><primary sortas="xmlSecQName2BitMaskDebugXmlDump">xmlSecQName2BitMaskDebugXmlDump</primary></indexterm><programlisting><link linkend="void">void</link>                xmlSecQName2BitMaskDebugXmlDump     (<link linkend="xmlSecQName2BitMaskInfoConst">xmlSecQName2BitMaskInfoConstPtr</link> info,
+                                                         <link linkend="xmlSecBitMask">xmlSecBitMask</link> mask,
+                                                         const <link linkend="xmlChar">xmlChar</link> *name,
+                                                         <link linkend="FILE--CAPS">FILE</link> *output);</programlisting>
 <para>
 Prints debug information about <parameter>mask</parameter> to <parameter>output</parameter> in XML format.</para>
 <para>
-
 </para><variablelist role="params">
-<varlistentry><term><parameter>info</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>info</parameter>&#160;:</term>
 <listitem><simpara>               the qname&lt;-&gt;bit mask mapping information.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>mask</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>mask</parameter>&#160;:</term>
 <listitem><simpara>               the bit mask.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>name</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>name</parameter>&#160;:</term>
 <listitem><simpara> 		the value name to print.
 </simpara></listitem></varlistentry>
-<varlistentry><term><parameter>output</parameter>&nbsp;:</term>
+<varlistentry><term><parameter>output</parameter>&#160;:</term>
 <listitem><simpara>             the pointer to output FILE.
 </simpara></listitem></varlistentry>
 </variablelist></refsect2>
diff --git a/docs/api/tmpl/app.sgml b/docs/api/tmpl/app.sgml
index 377d900..670a639 100644
--- a/docs/api/tmpl/app.sgml
+++ b/docs/api/tmpl/app.sgml
@@ -14,6 +14,9 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoInit ##### -->
 <para>
 
@@ -846,5 +849,6 @@ Crypto-engine application support function used by xmlsec command line utility.
 
 </para>
 
+ Returns: 
 
 
diff --git a/docs/api/tmpl/base64.sgml b/docs/api/tmpl/base64.sgml
index 2385f03..6612a1e 100644
--- a/docs/api/tmpl/base64.sgml
+++ b/docs/api/tmpl/base64.sgml
@@ -14,6 +14,9 @@ Base64 encoding/decoding functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_BASE64_LINESIZE ##### -->
 <para>
 
diff --git a/docs/api/tmpl/bn.sgml b/docs/api/tmpl/bn.sgml
index eed9db5..b45678c 100644
--- a/docs/api/tmpl/bn.sgml
+++ b/docs/api/tmpl/bn.sgml
@@ -14,6 +14,9 @@ Big numbers support functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM xmlSecBnFormat ##### -->
 <para>
 
diff --git a/docs/api/tmpl/buffer.sgml b/docs/api/tmpl/buffer.sgml
index 0744d0b..08f0fc2 100644
--- a/docs/api/tmpl/buffer.sgml
+++ b/docs/api/tmpl/buffer.sgml
@@ -14,6 +14,9 @@ Binary buffer implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM xmlSecAllocMode ##### -->
 <para>
 
diff --git a/docs/api/tmpl/crypto.sgml b/docs/api/tmpl/crypto.sgml
index bbbc974..be950e3 100644
--- a/docs/api/tmpl/crypto.sgml
+++ b/docs/api/tmpl/crypto.sgml
@@ -14,3 +14,6 @@ crypto
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
diff --git a/docs/api/tmpl/dl.sgml b/docs/api/tmpl/dl.sgml
index e0c2c4d..3fc3977 100644
--- a/docs/api/tmpl/dl.sgml
+++ b/docs/api/tmpl/dl.sgml
@@ -14,6 +14,9 @@ Dynamic crypto-engine library loading support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ##### -->
 <para>
 
diff --git a/docs/api/tmpl/errors.sgml b/docs/api/tmpl/errors.sgml
index c876d73..d02c09d 100644
--- a/docs/api/tmpl/errors.sgml
+++ b/docs/api/tmpl/errors.sgml
@@ -14,6 +14,9 @@ Error/log messages support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_ERRORS_R_XMLSEC_FAILED ##### -->
 <para>
 
diff --git a/docs/api/tmpl/exports.sgml b/docs/api/tmpl/exports.sgml
index 5c29fc7..8290868 100644
--- a/docs/api/tmpl/exports.sgml
+++ b/docs/api/tmpl/exports.sgml
@@ -14,6 +14,9 @@ exports
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO extern ##### -->
 <para>
 
diff --git a/docs/api/tmpl/gnutls/app.sgml b/docs/api/tmpl/gnutls/app.sgml
index c8a8662..68fdfcc 100644
--- a/docs/api/tmpl/gnutls/app.sgml
+++ b/docs/api/tmpl/gnutls/app.sgml
@@ -14,6 +14,9 @@ Application functions implementation for GnuTLS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecGnuTLSAppInit ##### -->
 <para>
 
@@ -176,5 +179,6 @@ Application functions implementation for GnuTLS.
 
 </para>
 
+ Returns: 
 
 
diff --git a/docs/api/tmpl/gnutls/crypto.sgml b/docs/api/tmpl/gnutls/crypto.sgml
index 097dbc8..eba6ed4 100644
--- a/docs/api/tmpl/gnutls/crypto.sgml
+++ b/docs/api/tmpl/gnutls/crypto.sgml
@@ -14,6 +14,9 @@ Crypto transforms implementation for GnuTLS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_gnutls ##### -->
 <para>
 
diff --git a/docs/api/tmpl/io.sgml b/docs/api/tmpl/io.sgml
index 3772031..6b13d8d 100644
--- a/docs/api/tmpl/io.sgml
+++ b/docs/api/tmpl/io.sgml
@@ -14,6 +14,9 @@ Input/output support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecIOInit ##### -->
 <para>
 
diff --git a/docs/api/tmpl/keyinfo.sgml b/docs/api/tmpl/keyinfo.sgml
index 0fd1ec6..5e2acca 100644
--- a/docs/api/tmpl/keyinfo.sgml
+++ b/docs/api/tmpl/keyinfo.sgml
@@ -14,6 +14,9 @@ keyinfo
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecKeyInfoNodeRead ##### -->
 <para>
 
diff --git a/docs/api/tmpl/keys.sgml b/docs/api/tmpl/keys.sgml
index 0ad70cf..4b25137 100644
--- a/docs/api/tmpl/keys.sgml
+++ b/docs/api/tmpl/keys.sgml
@@ -14,6 +14,9 @@ Crypto key object definition.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecKeyUsage ##### -->
 <para>
 
diff --git a/docs/api/tmpl/keysdata.sgml b/docs/api/tmpl/keysdata.sgml
index 821a567..8b070e1 100644
--- a/docs/api/tmpl/keysdata.sgml
+++ b/docs/api/tmpl/keysdata.sgml
@@ -14,6 +14,9 @@ Crypto key data object definition.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecKeyDataUsage ##### -->
 <para>
 
diff --git a/docs/api/tmpl/keysmngr.sgml b/docs/api/tmpl/keysmngr.sgml
index af183f5..53b2d56 100644
--- a/docs/api/tmpl/keysmngr.sgml
+++ b/docs/api/tmpl/keysmngr.sgml
@@ -14,6 +14,9 @@ Keys manager object support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecKeysMngrCreate ##### -->
 <para>
 
diff --git a/docs/api/tmpl/list.sgml b/docs/api/tmpl/list.sgml
index 74549c6..92d56d3 100644
--- a/docs/api/tmpl/list.sgml
+++ b/docs/api/tmpl/list.sgml
@@ -14,6 +14,9 @@ Generic list structure implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT xmlSecPtrList ##### -->
 <para>
 
diff --git a/docs/api/tmpl/membuf.sgml b/docs/api/tmpl/membuf.sgml
index 67fbbea..0b69c7b 100644
--- a/docs/api/tmpl/membuf.sgml
+++ b/docs/api/tmpl/membuf.sgml
@@ -14,6 +14,9 @@ Memory buffer transform implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecTransformMemBufId ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/app.sgml b/docs/api/tmpl/mscrypto/app.sgml
index 9e1cceb..a738ead 100644
--- a/docs/api/tmpl/mscrypto/app.sgml
+++ b/docs/api/tmpl/mscrypto/app.sgml
@@ -14,6 +14,9 @@ Application functions implementation for MS Crypto.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoAppInit ##### -->
 <para>
 
@@ -244,5 +247,6 @@ Application functions implementation for MS Crypto.
 
 </para>
 
+ Returns: 
 
 
diff --git a/docs/api/tmpl/mscrypto/certkeys.sgml b/docs/api/tmpl/mscrypto/certkeys.sgml
index 53dae70..d295138 100644
--- a/docs/api/tmpl/mscrypto/certkeys.sgml
+++ b/docs/api/tmpl/mscrypto/certkeys.sgml
@@ -14,6 +14,9 @@ MS Crypto certificates helper functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecMSCryptoKeyDataGetCert ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/crypto.sgml b/docs/api/tmpl/mscrypto/crypto.sgml
index 9cf2e99..915e906 100644
--- a/docs/api/tmpl/mscrypto/crypto.sgml
+++ b/docs/api/tmpl/mscrypto/crypto.sgml
@@ -14,6 +14,9 @@ Crypto transforms implementation for MS Crypto.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_mscrypto ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/keysstore.sgml b/docs/api/tmpl/mscrypto/keysstore.sgml
index fb56c4a..5523e6f 100644
--- a/docs/api/tmpl/mscrypto/keysstore.sgml
+++ b/docs/api/tmpl/mscrypto/keysstore.sgml
@@ -14,6 +14,9 @@ Keys store implementation for MS Crypto.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeysStoreId ##### -->
 <para>
 
diff --git a/docs/api/tmpl/mscrypto/x509.sgml b/docs/api/tmpl/mscrypto/x509.sgml
index 29c19e1..e70ebfb 100644
--- a/docs/api/tmpl/mscrypto/x509.sgml
+++ b/docs/api/tmpl/mscrypto/x509.sgml
@@ -14,6 +14,9 @@ X509 certificates support implementation for MS Crypto.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecMSCryptoKeyDataX509Id ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nodeset.sgml b/docs/api/tmpl/nodeset.sgml
index 3998492..da83523 100644
--- a/docs/api/tmpl/nodeset.sgml
+++ b/docs/api/tmpl/nodeset.sgml
@@ -14,6 +14,9 @@ Nodeset object implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM xmlSecNodeSetType ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/app.sgml b/docs/api/tmpl/nss/app.sgml
index 708317c..dd133a0 100644
--- a/docs/api/tmpl/nss/app.sgml
+++ b/docs/api/tmpl/nss/app.sgml
@@ -14,6 +14,9 @@ Application functions implementation for NSS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssAppInit ##### -->
 <para>
 
@@ -234,5 +237,6 @@ Application functions implementation for NSS.
 
 </para>
 
+ Returns: 
 
 
diff --git a/docs/api/tmpl/nss/bignum.sgml b/docs/api/tmpl/nss/bignum.sgml
index 283af30..c846475 100644
--- a/docs/api/tmpl/nss/bignum.sgml
+++ b/docs/api/tmpl/nss/bignum.sgml
@@ -14,6 +14,9 @@ Big numbers helper functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssNodeGetBigNumValue ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/crypto.sgml b/docs/api/tmpl/nss/crypto.sgml
index fe5a5f5..ebff22f 100644
--- a/docs/api/tmpl/nss/crypto.sgml
+++ b/docs/api/tmpl/nss/crypto.sgml
@@ -14,6 +14,9 @@ Crypto transforms implementation for NSS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecCryptoGetFunctions_nss ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/keysstore.sgml b/docs/api/tmpl/nss/keysstore.sgml
index 249dd76..b11e935 100644
--- a/docs/api/tmpl/nss/keysstore.sgml
+++ b/docs/api/tmpl/nss/keysstore.sgml
@@ -14,6 +14,9 @@ Keys store implementation for NSS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecNssKeysStoreId ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/pkikeys.sgml b/docs/api/tmpl/nss/pkikeys.sgml
index 2508514..c174c01 100644
--- a/docs/api/tmpl/nss/pkikeys.sgml
+++ b/docs/api/tmpl/nss/pkikeys.sgml
@@ -14,6 +14,9 @@ PKI keys data implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecNssPKIAdoptKey ##### -->
 <para>
 
diff --git a/docs/api/tmpl/nss/x509.sgml b/docs/api/tmpl/nss/x509.sgml
index b0bf8c7..e10f5a5 100644
--- a/docs/api/tmpl/nss/x509.sgml
+++ b/docs/api/tmpl/nss/x509.sgml
@@ -14,6 +14,9 @@ X509 certificates support implementation for NSS.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecNssKeyDataX509Id ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/app.sgml b/docs/api/tmpl/openssl/app.sgml
index af418da..9372120 100644
--- a/docs/api/tmpl/openssl/app.sgml
+++ b/docs/api/tmpl/openssl/app.sgml
@@ -14,6 +14,9 @@ Application functions implementation for OpenSSL.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLAppInit ##### -->
 <para>
 
@@ -254,5 +257,6 @@ Application functions implementation for OpenSSL.
 
 </para>
 
+ Returns: 
 
 
diff --git a/docs/api/tmpl/openssl/bn.sgml b/docs/api/tmpl/openssl/bn.sgml
index 59d3ff5..4c6cae0 100644
--- a/docs/api/tmpl/openssl/bn.sgml
+++ b/docs/api/tmpl/openssl/bn.sgml
@@ -14,6 +14,9 @@ Big numbers helper functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLNodeGetBNValue ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/crypto.sgml b/docs/api/tmpl/openssl/crypto.sgml
index ce78b21..fc60be1 100644
--- a/docs/api/tmpl/openssl/crypto.sgml
+++ b/docs/api/tmpl/openssl/crypto.sgml
@@ -14,6 +14,9 @@ Crypto transforms implementation for OpenSSL.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_NO_SHA224 ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/evp.sgml b/docs/api/tmpl/openssl/evp.sgml
index 82e7d8d..817ca6e 100644
--- a/docs/api/tmpl/openssl/evp.sgml
+++ b/docs/api/tmpl/openssl/evp.sgml
@@ -14,6 +14,9 @@ EVP keys data implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecOpenSSLEvpKeyDataAdoptEvp ##### -->
 <para>
 
diff --git a/docs/api/tmpl/openssl/x509.sgml b/docs/api/tmpl/openssl/x509.sgml
index c1f4c5b..500bd95 100644
--- a/docs/api/tmpl/openssl/x509.sgml
+++ b/docs/api/tmpl/openssl/x509.sgml
@@ -14,6 +14,9 @@ X509 certificates support implementation for OpenSSL.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_STACK_OF_X509 ##### -->
 <para>
 
diff --git a/docs/api/tmpl/parser.sgml b/docs/api/tmpl/parser.sgml
index 2e7a20c..1446adb 100644
--- a/docs/api/tmpl/parser.sgml
+++ b/docs/api/tmpl/parser.sgml
@@ -14,6 +14,9 @@ Parser transform implementation.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecParseFile ##### -->
 <para>
 
diff --git a/docs/api/tmpl/private.sgml b/docs/api/tmpl/private.sgml
index 54be22d..c5fafdb 100644
--- a/docs/api/tmpl/private.sgml
+++ b/docs/api/tmpl/private.sgml
@@ -14,6 +14,9 @@ private
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### USER_FUNCTION xmlSecCryptoInitMethod ##### -->
 <para>
 
diff --git a/docs/api/tmpl/soap.sgml b/docs/api/tmpl/soap.sgml
index a3b0e7c..917a49f 100644
--- a/docs/api/tmpl/soap.sgml
+++ b/docs/api/tmpl/soap.sgml
@@ -14,6 +14,9 @@ soap
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecSoap11CreateEnvelope ##### -->
 <para>
 
diff --git a/docs/api/tmpl/strings.sgml b/docs/api/tmpl/strings.sgml
index 72f7098..43cc220 100644
--- a/docs/api/tmpl/strings.sgml
+++ b/docs/api/tmpl/strings.sgml
@@ -14,3 +14,6 @@ strings
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
diff --git a/docs/api/tmpl/templates.sgml b/docs/api/tmpl/templates.sgml
index 4b9a799..7d97675 100644
--- a/docs/api/tmpl/templates.sgml
+++ b/docs/api/tmpl/templates.sgml
@@ -14,6 +14,9 @@ Dynamic templates creation functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION xmlSecTmplSignatureCreate ##### -->
 <para>
 
diff --git a/docs/api/tmpl/transforms.sgml b/docs/api/tmpl/transforms.sgml
index b0da07c..8cc91b3 100644
--- a/docs/api/tmpl/transforms.sgml
+++ b/docs/api/tmpl/transforms.sgml
@@ -14,6 +14,9 @@ Transform object definition.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_TRANSFORM_BINARY_CHUNK ##### -->
 <para>
 
diff --git a/docs/api/tmpl/version.sgml b/docs/api/tmpl/version.sgml
index a0b0b21..c913138 100644
--- a/docs/api/tmpl/version.sgml
+++ b/docs/api/tmpl/version.sgml
@@ -14,6 +14,9 @@ Version macros.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_VERSION ##### -->
 <para>
 
diff --git a/docs/api/tmpl/x509.sgml b/docs/api/tmpl/x509.sgml
index 0addbf6..65d77fc 100644
--- a/docs/api/tmpl/x509.sgml
+++ b/docs/api/tmpl/x509.sgml
@@ -14,6 +14,9 @@ x509
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO XMLSEC_X509DATA_CERTIFICATE_NODE ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmldsig.sgml b/docs/api/tmpl/xmldsig.sgml
index f9ba3da..f071c63 100644
--- a/docs/api/tmpl/xmldsig.sgml
+++ b/docs/api/tmpl/xmldsig.sgml
@@ -14,6 +14,9 @@ XML Digital Signature support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM xmlSecDSigStatus ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmlenc.sgml b/docs/api/tmpl/xmlenc.sgml
index b540d8b..351ff7d 100644
--- a/docs/api/tmpl/xmlenc.sgml
+++ b/docs/api/tmpl/xmlenc.sgml
@@ -14,6 +14,9 @@ XML Encryption support.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### ENUM xmlEncCtxMode ##### -->
 <para>
 
diff --git a/docs/api/tmpl/xmlsec.sgml b/docs/api/tmpl/xmlsec.sgml
index 8719f6e..2375a52 100644
--- a/docs/api/tmpl/xmlsec.sgml
+++ b/docs/api/tmpl/xmlsec.sgml
@@ -14,6 +14,9 @@ Utility functions.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### TYPEDEF xmlSecPtr ##### -->
 <para>
 
@@ -69,7 +72,7 @@ Utility functions.
 
 </para>
 
- xmlSecCheckVersionExact: 
+ xmlSecCheckVersionExactMatch: 
 @xmlSecCheckVersionABICompatible: 
 
 <!-- ##### FUNCTION xmlSecCheckVersionExt ##### -->
diff --git a/docs/api/tmpl/xmltree.sgml b/docs/api/tmpl/xmltree.sgml
index d5d94ff..d8dcd2c 100644
--- a/docs/api/tmpl/xmltree.sgml
+++ b/docs/api/tmpl/xmltree.sgml
@@ -14,6 +14,9 @@ XML tree operations.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### MACRO xmlSecNodeGetName ##### -->
 <para>
 
@@ -273,15 +276,17 @@ XML tree operations.
 @Returns: 
 
 
-<!-- ##### MACRO xmlSecIsHex ##### -->
+<!-- ##### FUNCTION xmlSecPrintXmlString ##### -->
 <para>
 
 </para>
 
- c: 
+ fd: 
+ str: 
+ Returns: 
 
 
-<!-- ##### MACRO xmlSecGetHex ##### -->
+<!-- ##### MACRO xmlSecIsHex ##### -->
 <para>
 
 </para>
@@ -289,11 +294,13 @@ XML tree operations.
 @c: 
 
 
-<!-- ##### TYPEDEF xmlSecQName2IntegerInfoConstPtr ##### -->
+<!-- ##### MACRO xmlSecGetHex ##### -->
 <para>
 
 </para>
 
+ c: 
+
 
 <!-- ##### STRUCT xmlSecQName2IntegerInfo ##### -->
 <para>
@@ -304,6 +311,12 @@ XML tree operations.
 @qnameLocalPart: 
 @intValue: 
 
+<!-- ##### TYPEDEF xmlSecQName2IntegerInfoConstPtr ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION xmlSecQName2IntegerGetInfo ##### -->
 <para>
 
@@ -425,20 +438,20 @@ XML tree operations.
 </para>
 
 
-<!-- ##### TYPEDEF xmlSecQName2BitMaskInfoConstPtr ##### -->
+<!-- ##### STRUCT xmlSecQName2BitMaskInfo ##### -->
 <para>
 
 </para>
 
+ qnameHref: 
+ qnameLocalPart: 
+ mask: 
 
-<!-- ##### STRUCT xmlSecQName2BitMaskInfo ##### -->
+<!-- ##### TYPEDEF xmlSecQName2BitMaskInfoConstPtr ##### -->
 <para>
 
 </para>
 
- qnameHref: 
- qnameLocalPart: 
- mask: 
 
 <!-- ##### FUNCTION xmlSecQName2BitMaskGetInfo ##### -->
 <para>
diff --git a/docs/api/up.png b/docs/api/up.png
index 85b3e2a..b974dce 100644
Binary files a/docs/api/up.png and b/docs/api/up.png differ
diff --git a/docs/api/xmlsec-app.html b/docs/api/xmlsec-app.html
index 22426f7..07e50d1 100644
--- a/docs/api/xmlsec-app.html
+++ b/docs/api/xmlsec-app.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>app</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="NEXT" title="base64" href="xmlsec-base64.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,1576 +87,1396 @@
 <h1>
 <a name="XMLSEC-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN836"></a><h2>Name</h2>app--Crypto-engine independent application support function.</div>
+<a name="AEN836"></a><h2>Name</h2>app -- Crypto-engine independent application support function.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN839"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOINIT">xmlSecCryptoInit</a>                (void);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOSHUTDOWN">xmlSecCryptoShutdown</a>            (void);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOKEYSMNGRINIT">xmlSecCryptoKeysMngrInit</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATAAESID">xmlSecKeyDataAesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATAAESGETKLASS">xmlSecKeyDataAesGetKlass</a>    (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATADESID">xmlSecKeyDataDesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATADESGETKLASS">xmlSecKeyDataDesGetKlass</a>    (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATADSAID">xmlSecKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATADSAGETKLASS">xmlSecKeyDataDsaGetKlass</a>    (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001ID">xmlSecKeyDataGost2001Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001GETKLASS">xmlSecKeyDataGost2001GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATAHMACID">xmlSecKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATAHMACGETKLASS">xmlSecKeyDataHmacGetKlass</a>   (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATARSAID">xmlSecKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATARSAGETKLASS">xmlSecKeyDataRsaGetKlass</a>    (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATAX509ID">xmlSecKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATAX509GETKLASS">xmlSecKeyDataX509GetKlass</a>   (void);
-#define     <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTID">xmlSecKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTGETKLASS">xmlSecKeyDataRawX509CertGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECX509STOREID">xmlSecX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font> <a href="xmlsec-app.html#XMLSECX509STOREGETKLASS">xmlSecX509StoreGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCID">xmlSecTransformAes128CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCGETKLASS">xmlSecTransformAes128CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCID">xmlSecTransformAes192CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCGETKLASS">xmlSecTransformAes192CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCID">xmlSecTransformAes256CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCGETKLASS">xmlSecTransformAes256CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128ID">xmlSecTransformKWAes128Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128GETKLASS">xmlSecTransformKWAes128GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192ID">xmlSecTransformKWAes192Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192GETKLASS">xmlSecTransformKWAes192GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256ID">xmlSecTransformKWAes256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256GETKLASS">xmlSecTransformKWAes256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCID">xmlSecTransformDes3CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCGETKLASS">xmlSecTransformDes3CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3ID">xmlSecTransformKWDes3Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3GETKLASS">xmlSecTransformKWDes3GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1ID">xmlSecTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1GETKLASS">xmlSecTransformDsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94ID">xmlSecTransformGost2001GostR3411_94Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecTransformGost2001GostR3411_94GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5ID">xmlSecTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5GETKLASS">xmlSecTransformHmacMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160ID">xmlSecTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">xmlSecTransformHmacRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1ID">xmlSecTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">xmlSecTransformHmacSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224ID">xmlSecTransformHmacSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224GETKLASS">xmlSecTransformHmacSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256ID">xmlSecTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256GETKLASS">xmlSecTransformHmacSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384ID">xmlSecTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384GETKLASS">xmlSecTransformHmacSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512ID">xmlSecTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512GETKLASS">xmlSecTransformHmacSha512GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMMD5ID">xmlSecTransformMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMMD5GETKLASS">xmlSecTransformMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160ID">xmlSecTransformRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160GETKLASS">xmlSecTransformRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5ID">xmlSecTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5GETKLASS">xmlSecTransformRsaMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160ID">xmlSecTransformRsaRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160GETKLASS">xmlSecTransformRsaRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1ID">xmlSecTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1GETKLASS">xmlSecTransformRsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224ID">xmlSecTransformRsaSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224GETKLASS">xmlSecTransformRsaSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256ID">xmlSecTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256GETKLASS">xmlSecTransformRsaSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384ID">xmlSecTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384GETKLASS">xmlSecTransformRsaSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512ID">xmlSecTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512GETKLASS">xmlSecTransformRsaSha512GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1ID">xmlSecTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1GETKLASS">xmlSecTransformRsaPkcs1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPID">xmlSecTransformRsaOaepId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPGETKLASS">xmlSecTransformRsaOaepGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94ID">xmlSecTransformGostR3411_94Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94GETKLASS">xmlSecTransformGostR3411_94GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1ID">xmlSecTransformSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1GETKLASS">xmlSecTransformSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224ID">xmlSecTransformSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224GETKLASS">xmlSecTransformSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256ID">xmlSecTransformSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256GETKLASS">xmlSecTransformSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384ID">xmlSecTransformSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384GETKLASS">xmlSecTransformSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512ID">xmlSecTransformSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512GETKLASS">xmlSecTransformSha512GetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPINIT">xmlSecCryptoAppInit</a>             (const <font>char</font> *config);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPSHUTDOWN">xmlSecCryptoAppShutdown</a>         (void);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecCryptoAppDefaultKeysMngrInit</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecCryptoAppDefaultKeysMngrAdoptKey</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecCryptoAppDefaultKeysMngrLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecCryptoAppDefaultKeysMngrSave</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecCryptoAppKeysMngrCertLoad</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecCryptoAppKeysMngrCertLoadMemory</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOAD">xmlSecCryptoAppKeyLoad</a>         (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOADMEMORY">xmlSecCryptoAppKeyLoadMemory</a>   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOAD">xmlSecCryptoAppPkcs12Load</a>      (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOADMEMORY">xmlSecCryptoAppPkcs12LoadMemory</a>
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOAD">xmlSecCryptoAppKeyCertLoad</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOADMEMORY">xmlSecCryptoAppKeyCertLoadMemory</a>
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*       <a href="xmlsec-app.html#XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecCryptoAppGetDefaultPwdCallback</a>
-                                            (void);</pre>
+<a name="XMLSEC-APP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOINIT">xmlSecCryptoInit</a>                    (void);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOSHUTDOWN">xmlSecCryptoShutdown</a>                (void);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOKEYSMNGRINIT">xmlSecCryptoKeysMngrInit</a>            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATAAESID">xmlSecKeyDataAesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAAESGETKLASS">xmlSecKeyDataAesGetKlass</a>            (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATADESID">xmlSecKeyDataDesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATADESGETKLASS">xmlSecKeyDataDesGetKlass</a>            (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATADSAID">xmlSecKeyDataDsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATADSAGETKLASS">xmlSecKeyDataDsaGetKlass</a>            (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001ID">xmlSecKeyDataGost2001Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAGOST2001GETKLASS">xmlSecKeyDataGost2001GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATAHMACID">xmlSecKeyDataHmacId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAHMACGETKLASS">xmlSecKeyDataHmacGetKlass</a>           (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATARSAID">xmlSecKeyDataRsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATARSAGETKLASS">xmlSecKeyDataRsaGetKlass</a>            (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATAX509ID">xmlSecKeyDataX509Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATAX509GETKLASS">xmlSecKeyDataX509GetKlass</a>           (void);
+#define             <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTID">xmlSecKeyDataRawX509CertId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-app.html#XMLSECKEYDATARAWX509CERTGETKLASS">xmlSecKeyDataRawX509CertGetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECX509STOREID">xmlSecX509StoreId</a>
+<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-app.html#XMLSECX509STOREGETKLASS">xmlSecX509StoreGetKlass</a>           (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCID">xmlSecTransformAes128CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES128CBCGETKLASS">xmlSecTransformAes128CbcGetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCID">xmlSecTransformAes192CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES192CBCGETKLASS">xmlSecTransformAes192CbcGetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCID">xmlSecTransformAes256CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMAES256CBCGETKLASS">xmlSecTransformAes256CbcGetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128ID">xmlSecTransformKWAes128Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES128GETKLASS">xmlSecTransformKWAes128GetKlass</a>     (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192ID">xmlSecTransformKWAes192Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES192GETKLASS">xmlSecTransformKWAes192GetKlass</a>     (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256ID">xmlSecTransformKWAes256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWAES256GETKLASS">xmlSecTransformKWAes256GetKlass</a>     (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCID">xmlSecTransformDes3CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMDES3CBCGETKLASS">xmlSecTransformDes3CbcGetKlass</a>      (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3ID">xmlSecTransformKWDes3Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMKWDES3GETKLASS">xmlSecTransformKWDes3GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1ID">xmlSecTransformDsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMDSASHA1GETKLASS">xmlSecTransformDsaSha1GetKlass</a>      (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94ID">xmlSecTransformGost2001GostR3411_94Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecTransformGost2001GostR3411_94GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5ID">xmlSecTransformHmacMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACMD5GETKLASS">xmlSecTransformHmacMd5GetKlass</a>      (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160ID">xmlSecTransformHmacRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACRIPEMD160GETKLASS">xmlSecTransformHmacRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1ID">xmlSecTransformHmacSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA1GETKLASS">xmlSecTransformHmacSha1GetKlass</a>     (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224ID">xmlSecTransformHmacSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA224GETKLASS">xmlSecTransformHmacSha224GetKlass</a>   (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256ID">xmlSecTransformHmacSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA256GETKLASS">xmlSecTransformHmacSha256GetKlass</a>   (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384ID">xmlSecTransformHmacSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA384GETKLASS">xmlSecTransformHmacSha384GetKlass</a>   (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512ID">xmlSecTransformHmacSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMHMACSHA512GETKLASS">xmlSecTransformHmacSha512GetKlass</a>   (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMMD5ID">xmlSecTransformMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMMD5GETKLASS">xmlSecTransformMd5GetKlass</a>          (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160ID">xmlSecTransformRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRIPEMD160GETKLASS">xmlSecTransformRipemd160GetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5ID">xmlSecTransformRsaMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAMD5GETKLASS">xmlSecTransformRsaMd5GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160ID">xmlSecTransformRsaRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSARIPEMD160GETKLASS">xmlSecTransformRsaRipemd160GetKlass</a> (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1ID">xmlSecTransformRsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA1GETKLASS">xmlSecTransformRsaSha1GetKlass</a>      (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224ID">xmlSecTransformRsaSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA224GETKLASS">xmlSecTransformRsaSha224GetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256ID">xmlSecTransformRsaSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA256GETKLASS">xmlSecTransformRsaSha256GetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384ID">xmlSecTransformRsaSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA384GETKLASS">xmlSecTransformRsaSha384GetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512ID">xmlSecTransformRsaSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSASHA512GETKLASS">xmlSecTransformRsaSha512GetKlass</a>    (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1ID">xmlSecTransformRsaPkcs1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAPKCS1GETKLASS">xmlSecTransformRsaPkcs1GetKlass</a>     (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPID">xmlSecTransformRsaOaepId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMRSAOAEPGETKLASS">xmlSecTransformRsaOaepGetKlass</a>      (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94ID">xmlSecTransformGostR3411_94Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMGOSTR3411-94GETKLASS">xmlSecTransformGostR3411_94GetKlass</a> (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1ID">xmlSecTransformSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA1GETKLASS">xmlSecTransformSha1GetKlass</a>         (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224ID">xmlSecTransformSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA224GETKLASS">xmlSecTransformSha224GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256ID">xmlSecTransformSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA256GETKLASS">xmlSecTransformSha256GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384ID">xmlSecTransformSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA384GETKLASS">xmlSecTransformSha384GetKlass</a>       (void);
+#define             <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512ID">xmlSecTransformSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-app.html#XMLSECTRANSFORMSHA512GETKLASS">xmlSecTransformSha512GetKlass</a>       (void);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPINIT">xmlSecCryptoAppInit</a>                 (const <font>char</font> *config);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPSHUTDOWN">xmlSecCryptoAppShutdown</a>             (void);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecCryptoAppDefaultKeysMngrInit</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecCryptoAppDefaultKeysMngrAdoptKey</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecCryptoAppDefaultKeysMngrLoad</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecCryptoAppDefaultKeysMngrSave</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecCryptoAppKeysMngrCertLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecCryptoAppKeysMngrCertLoadMemory</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOAD">xmlSecCryptoAppKeyLoad</a>              (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYLOADMEMORY">xmlSecCryptoAppKeyLoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOAD">xmlSecCryptoAppPkcs12Load</a>           (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-app.html#XMLSECCRYPTOAPPPKCS12LOADMEMORY">xmlSecCryptoAppPkcs12LoadMemory</a>     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOAD">xmlSecCryptoAppKeyCertLoad</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-app.html#XMLSECCRYPTOAPPKEYCERTLOADMEMORY">xmlSecCryptoAppKeyCertLoadMemory</a>    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>void</font>*               <a href="xmlsec-app.html#XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecCryptoAppGetDefaultPwdCallback</a>
+                                                        (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN1053"></a><h2>Description</h2>
+<a name="XMLSEC-APP.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto-engine application support function used by xmlsec command line utility.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN1056"></a><h2>Details</h2>
+<a name="XMLSEC-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN1058"></a><h3>
-<a name="XMLSECCRYPTOINIT"></a>xmlSecCryptoInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoInit                (void);</pre>
+<a name="XMLSECCRYPTOINIT"></a><h3>xmlSecCryptoInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoInit                    (void);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1068"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN1067"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1073"></a><h3>
-<a name="XMLSECCRYPTOSHUTDOWN"></a>xmlSecCryptoShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoShutdown            (void);</pre>
+<a name="XMLSECCRYPTOSHUTDOWN"></a><h3>xmlSecCryptoShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoShutdown                (void);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1083"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN1081"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1088"></a><h3>
-<a name="XMLSECCRYPTOKEYSMNGRINIT"></a>xmlSecCryptoKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoKeysMngrInit        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECCRYPTOKEYSMNGRINIT"></a><h3>xmlSecCryptoKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoKeysMngrInit            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Adds crypto specific key data stores in keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1099"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN1096"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN1104"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN1101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1109"></a><h3>
-<a name="XMLSECKEYDATAAESID"></a>xmlSecKeyDataAesId</h3>
+<a name="XMLSECKEYDATAAESID"></a><h3>xmlSecKeyDataAesId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataAesId			xmlSecKeyDataAesGetKlass()</pre>
 <p>The AES key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1117"></a><h3>
-<a name="XMLSECKEYDATAAESGETKLASS"></a>xmlSecKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataAesGetKlass    (void);</pre>
+<a name="XMLSECKEYDATAAESGETKLASS"></a><h3>xmlSecKeyDataAesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataAesGetKlass            (void);</pre>
 <p>The AES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1127"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1122"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the AES key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1132"></a><h3>
-<a name="XMLSECKEYDATADESID"></a>xmlSecKeyDataDesId</h3>
+<a name="XMLSECKEYDATADESID"></a><h3>xmlSecKeyDataDesId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataDesId			xmlSecKeyDataDesGetKlass()</pre>
 <p>The DES key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1140"></a><h3>
-<a name="XMLSECKEYDATADESGETKLASS"></a>xmlSecKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataDesGetKlass    (void);</pre>
+<a name="XMLSECKEYDATADESGETKLASS"></a><h3>xmlSecKeyDataDesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataDesGetKlass            (void);</pre>
 <p>The DES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1150"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DES key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1143"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DES key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DES key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1155"></a><h3>
-<a name="XMLSECKEYDATADSAID"></a>xmlSecKeyDataDsaId</h3>
+<a name="XMLSECKEYDATADSAID"></a><h3>xmlSecKeyDataDsaId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataDsaId			xmlSecKeyDataDsaGetKlass()</pre>
 <p>The DSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1163"></a><h3>
-<a name="XMLSECKEYDATADSAGETKLASS"></a>xmlSecKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataDsaGetKlass    (void);</pre>
+<a name="XMLSECKEYDATADSAGETKLASS"></a><h3>xmlSecKeyDataDsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataDsaGetKlass            (void);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1173"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DSA key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1164"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the DSA key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1178"></a><h3>
-<a name="XMLSECKEYDATAGOST2001ID"></a>xmlSecKeyDataGost2001Id</h3>
+<a name="XMLSECKEYDATAGOST2001ID"></a><h3>xmlSecKeyDataGost2001Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataGost2001Id			xmlSecKeyDataGost2001GetKlass()</pre>
 <p>The GOST2001 key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1186"></a><h3>
-<a name="XMLSECKEYDATAGOST2001GETKLASS"></a>xmlSecKeyDataGost2001GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataGost2001GetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYDATAGOST2001GETKLASS"></a><h3>xmlSecKeyDataGost2001GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataGost2001GetKlass       (void);</pre>
 <p>The GOST2001 key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1196"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>GOST2001 key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1185"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> GOST2001 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the GOST2001 key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1201"></a><h3>
-<a name="XMLSECKEYDATAHMACID"></a>xmlSecKeyDataHmacId</h3>
+<a name="XMLSECKEYDATAHMACID"></a><h3>xmlSecKeyDataHmacId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataHmacId			xmlSecKeyDataHmacGetKlass()</pre>
 <p>The DHMAC key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1209"></a><h3>
-<a name="XMLSECKEYDATAHMACGETKLASS"></a>xmlSecKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataHmacGetKlass   (void);</pre>
+<a name="XMLSECKEYDATAHMACGETKLASS"></a><h3>xmlSecKeyDataHmacGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataHmacGetKlass           (void);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1219"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HMAC key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1206"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HMAC key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the HMAC key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1224"></a><h3>
-<a name="XMLSECKEYDATARSAID"></a>xmlSecKeyDataRsaId</h3>
+<a name="XMLSECKEYDATARSAID"></a><h3>xmlSecKeyDataRsaId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRsaId			xmlSecKeyDataRsaGetKlass()</pre>
 <p>The RSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1232"></a><h3>
-<a name="XMLSECKEYDATARSAGETKLASS"></a>xmlSecKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataRsaGetKlass    (void);</pre>
+<a name="XMLSECKEYDATARSAGETKLASS"></a><h3>xmlSecKeyDataRsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRsaGetKlass            (void);</pre>
 <p>The RSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1227"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the RSA key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1247"></a><h3>
-<a name="XMLSECKEYDATAX509ID"></a>xmlSecKeyDataX509Id</h3>
+<a name="XMLSECKEYDATAX509ID"></a><h3>xmlSecKeyDataX509Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataX509Id			xmlSecKeyDataX509GetKlass()</pre>
 <p>The X509 data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1255"></a><h3>
-<a name="XMLSECKEYDATAX509GETKLASS"></a>xmlSecKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataX509GetKlass   (void);</pre>
+<a name="XMLSECKEYDATAX509GETKLASS"></a><h3>xmlSecKeyDataX509GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataX509GetKlass           (void);</pre>
 <p>The X509 key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1265"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>X509 key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1248"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> X509 key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the X509 key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1270"></a><h3>
-<a name="XMLSECKEYDATARAWX509CERTID"></a>xmlSecKeyDataRawX509CertId</h3>
+<a name="XMLSECKEYDATARAWX509CERTID"></a><h3>xmlSecKeyDataRawX509CertId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRawX509CertId		xmlSecKeyDataRawX509CertGetKlass()</pre>
 <p>The  raw X509 certificate klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1278"></a><h3>
-<a name="XMLSECKEYDATARAWX509CERTGETKLASS"></a>xmlSecKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataRawX509CertGetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecKeyDataRawX509CertGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRawX509CertGetKlass    (void);</pre>
 <p>The raw X509 cert key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>raw x509 cert key data klass or NULL if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN1269"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> raw x509 cert key data klass or NULL if an error occurs
 (xmlsec-crypto library is not loaded or the raw X509 cert key data
 klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1293"></a><h3>
-<a name="XMLSECX509STOREID"></a>xmlSecX509StoreId</h3>
+<a name="XMLSECX509STOREID"></a><h3>xmlSecX509StoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecX509StoreId			xmlSecX509StoreGetKlass()</pre>
 <p>The  X509 store klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1301"></a><h3>
-<a name="XMLSECX509STOREGETKLASS"></a>xmlSecX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font> xmlSecX509StoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECX509STOREGETKLASS"></a><h3>xmlSecX509StoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecX509StoreGetKlass           (void);</pre>
 <p>The X509 certificates key data store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to X509 certificates key data store klass or NULL if 
+<td align="LEFT" valign="TOP"><a name="AEN1290"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to X509 certificates key data store klass or NULL if 
 an error occurs (xmlsec-crypto library is not loaded or the raw X509 
 cert key data klass is not implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1316"></a><h3>
-<a name="XMLSECTRANSFORMAES128CBCID"></a>xmlSecTransformAes128CbcId</h3>
+<a name="XMLSECTRANSFORMAES128CBCID"></a><h3>xmlSecTransformAes128CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes128CbcId		xmlSecTransformAes128CbcGetKlass()</pre>
 <p>The AES128 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1324"></a><h3>
-<a name="XMLSECTRANSFORMAES128CBCGETKLASS"></a>xmlSecTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformAes128CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecTransformAes128CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes128CbcGetKlass    (void);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1334"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 128 CBC encryption transform or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1339"></a><h3>
-<a name="XMLSECTRANSFORMAES192CBCID"></a>xmlSecTransformAes192CbcId</h3>
+<a name="XMLSECTRANSFORMAES192CBCID"></a><h3>xmlSecTransformAes192CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes192CbcId		xmlSecTransformAes192CbcGetKlass()</pre>
 <p>The AES192 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1347"></a><h3>
-<a name="XMLSECTRANSFORMAES192CBCGETKLASS"></a>xmlSecTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformAes192CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecTransformAes192CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes192CbcGetKlass    (void);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1357"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 192 CBC encryption transform or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1332"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1362"></a><h3>
-<a name="XMLSECTRANSFORMAES256CBCID"></a>xmlSecTransformAes256CbcId</h3>
+<a name="XMLSECTRANSFORMAES256CBCID"></a><h3>xmlSecTransformAes256CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformAes256CbcId		xmlSecTransformAes256CbcGetKlass()</pre>
 <p>The AES256 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1370"></a><h3>
-<a name="XMLSECTRANSFORMAES256CBCGETKLASS"></a>xmlSecTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformAes256CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecTransformAes256CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformAes256CbcGetKlass    (void);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1380"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 256 CBC encryption transform or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1353"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1385"></a><h3>
-<a name="XMLSECTRANSFORMKWAES128ID"></a>xmlSecTransformKWAes128Id</h3>
+<a name="XMLSECTRANSFORMKWAES128ID"></a><h3>xmlSecTransformKWAes128Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes128Id		xmlSecTransformKWAes128GetKlass()</pre>
 <p>The AES 128 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1393"></a><h3>
-<a name="XMLSECTRANSFORMKWAES128GETKLASS"></a>xmlSecTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformKWAes128GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecTransformKWAes128GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes128GetKlass     (void);</pre>
 <p>The AES-128 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1403"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-128 kew wrapper transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1374"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1408"></a><h3>
-<a name="XMLSECTRANSFORMKWAES192ID"></a>xmlSecTransformKWAes192Id</h3>
+<a name="XMLSECTRANSFORMKWAES192ID"></a><h3>xmlSecTransformKWAes192Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes192Id		xmlSecTransformKWAes192GetKlass()</pre>
 <p>The AES 192 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1416"></a><h3>
-<a name="XMLSECTRANSFORMKWAES192GETKLASS"></a>xmlSecTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformKWAes192GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecTransformKWAes192GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes192GetKlass     (void);</pre>
 <p>The AES-192 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1426"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-192 kew wrapper transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1395"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1431"></a><h3>
-<a name="XMLSECTRANSFORMKWAES256ID"></a>xmlSecTransformKWAes256Id</h3>
+<a name="XMLSECTRANSFORMKWAES256ID"></a><h3>xmlSecTransformKWAes256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWAes256Id		xmlSecTransformKWAes256GetKlass()</pre>
 <p>The AES 256 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1439"></a><h3>
-<a name="XMLSECTRANSFORMKWAES256GETKLASS"></a>xmlSecTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformKWAes256GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecTransformKWAes256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWAes256GetKlass     (void);</pre>
 <p>The AES-256 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1449"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-256 kew wrapper transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1454"></a><h3>
-<a name="XMLSECTRANSFORMDES3CBCID"></a>xmlSecTransformDes3CbcId</h3>
+<a name="XMLSECTRANSFORMDES3CBCID"></a><h3>xmlSecTransformDes3CbcId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDes3CbcId		xmlSecTransformDes3CbcGetKlass()</pre>
 <p>The Triple DES encryption transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1462"></a><h3>
-<a name="XMLSECTRANSFORMDES3CBCGETKLASS"></a>xmlSecTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformDes3CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecTransformDes3CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformDes3CbcGetKlass      (void);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1472"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to Triple DES encryption transform or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1477"></a><h3>
-<a name="XMLSECTRANSFORMKWDES3ID"></a>xmlSecTransformKWDes3Id</h3>
+<a name="XMLSECTRANSFORMKWDES3ID"></a><h3>xmlSecTransformKWDes3Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformKWDes3Id			xmlSecTransformKWDes3GetKlass()</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1485"></a><h3>
-<a name="XMLSECTRANSFORMKWDES3GETKLASS"></a>xmlSecTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformKWDes3GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecTransformKWDes3GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformKWDes3GetKlass       (void);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1495"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Triple DES key wrapper transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1458"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1500"></a><h3>
-<a name="XMLSECTRANSFORMDSASHA1ID"></a>xmlSecTransformDsaSha1Id</h3>
+<a name="XMLSECTRANSFORMDSASHA1ID"></a><h3>xmlSecTransformDsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDsaSha1Id		xmlSecTransformDsaSha1GetKlass()</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1508"></a><h3>
-<a name="XMLSECTRANSFORMDSASHA1GETKLASS"></a>xmlSecTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformDsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecTransformDsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformDsaSha1GetKlass      (void);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DSA-SHA1 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1479"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1523"></a><h3>
-<a name="XMLSECTRANSFORMGOST2001GOSTR3411-94ID"></a>xmlSecTransformGost2001GostR3411_94Id</h3>
+<a name="XMLSECTRANSFORMGOST2001GOSTR3411-94ID"></a><h3>xmlSecTransformGost2001GostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformGost2001GostR3411_94Id		xmlSecTransformGost2001GostR3411_94GetKlass()</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1531"></a><h3>
-<a name="XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a>xmlSecTransformGost2001GostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformGost2001GostR3411_94GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a><h3>xmlSecTransformGost2001GostR3411_94GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformGost2001GostR3411_94GetKlass
+                                                        (void);</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1541"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1500"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> GOST2001-GOSTR3411_94 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1546"></a><h3>
-<a name="XMLSECTRANSFORMHMACMD5ID"></a>xmlSecTransformHmacMd5Id</h3>
+<a name="XMLSECTRANSFORMHMACMD5ID"></a><h3>xmlSecTransformHmacMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacMd5Id		xmlSecTransformHmacMd5GetKlass()</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1554"></a><h3>
-<a name="XMLSECTRANSFORMHMACMD5GETKLASS"></a>xmlSecTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecTransformHmacMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacMd5GetKlass      (void);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1564"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-MD5 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1569"></a><h3>
-<a name="XMLSECTRANSFORMHMACRIPEMD160ID"></a>xmlSecTransformHmacRipemd160Id</h3>
+<a name="XMLSECTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecTransformHmacRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacRipemd160Id		xmlSecTransformHmacRipemd160GetKlass()</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1577"></a><h3>
-<a name="XMLSECTRANSFORMHMACRIPEMD160GETKLASS"></a>xmlSecTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecTransformHmacRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacRipemd160GetKlass
+                                                        (void);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-RIPEMD160 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1542"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1592"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA1ID"></a>xmlSecTransformHmacSha1Id</h3>
+<a name="XMLSECTRANSFORMHMACSHA1ID"></a><h3>xmlSecTransformHmacSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha1Id		xmlSecTransformHmacSha1GetKlass()</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1600"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA1GETKLASS"></a>xmlSecTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecTransformHmacSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha1GetKlass     (void);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1610"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA1 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1563"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1615"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA224ID"></a>xmlSecTransformHmacSha224Id</h3>
+<a name="XMLSECTRANSFORMHMACSHA224ID"></a><h3>xmlSecTransformHmacSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha224Id		xmlSecTransformHmacSha224GetKlass()</pre>
 <p>The HMAC with SHA224 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1623"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA224GETKLASS"></a>xmlSecTransformHmacSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACSHA224GETKLASS"></a><h3>xmlSecTransformHmacSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha224GetKlass   (void);</pre>
 <p>The HMAC-SHA224 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1633"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA224 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA224 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1638"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA256ID"></a>xmlSecTransformHmacSha256Id</h3>
+<a name="XMLSECTRANSFORMHMACSHA256ID"></a><h3>xmlSecTransformHmacSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha256Id		xmlSecTransformHmacSha256GetKlass()</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1646"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA256GETKLASS"></a>xmlSecTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecTransformHmacSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha256GetKlass   (void);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1656"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA256 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1605"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1661"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA384ID"></a>xmlSecTransformHmacSha384Id</h3>
+<a name="XMLSECTRANSFORMHMACSHA384ID"></a><h3>xmlSecTransformHmacSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha384Id		xmlSecTransformHmacSha384GetKlass()</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1669"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA384GETKLASS"></a>xmlSecTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecTransformHmacSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha384GetKlass   (void);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1679"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA384 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1626"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1684"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA512ID"></a>xmlSecTransformHmacSha512Id</h3>
+<a name="XMLSECTRANSFORMHMACSHA512ID"></a><h3>xmlSecTransformHmacSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformHmacSha512Id		xmlSecTransformHmacSha512GetKlass()</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1692"></a><h3>
-<a name="XMLSECTRANSFORMHMACSHA512GETKLASS"></a>xmlSecTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformHmacSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecTransformHmacSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformHmacSha512GetKlass   (void);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1702"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA512 transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1647"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1707"></a><h3>
-<a name="XMLSECTRANSFORMMD5ID"></a>xmlSecTransformMd5Id</h3>
+<a name="XMLSECTRANSFORMMD5ID"></a><h3>xmlSecTransformMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformMd5Id			xmlSecTransformMd5GetKlass()</pre>
 <p>The MD5 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1715"></a><h3>
-<a name="XMLSECTRANSFORMMD5GETKLASS"></a>xmlSecTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMMD5GETKLASS"></a><h3>xmlSecTransformMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformMd5GetKlass          (void);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1725"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to MD5 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1668"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1730"></a><h3>
-<a name="XMLSECTRANSFORMRIPEMD160ID"></a>xmlSecTransformRipemd160Id</h3>
+<a name="XMLSECTRANSFORMRIPEMD160ID"></a><h3>xmlSecTransformRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRipemd160Id		xmlSecTransformRipemd160GetKlass()</pre>
 <p>The RIPEMD160 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1738"></a><h3>
-<a name="XMLSECTRANSFORMRIPEMD160GETKLASS"></a>xmlSecTransformRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRIPEMD160GETKLASS"></a><h3>xmlSecTransformRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRipemd160GetKlass    (void);</pre>
 <p>RIPEMD-160 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1748"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to RIPEMD-160 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to RIPEMD-160 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1753"></a><h3>
-<a name="XMLSECTRANSFORMRSAMD5ID"></a>xmlSecTransformRsaMd5Id</h3>
+<a name="XMLSECTRANSFORMRSAMD5ID"></a><h3>xmlSecTransformRsaMd5Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaMd5Id			xmlSecTransformRsaMd5GetKlass()</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1761"></a><h3>
-<a name="XMLSECTRANSFORMRSAMD5GETKLASS"></a>xmlSecTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecTransformRsaMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaMd5GetKlass       (void);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1771"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-MD5 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1776"></a><h3>
-<a name="XMLSECTRANSFORMRSARIPEMD160ID"></a>xmlSecTransformRsaRipemd160Id</h3>
+<a name="XMLSECTRANSFORMRSARIPEMD160ID"></a><h3>xmlSecTransformRsaRipemd160Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaRipemd160Id		xmlSecTransformRsaRipemd160GetKlass()</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1784"></a><h3>
-<a name="XMLSECTRANSFORMRSARIPEMD160GETKLASS"></a>xmlSecTransformRsaRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSARIPEMD160GETKLASS"></a><h3>xmlSecTransformRsaRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaRipemd160GetKlass (void);</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1794"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-RIPEMD160 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1731"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-RIPEMD160 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1799"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA1ID"></a>xmlSecTransformRsaSha1Id</h3>
+<a name="XMLSECTRANSFORMRSASHA1ID"></a><h3>xmlSecTransformRsaSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha1Id		xmlSecTransformRsaSha1GetKlass()</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1807"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA1GETKLASS"></a>xmlSecTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecTransformRsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha1GetKlass      (void);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1817"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA1 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1752"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1822"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA224ID"></a>xmlSecTransformRsaSha224Id</h3>
+<a name="XMLSECTRANSFORMRSASHA224ID"></a><h3>xmlSecTransformRsaSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha224Id		xmlSecTransformRsaSha224GetKlass()</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1830"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA224GETKLASS"></a>xmlSecTransformRsaSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSASHA224GETKLASS"></a><h3>xmlSecTransformRsaSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha224GetKlass    (void);</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1840"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA224 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1773"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA224 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1845"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA256ID"></a>xmlSecTransformRsaSha256Id</h3>
+<a name="XMLSECTRANSFORMRSASHA256ID"></a><h3>xmlSecTransformRsaSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha256Id		xmlSecTransformRsaSha256GetKlass()</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1853"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA256GETKLASS"></a>xmlSecTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecTransformRsaSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha256GetKlass    (void);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1863"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA256 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1794"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1868"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA384ID"></a>xmlSecTransformRsaSha384Id</h3>
+<a name="XMLSECTRANSFORMRSASHA384ID"></a><h3>xmlSecTransformRsaSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha384Id		xmlSecTransformRsaSha384GetKlass()</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1876"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA384GETKLASS"></a>xmlSecTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecTransformRsaSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha384GetKlass    (void);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA384 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1815"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1891"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA512ID"></a>xmlSecTransformRsaSha512Id</h3>
+<a name="XMLSECTRANSFORMRSASHA512ID"></a><h3>xmlSecTransformRsaSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaSha512Id		xmlSecTransformRsaSha512GetKlass()</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1899"></a><h3>
-<a name="XMLSECTRANSFORMRSASHA512GETKLASS"></a>xmlSecTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecTransformRsaSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaSha512GetKlass    (void);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1909"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA512 signature transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1914"></a><h3>
-<a name="XMLSECTRANSFORMRSAPKCS1ID"></a>xmlSecTransformRsaPkcs1Id</h3>
+<a name="XMLSECTRANSFORMRSAPKCS1ID"></a><h3>xmlSecTransformRsaPkcs1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaPkcs1Id		xmlSecTransformRsaPkcs1GetKlass()</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1922"></a><h3>
-<a name="XMLSECTRANSFORMRSAPKCS1GETKLASS"></a>xmlSecTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaPkcs1GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecTransformRsaPkcs1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaPkcs1GetKlass     (void);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1932"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-PKCS1 key transport transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1857"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1937"></a><h3>
-<a name="XMLSECTRANSFORMRSAOAEPID"></a>xmlSecTransformRsaOaepId</h3>
+<a name="XMLSECTRANSFORMRSAOAEPID"></a><h3>xmlSecTransformRsaOaepId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformRsaOaepId		xmlSecTransformRsaOaepGetKlass()</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1945"></a><h3>
-<a name="XMLSECTRANSFORMRSAOAEPGETKLASS"></a>xmlSecTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRsaOaepGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecTransformRsaOaepGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRsaOaepGetKlass      (void);</pre>
 <p>The RSA-OAEP key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1955"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-OAEP key transport transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1878"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-OAEP key transport transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1960"></a><h3>
-<a name="XMLSECTRANSFORMGOSTR3411-94ID"></a>xmlSecTransformGostR3411_94Id</h3>
+<a name="XMLSECTRANSFORMGOSTR3411-94ID"></a><h3>xmlSecTransformGostR3411_94Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformGostR3411_94Id			xmlSecTransformGostR3411_94GetKlass()</pre>
 <p>The GOSTR3411_94 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1968"></a><h3>
-<a name="XMLSECTRANSFORMGOSTR3411-94GETKLASS"></a>xmlSecTransformGostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformGostR3411_94GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMGOSTR3411-94GETKLASS"></a><h3>xmlSecTransformGostR3411_94GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformGostR3411_94GetKlass (void);</pre>
 <p>GOSTR3411_94 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN1978"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to GOSTR3411_94 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1899"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GOSTR3411_94 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1983"></a><h3>
-<a name="XMLSECTRANSFORMSHA1ID"></a>xmlSecTransformSha1Id</h3>
+<a name="XMLSECTRANSFORMSHA1ID"></a><h3>xmlSecTransformSha1Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha1Id			xmlSecTransformSha1GetKlass()</pre>
 <p>The SHA1 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN1991"></a><h3>
-<a name="XMLSECTRANSFORMSHA1GETKLASS"></a>xmlSecTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMSHA1GETKLASS"></a><h3>xmlSecTransformSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha1GetKlass         (void);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2001"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-1 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1920"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2006"></a><h3>
-<a name="XMLSECTRANSFORMSHA224ID"></a>xmlSecTransformSha224Id</h3>
+<a name="XMLSECTRANSFORMSHA224ID"></a><h3>xmlSecTransformSha224Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha224Id			xmlSecTransformSha224GetKlass()</pre>
 <p>The SHA224 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2014"></a><h3>
-<a name="XMLSECTRANSFORMSHA224GETKLASS"></a>xmlSecTransformSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMSHA224GETKLASS"></a><h3>xmlSecTransformSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha224GetKlass       (void);</pre>
 <p>SHA224 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2024"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA224 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1941"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA224 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2029"></a><h3>
-<a name="XMLSECTRANSFORMSHA256ID"></a>xmlSecTransformSha256Id</h3>
+<a name="XMLSECTRANSFORMSHA256ID"></a><h3>xmlSecTransformSha256Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha256Id			xmlSecTransformSha256GetKlass()</pre>
 <p>The SHA256 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2037"></a><h3>
-<a name="XMLSECTRANSFORMSHA256GETKLASS"></a>xmlSecTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMSHA256GETKLASS"></a><h3>xmlSecTransformSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha256GetKlass       (void);</pre>
 <p>SHA256 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2047"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA256 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1962"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA256 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2052"></a><h3>
-<a name="XMLSECTRANSFORMSHA384ID"></a>xmlSecTransformSha384Id</h3>
+<a name="XMLSECTRANSFORMSHA384ID"></a><h3>xmlSecTransformSha384Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha384Id			xmlSecTransformSha384GetKlass()</pre>
 <p>The SHA384 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2060"></a><h3>
-<a name="XMLSECTRANSFORMSHA384GETKLASS"></a>xmlSecTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMSHA384GETKLASS"></a><h3>xmlSecTransformSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha384GetKlass       (void);</pre>
 <p>SHA384 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2070"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA384 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN1983"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA384 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2075"></a><h3>
-<a name="XMLSECTRANSFORMSHA512ID"></a>xmlSecTransformSha512Id</h3>
+<a name="XMLSECTRANSFORMSHA512ID"></a><h3>xmlSecTransformSha512Id</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformSha512Id			xmlSecTransformSha512GetKlass()</pre>
 <p>The SHA512 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2083"></a><h3>
-<a name="XMLSECTRANSFORMSHA512GETKLASS"></a>xmlSecTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMSHA512GETKLASS"></a><h3>xmlSecTransformSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformSha512GetKlass       (void);</pre>
 <p>SHA512 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA512 digest transform klass or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN2004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA512 digest transform klass or NULL if an error
 occurs (the xmlsec-crypto library is not loaded or this transform is not
 implemented).</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2098"></a><h3>
-<a name="XMLSECCRYPTOAPPINIT"></a>xmlSecCryptoAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppInit             (const <font>char</font> *config);</pre>
+<a name="XMLSECCRYPTOAPPINIT"></a><h3>xmlSecCryptoAppInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppInit                 (const <font>char</font> *config);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
-<var class="PARAMETER">xmlSecInit</var> function.</p>
+<code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2110"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2020"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to crypto library configuration.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2115"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2120"></a><h3>
-<a name="XMLSECCRYPTOAPPSHUTDOWN"></a>xmlSecCryptoAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppShutdown         (void);</pre>
+<a name="XMLSECCRYPTOAPPSHUTDOWN"></a><h3>xmlSecCryptoAppShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppShutdown             (void);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
-<var class="PARAMETER">xmlSecShutdown</var> function.</p>
+<code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2131"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2040"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2136"></a><h3>
-<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"></a>xmlSecCryptoAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppDefaultKeysMngrInit
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
-<p>Initializes <var class="PARAMETER">mngr</var> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
+<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecCryptoAppDefaultKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrInit  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default crypto key data stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2150"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2058"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2155"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2063"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2160"></a><h3>
-<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a>xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppDefaultKeysMngrAdoptKey
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the keys manager <var class="PARAMETER">mngr</var> created with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecCryptoAppDefaultKeysMngrInit</span></a>
+<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecCryptoAppDefaultKeysMngrAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecCryptoAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2176"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2083"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2181"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2088"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2186"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2093"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2191"></a><h3>
-<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a>xmlSecCryptoAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppDefaultKeysMngrLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);</pre>
-<p>Loads XML keys file from <var class="PARAMETER">uri</var> to the keys manager <var class="PARAMETER">mngr</var> created 
+<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecCryptoAppDefaultKeysMngrLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrLoad  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);</pre>
+<p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created 
 with <a href="xmlsec-app.html#XMLSECCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecCryptoAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2207"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2113"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2212"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2118"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2217"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2123"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2222"></a><h3>
-<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a>xmlSecCryptoAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppDefaultKeysMngrSave
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Saves keys from <var class="PARAMETER">mngr</var> to  XML keys file.</p>
+<a name="XMLSECCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecCryptoAppDefaultKeysMngrSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppDefaultKeysMngrSave  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2236"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2141"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2241"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2146"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2246"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2151"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2156"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2256"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOAD"></a>xmlSecCryptoAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppKeysMngrCertLoad (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">filename</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecCryptoAppKeysMngrCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeysMngrCertLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2272"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2176"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2277"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2181"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2282"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2186"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2287"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
+<td align="LEFT" valign="TOP"><a name="AEN2191"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
    			trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2298"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a>xmlSecCryptoAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppKeysMngrCertLoadMemory
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from binary buffer <var class="PARAMETER">data</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecCryptoAppKeysMngrCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeysMngrCertLoadMemory
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2315"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2218"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2320"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2223"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2325"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2228"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2330"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2233"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2335"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2238"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2340"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2243"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2345"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYLOAD"></a>xmlSecCryptoAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecCryptoAppKeyLoad         (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECCRYPTOAPPKEYLOAD"></a><h3>xmlSecCryptoAppKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppKeyLoad              (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2360"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2262"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2365"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2267"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2370"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2272"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2375"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2277"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2380"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2282"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2390"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYLOADMEMORY"></a>xmlSecCryptoAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecCryptoAppKeyLoadMemory   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECCRYPTOAPPKEYLOADMEMORY"></a><h3>xmlSecCryptoAppKeyLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppKeyLoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the memory buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2406"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2307"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2411"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2312"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2416"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2317"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2421"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2322"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2426"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2327"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2431"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2332"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2436"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2337"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2441"></a><h3>
-<a name="XMLSECCRYPTOAPPPKCS12LOAD"></a>xmlSecCryptoAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecCryptoAppPkcs12Load      (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECCRYPTOAPPPKCS12LOAD"></a><h3>xmlSecCryptoAppPkcs12Load ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppPkcs12Load           (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecCryptoAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -1665,37 +1484,35 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2455"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2355"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2460"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2360"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2465"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2365"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2470"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2370"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2475"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2375"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2480"></a><h3>
-<a name="XMLSECCRYPTOAPPPKCS12LOADMEMORY"></a>xmlSecCryptoAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecCryptoAppPkcs12LoadMemory
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECCRYPTOAPPPKCS12LOADMEMORY"></a><h3>xmlSecCryptoAppPkcs12LoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecCryptoAppPkcs12LoadMemory     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecCryptoAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -1703,108 +1520,109 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2495"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2394"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2500"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2399"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2505"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2404"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2510"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2409"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2515"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2414"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2520"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2419"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2525"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYCERTLOAD"></a>xmlSecCryptoAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppKeyCertLoad      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">filename</var> and adds it to key.</p>
+<a name="XMLSECCRYPTOAPPKEYCERTLOAD"></a><h3>xmlSecCryptoAppKeyCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeyCertLoad          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2539"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2437"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2544"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2442"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2549"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2447"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2554"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2452"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2559"></a><h3>
-<a name="XMLSECCRYPTOAPPKEYCERTLOADMEMORY"></a>xmlSecCryptoAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoAppKeyCertLoadMemory
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECCRYPTOAPPKEYCERTLOADMEMORY"></a><h3>xmlSecCryptoAppKeyCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoAppKeyCertLoadMemory    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2573"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2470"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2578"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2475"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2583"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2480"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2588"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2485"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2593"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2490"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2598"></a><h3>
-<a name="XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK"></a>xmlSecCryptoAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*       xmlSecCryptoAppGetDefaultPwdCallback
-                                            (void);</pre>
+<a name="XMLSECCRYPTOAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecCryptoAppGetDefaultPwdCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecCryptoAppGetDefaultPwdCallback
+                                                        (void);</pre>
 <p>Gets default password callback.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN2504"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> default password callback.</p></td>
+</tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-ref.html"><b>&lt;&lt;&lt;XML Security Core Library API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-base64.html"><b>base64&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-ref.html"><b>&lt;&lt;&lt; XML Security Core Library API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-base64.html"><b>base64 &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-base64.html b/docs/api/xmlsec-base64.html
index cdc67e4..d63cac1 100644
--- a/docs/api/xmlsec-base64.html
+++ b/docs/api/xmlsec-base64.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>base64</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-app.html">
 <link rel="NEXT" title="bn" href="xmlsec-bn.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,294 +87,281 @@
 <h1>
 <a name="XMLSEC-BASE64"></a>base64</h1>
 <div class="REFNAMEDIV">
-<a name="AEN2612"></a><h2>Name</h2>base64--Base64 encoding/decoding functions.</div>
+<a name="AEN2514"></a><h2>Name</h2>base64 -- Base64 encoding/decoding functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN2615"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC_BASE64_LINESIZE</a>
-<font>int</font>         <a href="xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">xmlSecBase64GetDefaultLineSize</a>  (void);
-<font>void</font>        <a href="xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">xmlSecBase64SetDefaultLineSize</a>  (<font>int</font> columns);
-<font>xmlSecBase64CtxPtr</font> <a href="xmlsec-base64.html#XMLSECBASE64CTXCREATE">xmlSecBase64CtxCreate</a>    (<font>int</font> encode,
-                                             <font>int</font> columns);
-<font>void</font>        <a href="xmlsec-base64.html#XMLSECBASE64CTXDESTROY">xmlSecBase64CtxDestroy</a>          (<font>xmlSecBase64CtxPtr</font> ctx);
-<font>int</font>         <a href="xmlsec-base64.html#XMLSECBASE64CTXINITIALIZE">xmlSecBase64CtxInitialize</a>       (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             <font>int</font> encode,
-                                             <font>int</font> columns);
-<font>void</font>        <a href="xmlsec-base64.html#XMLSECBASE64CTXFINALIZE">xmlSecBase64CtxFinalize</a>         (<font>xmlSecBase64CtxPtr</font> ctx);
-<font>int</font>         <a href="xmlsec-base64.html#XMLSECBASE64CTXUPDATE">xmlSecBase64CtxUpdate</a>           (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
-<font>int</font>         <a href="xmlsec-base64.html#XMLSECBASE64CTXFINAL">xmlSecBase64CtxFinal</a>            (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
-<font>xmlChar</font>*    <a href="xmlsec-base64.html#XMLSECBASE64ENCODE">xmlSecBase64Encode</a>              (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
-                                             <font>int</font> columns);
-<font>int</font>         <a href="xmlsec-base64.html#XMLSECBASE64DECODE">xmlSecBase64Decode</a>              (const <font>xmlChar</font> *str,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<a name="XMLSEC-BASE64.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE--CAPS">XMLSEC_BASE64_LINESIZE</a>
+<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">xmlSecBase64GetDefaultLineSize</a>      (void);
+<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">xmlSecBase64SetDefaultLineSize</a>      (<font>int</font> columns);
+<font>xmlSecBase64CtxPtr</font>  <a href="xmlsec-base64.html#XMLSECBASE64CTXCREATE">xmlSecBase64CtxCreate</a>               (<font>int</font> encode,
+                                                         <font>int</font> columns);
+<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64CTXDESTROY">xmlSecBase64CtxDestroy</a>              (<font>xmlSecBase64CtxPtr</font> ctx);
+<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXINITIALIZE">xmlSecBase64CtxInitialize</a>           (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         <font>int</font> encode,
+                                                         <font>int</font> columns);
+<font>void</font>                <a href="xmlsec-base64.html#XMLSECBASE64CTXFINALIZE">xmlSecBase64CtxFinalize</a>             (<font>xmlSecBase64CtxPtr</font> ctx);
+<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXUPDATE">xmlSecBase64CtxUpdate</a>               (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
+<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64CTXFINAL">xmlSecBase64CtxFinal</a>                (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);
+<font>xmlChar</font>*            <a href="xmlsec-base64.html#XMLSECBASE64ENCODE">xmlSecBase64Encode</a>                  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
+                                                         <font>int</font> columns);
+<font>int</font>                 <a href="xmlsec-base64.html#XMLSECBASE64DECODE">xmlSecBase64Decode</a>                  (const <font>xmlChar</font> *str,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN2661"></a><h2>Description</h2>
+<a name="XMLSEC-BASE64.DESCRIPTION"></a><h2>Description</h2>
 <p>Base64 encoding/decoding functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN2664"></a><h2>Details</h2>
+<a name="XMLSEC-BASE64.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN2666"></a><h3>
-<a name="XMLSEC-BASE64-LINESIZE-CAPS"></a>XMLSEC_BASE64_LINESIZE</h3>
+<a name="XMLSEC-BASE64-LINESIZE--CAPS"></a><h3>XMLSEC_BASE64_LINESIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_BASE64_LINESIZE				64</pre>
 <p>The default maximum base64 encoded line size.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2674"></a><h3>
-<a name="XMLSECBASE64GETDEFAULTLINESIZE"></a>xmlSecBase64GetDefaultLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBase64GetDefaultLineSize  (void);</pre>
+<a name="XMLSECBASE64GETDEFAULTLINESIZE"></a><h3>xmlSecBase64GetDefaultLineSize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64GetDefaultLineSize      (void);</pre>
 <p>Gets the current default line size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2684"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the current default line size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the current default line size.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2689"></a><h3>
-<a name="XMLSECBASE64SETDEFAULTLINESIZE"></a>xmlSecBase64SetDefaultLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBase64SetDefaultLineSize  (<font>int</font> columns);</pre>
+<a name="XMLSECBASE64SETDEFAULTLINESIZE"></a><h3>xmlSecBase64SetDefaultLineSize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64SetDefaultLineSize      (<font>int</font> columns);</pre>
 <p>Sets the current default line size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2700"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2599"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> number of columns</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2705"></a><h3>
-<a name="XMLSECBASE64CTXCREATE"></a>xmlSecBase64CtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBase64CtxPtr</font> xmlSecBase64CtxCreate    (<font>int</font> encode,
-                                             <font>int</font> columns);</pre>
+<a name="XMLSECBASE64CTXCREATE"></a><h3>xmlSecBase64CtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBase64CtxPtr</font>  xmlSecBase64CtxCreate               (<font>int</font> encode,
+                                                         <font>int</font> columns);</pre>
 <p>Allocates and initializes new base64 context.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2717"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2615"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the encode/decode flag (1 - encode, 0 - decode) </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2722"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2620"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the max line length.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2727"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>a pointer to newly created <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure
+<td align="LEFT" valign="TOP"><a name="AEN2625"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> a pointer to newly created <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2734"></a><h3>
-<a name="XMLSECBASE64CTXDESTROY"></a>xmlSecBase64CtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBase64CtxDestroy          (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
+<a name="XMLSECBASE64CTXDESTROY"></a><h3>xmlSecBase64CtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64CtxDestroy              (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
 <p>Destroys base64 context.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2745"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2642"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2752"></a><h3>
-<a name="XMLSECBASE64CTXINITIALIZE"></a>xmlSecBase64CtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBase64CtxInitialize       (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             <font>int</font> encode,
-                                             <font>int</font> columns);</pre>
+<a name="XMLSECBASE64CTXINITIALIZE"></a><h3>xmlSecBase64CtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxInitialize           (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         <font>int</font> encode,
+                                                         <font>int</font> columns);</pre>
 <p>Initializes new base64 context.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2765"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2661"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2772"><span style="white-space: nowrap"><var class="PARAMETER">encode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2668"><span style="white-space: nowrap"><code class="PARAMETER">encode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the encode/decode flag (1 - encode, 0 - decode) </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2777"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2673"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the max line length.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2782"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2678"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2787"></a><h3>
-<a name="XMLSECBASE64CTXFINALIZE"></a>xmlSecBase64CtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBase64CtxFinalize         (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
-<p>Frees all the resources allocated by <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECBASE64CTXFINALIZE"></a><h3>xmlSecBase64CtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBase64CtxFinalize             (<font>xmlSecBase64CtxPtr</font> ctx);</pre>
+<p>Frees all the resources allocated by <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN2799"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2694"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure,</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2806"></a><h3>
-<a name="XMLSECBASE64CTXUPDATE"></a>xmlSecBase64CtxUpdate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBase64CtxUpdate           (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
+<a name="XMLSECBASE64CTXUPDATE"></a><h3>xmlSecBase64CtxUpdate ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxUpdate               (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *in,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> inSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
 <p>Encodes or decodes the next piece of data from input buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2821"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2715"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2828"><span style="white-space: nowrap"><var class="PARAMETER">in</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2722"><span style="white-space: nowrap"><code class="PARAMETER">in</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2833"><span style="white-space: nowrap"><var class="PARAMETER">inSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2727"><span style="white-space: nowrap"><code class="PARAMETER">inSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2838"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2732"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2843"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2737"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2848"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the number of bytes written to output buffer or 
+<td align="LEFT" valign="TOP"><a name="AEN2742"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the number of bytes written to output buffer or 
 -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2853"></a><h3>
-<a name="XMLSECBASE64CTXFINAL"></a>xmlSecBase64CtxFinal ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBase64CtxFinal            (<font>xmlSecBase64CtxPtr</font> ctx,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
+<a name="XMLSECBASE64CTXFINAL"></a><h3>xmlSecBase64CtxFinal ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64CtxFinal                (<font>xmlSecBase64CtxPtr</font> ctx,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *out,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> outSize);</pre>
 <p>Encodes or decodes the last piece of data stored in the context
 and finalizes the result.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2866"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the pointer to <font><span class="TYPE">xmlSecBase64Ctx</span></font> structure</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN2759"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the pointer to <gtkdoclink href="XMLSECBASE64CTX"><span class="TYPE">xmlSecBase64Ctx</span></gtkdoclink> structure</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2873"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2766"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2878"><span style="white-space: nowrap"><var class="PARAMETER">outSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2771"><span style="white-space: nowrap"><code class="PARAMETER">outSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2883"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the number of bytes written to output buffer or 
+<td align="LEFT" valign="TOP"><a name="AEN2776"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the number of bytes written to output buffer or 
 -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2888"></a><h3>
-<a name="XMLSECBASE64ENCODE"></a>xmlSecBase64Encode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecBase64Encode              (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
-                                             <font>int</font> columns);</pre>
+<a name="XMLSECBASE64ENCODE"></a><h3>xmlSecBase64Encode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBase64Encode                  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len,
+                                                         <font>int</font> columns);</pre>
 <p>Encodes the data from input buffer and allocates the string for the result.
 The caller is responsible for freeing returned buffer using
-<font><code class="FUNCTION">xmlFree()</code></font> function.</p>
+<gtkdoclink href="XMLFREE"><code class="FUNCTION">xmlFree()</code></gtkdoclink> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2903"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2795"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2908"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2800"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2913"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2805"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output max line length (if 0 then no line breaks
          		would be inserted)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2918"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>newly allocated string with base64 encoded data 
+<td align="LEFT" valign="TOP"><a name="AEN2810"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> newly allocated string with base64 encoded data 
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN2923"></a><h3>
-<a name="XMLSECBASE64DECODE"></a>xmlSecBase64Decode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBase64Decode              (const <font>xmlChar</font> *str,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<a name="XMLSECBASE64DECODE"></a><h3>xmlSecBase64Decode ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBase64Decode                  (const <font>xmlChar</font> *str,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
 <p>Decodes input base64 encoded string and puts result into
 the output buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2936"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2827"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer with base64 encoded string</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2941"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2832"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2946"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2837"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN2951"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the number of bytes written to the output buffer or 
+<td align="LEFT" valign="TOP"><a name="AEN2842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the number of bytes written to the output buffer or 
 a negative value if an error occurs </p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-app.html"><b>&lt;&lt;&lt;app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-bn.html"><b>bn&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-app.html"><b>&lt;&lt;&lt; app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-bn.html"><b>bn &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-bn.html b/docs/api/xmlsec-bn.html
index f4b545a..8eed405 100644
--- a/docs/api/xmlsec-bn.html
+++ b/docs/api/xmlsec-bn.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>bn</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="base64" href="xmlsec-base64.html">
 <link rel="NEXT" title="buffer" href="xmlsec-buffer.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,73 +87,70 @@
 <h1>
 <a name="XMLSEC-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN2961"></a><h2>Name</h2>bn--Big numbers support functions.</div>
+<a name="AEN2852"></a><h2>Name</h2>bn -- Big numbers support functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN2964"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-enum        <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a>;
-<font>xmlSecBnPtr</font> <a href="xmlsec-bn.html#XMLSECBNCREATE">xmlSecBnCreate</a>                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-bn.html#XMLSECBNDESTROY">xmlSecBnDestroy</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNINITIALIZE">xmlSecBnInitialize</a>              (<font>xmlSecBnPtr</font> bn,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-bn.html#XMLSECBNFINALIZE">xmlSecBnFinalize</a>                (<font>xmlSecBnPtr</font> bn);
-<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>* <a href="xmlsec-bn.html#XMLSECBNGETDATA">xmlSecBnGetData</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNSETDATA">xmlSecBnSetData</a>                 (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-bn.html#XMLSECBNGETSIZE">xmlSecBnGetSize</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>void</font>        <a href="xmlsec-bn.html#XMLSECBNZERO">xmlSecBnZero</a>                    (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNFROMSTRING">xmlSecBnFromString</a>              (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
-<font>xmlChar</font>*    <a href="xmlsec-bn.html#XMLSECBNTOSTRING">xmlSecBnToString</a>                (<font>xmlSecBnPtr</font> bn,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNFROMHEXSTRING">xmlSecBnFromHexString</a>           (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str);
-<font>xmlChar</font>*    <a href="xmlsec-bn.html#XMLSECBNTOHEXSTRING">xmlSecBnToHexString</a>             (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNFROMDECSTRING">xmlSecBnFromDecString</a>           (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str);
-<font>xmlChar</font>*    <a href="xmlsec-bn.html#XMLSECBNTODECSTRING">xmlSecBnToDecString</a>             (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNMUL">xmlSecBnMul</a>                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> multiplier);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNDIV">xmlSecBnDiv</a>                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> divider,
-                                             <font>int</font> *mod);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNADD">xmlSecBnAdd</a>                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> delta);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNREVERSE">xmlSecBnReverse</a>                 (<font>xmlSecBnPtr</font> bn);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNCOMPARE">xmlSecBnCompare</a>                 (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNCOMPAREREVERSE">xmlSecBnCompareReverse</a>          (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNGETNODEVALUE">xmlSecBnGetNodeValue</a>            (<font>xmlSecBnPtr</font> bn,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNSETNODEVALUE">xmlSecBnSetNodeValue</a>            (<font>xmlSecBnPtr</font> bn,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse,
-                                             <font>int</font> addLineBreaks);
-<font>int</font>         <a href="xmlsec-bn.html#XMLSECBNBLOBSETNODEVALUE">xmlSecBnBlobSetNodeValue</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse,
-                                             <font>int</font> addLineBreaks);</pre>
+<a name="XMLSEC-BN.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">enum                <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a>;
+<font>xmlSecBnPtr</font>         <a href="xmlsec-bn.html#XMLSECBNCREATE">xmlSecBnCreate</a>                      (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNDESTROY">xmlSecBnDestroy</a>                     (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNINITIALIZE">xmlSecBnInitialize</a>                  (<font>xmlSecBnPtr</font> bn,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNFINALIZE">xmlSecBnFinalize</a>                    (<font>xmlSecBnPtr</font> bn);
+<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         <a href="xmlsec-bn.html#XMLSECBNGETDATA">xmlSecBnGetData</a>                     (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNSETDATA">xmlSecBnSetData</a>                     (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-bn.html#XMLSECBNGETSIZE">xmlSecBnGetSize</a>                     (<font>xmlSecBnPtr</font> bn);
+<font>void</font>                <a href="xmlsec-bn.html#XMLSECBNZERO">xmlSecBnZero</a>                        (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMSTRING">xmlSecBnFromString</a>                  (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
+<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTOSTRING">xmlSecBnToString</a>                    (<font>xmlSecBnPtr</font> bn,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMHEXSTRING">xmlSecBnFromHexString</a>               (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str);
+<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTOHEXSTRING">xmlSecBnToHexString</a>                 (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNFROMDECSTRING">xmlSecBnFromDecString</a>               (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str);
+<font>xmlChar</font>*            <a href="xmlsec-bn.html#XMLSECBNTODECSTRING">xmlSecBnToDecString</a>                 (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNMUL">xmlSecBnMul</a>                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> multiplier);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNDIV">xmlSecBnDiv</a>                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> divider,
+                                                         <font>int</font> *mod);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNADD">xmlSecBnAdd</a>                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> delta);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNREVERSE">xmlSecBnReverse</a>                     (<font>xmlSecBnPtr</font> bn);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNCOMPARE">xmlSecBnCompare</a>                     (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNCOMPAREREVERSE">xmlSecBnCompareReverse</a>              (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNGETNODEVALUE">xmlSecBnGetNodeValue</a>                (<font>xmlSecBnPtr</font> bn,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNSETNODEVALUE">xmlSecBnSetNodeValue</a>                (<font>xmlSecBnPtr</font> bn,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse,
+                                                         <font>int</font> addLineBreaks);
+<font>int</font>                 <a href="xmlsec-bn.html#XMLSECBNBLOBSETNODEVALUE">xmlSecBnBlobSetNodeValue</a>            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse,
+                                                         <font>int</font> addLineBreaks);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN3065"></a><h2>Description</h2>
+<a name="XMLSEC-BN.DESCRIPTION"></a><h2>Description</h2>
 <p>Big numbers support functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN3068"></a><h2>Details</h2>
+<a name="XMLSEC-BN.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN3070"></a><h3>
-<a name="XMLSECBNFORMAT"></a>enum xmlSecBnFormat</h3>
+<a name="XMLSECBNFORMAT"></a><h3>enum xmlSecBnFormat</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecBnBase64,
     xmlSecBnHex,
@@ -165,591 +161,568 @@ enum        <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3079"><span style="white-space: nowrap"><var class="LITERAL">xmlSecBnBase64</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECBNBASE64"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnBase64</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the base64 decoded binary blob.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3084"><span style="white-space: nowrap"><var class="LITERAL">xmlSecBnHex</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECBNHEX"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnHex</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the hex number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3089"><span style="white-space: nowrap"><var class="LITERAL">xmlSecBnDec</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECBNDEC"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecBnDec</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the decimal number.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3094"></a><h3>
-<a name="XMLSECBNCREATE"></a>xmlSecBnCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBnPtr</font> xmlSecBnCreate                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<a name="XMLSECBNCREATE"></a><h3>xmlSecBnCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBnPtr</font>         xmlSecBnCreate                      (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
 <p>Creates a new BN object. Caller is responsible for destroying it
-by calling <var class="PARAMETER">xmlSecBnDestroy</var> function.</p>
+by calling <code class="PARAMETER">xmlSecBnDestroy</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3106"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN2995"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the initial allocated BN size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3111"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the newly BN or a NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3000"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the newly BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3116"></a><h3>
-<a name="XMLSECBNDESTROY"></a>xmlSecBnDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBnDestroy                 (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Destroys <var class="PARAMETER">bn</var> object created with <var class="PARAMETER">xmlSecBnCreate</var> function.</p>
+<a name="XMLSECBNDESTROY"></a><h3>xmlSecBnDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnDestroy                     (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Destroys <code class="PARAMETER">bn</code> object created with <code class="PARAMETER">xmlSecBnCreate</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3129"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3017"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3134"></a><h3>
-<a name="XMLSECBNINITIALIZE"></a>xmlSecBnInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnInitialize              (<font>xmlSecBnPtr</font> bn,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<a name="XMLSECBNINITIALIZE"></a><h3>xmlSecBnInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnInitialize                  (<font>xmlSecBnPtr</font> bn,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
 <p>Initializes a BN object. Caller is responsible for destroying it
-by calling <var class="PARAMETER">xmlSecBnFinalize</var> function.</p>
+by calling <code class="PARAMETER">xmlSecBnFinalize</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3147"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3034"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3152"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3039"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the initial allocated BN size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3157"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3044"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3162"></a><h3>
-<a name="XMLSECBNFINALIZE"></a>xmlSecBnFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBnFinalize                (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Destroys <var class="PARAMETER">bn</var> object created with <var class="PARAMETER">xmlSecBnInitialize</var> function.</p>
+<a name="XMLSECBNFINALIZE"></a><h3>xmlSecBnFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnFinalize                    (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Destroys <code class="PARAMETER">bn</code> object created with <code class="PARAMETER">xmlSecBnInitialize</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3175"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3061"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3180"></a><h3>
-<a name="XMLSECBNGETDATA"></a>xmlSecBnGetData ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>* xmlSecBnGetData                 (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Gets pointer to the binary <var class="PARAMETER">bn</var> representation.</p>
+<a name="XMLSECBNGETDATA"></a><h3>xmlSecBnGetData ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         xmlSecBnGetData                     (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Gets pointer to the binary <code class="PARAMETER">bn</code> representation.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3192"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3077"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to binary BN data or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3082"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to binary BN data or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3202"></a><h3>
-<a name="XMLSECBNSETDATA"></a>xmlSecBnSetData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnSetData                 (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Sets the value of <var class="PARAMETER">bn</var> to <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECBNSETDATA"></a><h3>xmlSecBnSetData ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnSetData                     (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Sets the value of <code class="PARAMETER">bn</code> to <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3217"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3101"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3222"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3106"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to new BN binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3227"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3111"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the size of new BN data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3232"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3237"></a><h3>
-<a name="XMLSECBNGETSIZE"></a>xmlSecBnGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecBnGetSize                 (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Gets the size of binary data in <var class="PARAMETER">bn</var>.</p>
+<a name="XMLSECBNGETSIZE"></a><h3>xmlSecBnGetSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBnGetSize                     (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Gets the size of binary data in <code class="PARAMETER">bn</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3249"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3132"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3254"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the size of binary data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the size of binary data.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3259"></a><h3>
-<a name="XMLSECBNZERO"></a>xmlSecBnZero ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBnZero                    (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Sets the value of <var class="PARAMETER">bn</var> to zero.</p>
+<a name="XMLSECBNZERO"></a><h3>xmlSecBnZero ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBnZero                        (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Sets the value of <code class="PARAMETER">bn</code> to zero.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3271"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3153"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3276"></a><h3>
-<a name="XMLSECBNFROMSTRING"></a>xmlSecBnFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnFromString              (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
-<p>Reads <var class="PARAMETER">bn</var> from string <var class="PARAMETER">str</var> assuming it has base <var class="PARAMETER">base</var>.</p>
+<a name="XMLSECBNFROMSTRING"></a><h3>xmlSecBnFromString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromString                  (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
+<p>Reads <code class="PARAMETER">bn</code> from string <code class="PARAMETER">str</code> assuming it has base <code class="PARAMETER">base</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3292"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3173"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3297"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3178"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3302"><span style="white-space: nowrap"><var class="PARAMETER">base</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>	the base for <var class="PARAMETER">str</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3183"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the base for <code class="PARAMETER">str</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3308"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3189"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3313"></a><h3>
-<a name="XMLSECBNTOSTRING"></a>xmlSecBnToString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecBnToString                (<font>xmlSecBnPtr</font> bn,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
-<p>Writes <var class="PARAMETER">bn</var> to string with base <var class="PARAMETER">base</var>. Caller is responsible for 
-freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
+<a name="XMLSECBNTOSTRING"></a><h3>xmlSecBnToString ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToString                    (<font>xmlSecBnPtr</font> bn,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> base);</pre>
+<p>Writes <code class="PARAMETER">bn</code> to string with base <code class="PARAMETER">base</code>. Caller is responsible for 
+freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3328"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3208"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3333"><span style="white-space: nowrap"><var class="PARAMETER">base</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3213"><span style="white-space: nowrap"><code class="PARAMETER">base</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the base for returned string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the string represenataion if BN or a NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3218"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3343"></a><h3>
-<a name="XMLSECBNFROMHEXSTRING"></a>xmlSecBnFromHexString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnFromHexString           (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str);</pre>
-<p>Reads <var class="PARAMETER">bn</var> from hex string <var class="PARAMETER">str</var>.</p>
+<a name="XMLSECBNFROMHEXSTRING"></a><h3>xmlSecBnFromHexString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromHexString               (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str);</pre>
+<p>Reads <code class="PARAMETER">bn</code> from hex string <code class="PARAMETER">str</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3357"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3236"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3362"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3241"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3367"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3246"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3372"></a><h3>
-<a name="XMLSECBNTOHEXSTRING"></a>xmlSecBnToHexString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecBnToHexString             (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Writes <var class="PARAMETER">bn</var> to hex string. Caller is responsible for 
-freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
+<a name="XMLSECBNTOHEXSTRING"></a><h3>xmlSecBnToHexString ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToHexString                 (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Writes <code class="PARAMETER">bn</code> to hex string. Caller is responsible for 
+freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3385"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3263"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3390"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the string represenataion if BN or a NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3268"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3395"></a><h3>
-<a name="XMLSECBNFROMDECSTRING"></a>xmlSecBnFromDecString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnFromDecString           (<font>xmlSecBnPtr</font> bn,
-                                             const <font>xmlChar</font> *str);</pre>
-<p>Reads <var class="PARAMETER">bn</var> from decimal string <var class="PARAMETER">str</var>.</p>
+<a name="XMLSECBNFROMDECSTRING"></a><h3>xmlSecBnFromDecString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnFromDecString               (<font>xmlSecBnPtr</font> bn,
+                                                         const <font>xmlChar</font> *str);</pre>
+<p>Reads <code class="PARAMETER">bn</code> from decimal string <code class="PARAMETER">str</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3409"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3286"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3414"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3291"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the string with BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3419"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3424"></a><h3>
-<a name="XMLSECBNTODECSTRING"></a>xmlSecBnToDecString ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecBnToDecString             (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Writes <var class="PARAMETER">bn</var> to decimal string. Caller is responsible for 
-freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
+<a name="XMLSECBNTODECSTRING"></a><h3>xmlSecBnToDecString ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecBnToDecString                 (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Writes <code class="PARAMETER">bn</code> to decimal string. Caller is responsible for 
+freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3437"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3313"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the string represenataion if BN or a NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3318"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the string represenataion if BN or a NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3447"></a><h3>
-<a name="XMLSECBNMUL"></a>xmlSecBnMul ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnMul                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> multiplier);</pre>
-<p>Multiplies <var class="PARAMETER">bn</var> with <var class="PARAMETER">multiplier</var>.</p>
+<a name="XMLSECBNMUL"></a><h3>xmlSecBnMul ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnMul                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> multiplier);</pre>
+<p>Multiplies <code class="PARAMETER">bn</code> with <code class="PARAMETER">multiplier</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3461"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3336"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3466"><span style="white-space: nowrap"><var class="PARAMETER">multiplier</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3341"><span style="white-space: nowrap"><code class="PARAMETER">multiplier</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the multiplier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3471"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3476"></a><h3>
-<a name="XMLSECBNDIV"></a>xmlSecBnDiv ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnDiv                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> divider,
-                                             <font>int</font> *mod);</pre>
-<p>Divides <var class="PARAMETER">bn</var> by <var class="PARAMETER">divider</var> and places modulus into <var class="PARAMETER">mod</var>.</p>
+<a name="XMLSECBNDIV"></a><h3>xmlSecBnDiv ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnDiv                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> divider,
+                                                         <font>int</font> *mod);</pre>
+<p>Divides <code class="PARAMETER">bn</code> by <code class="PARAMETER">divider</code> and places modulus into <code class="PARAMETER">mod</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3492"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3366"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3497"><span style="white-space: nowrap"><var class="PARAMETER">divider</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3371"><span style="white-space: nowrap"><code class="PARAMETER">divider</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the divider</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3502"><span style="white-space: nowrap"><var class="PARAMETER">mod</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3376"><span style="white-space: nowrap"><code class="PARAMETER">mod</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer for modulus result.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3507"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3381"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3512"></a><h3>
-<a name="XMLSECBNADD"></a>xmlSecBnAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnAdd                     (<font>xmlSecBnPtr</font> bn,
-                                             <font>int</font> delta);</pre>
-<p>Adds <var class="PARAMETER">delta</var> to <var class="PARAMETER">bn</var>.</p>
+<a name="XMLSECBNADD"></a><h3>xmlSecBnAdd ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnAdd                         (<font>xmlSecBnPtr</font> bn,
+                                                         <font>int</font> delta);</pre>
+<p>Adds <code class="PARAMETER">delta</code> to <code class="PARAMETER">bn</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3526"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3399"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3531"><span style="white-space: nowrap"><var class="PARAMETER">delta</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3404"><span style="white-space: nowrap"><code class="PARAMETER">delta</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the delta.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3536"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3409"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3541"></a><h3>
-<a name="XMLSECBNREVERSE"></a>xmlSecBnReverse ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnReverse                 (<font>xmlSecBnPtr</font> bn);</pre>
-<p>Reverses bytes order in <var class="PARAMETER">bn</var>.</p>
+<a name="XMLSECBNREVERSE"></a><h3>xmlSecBnReverse ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnReverse                     (<font>xmlSecBnPtr</font> bn);</pre>
+<p>Reverses bytes order in <code class="PARAMETER">bn</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3553"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3425"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3558"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3430"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3563"></a><h3>
-<a name="XMLSECBNCOMPARE"></a>xmlSecBnCompare ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnCompare                 (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
-<p>Compares the <var class="PARAMETER">bn</var> with <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECBNCOMPARE"></a><h3>xmlSecBnCompare ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnCompare                     (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<p>Compares the <code class="PARAMETER">bn</code> with <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3578"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3449"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3583"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3454"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the data to compare BN to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3588"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>	the <var class="PARAMETER">data</var> size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3459"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the <code class="PARAMETER">data</code> size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3594"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 if data is equal, negative value if <var class="PARAMETER">bn</var> is less or positive value if <var class="PARAMETER">bn</var>
-is greater than <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 if data is equal, negative value if <code class="PARAMETER">bn</code> is less or positive value if <code class="PARAMETER">bn</code>
+is greater than <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3602"></a><h3>
-<a name="XMLSECBNCOMPAREREVERSE"></a>xmlSecBnCompareReverse ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnCompareReverse          (<font>xmlSecBnPtr</font> bn,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
-<p>Compares the <var class="PARAMETER">bn</var> with reverse <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECBNCOMPAREREVERSE"></a><h3>xmlSecBnCompareReverse ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnCompareReverse              (<font>xmlSecBnPtr</font> bn,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<p>Compares the <code class="PARAMETER">bn</code> with reverse <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3617"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3487"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3622"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3492"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the data to compare BN to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3627"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>	the <var class="PARAMETER">data</var> size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3497"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the <code class="PARAMETER">data</code> size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3633"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 if data is equal, negative value if <var class="PARAMETER">bn</var> is less or positive value if <var class="PARAMETER">bn</var>
-is greater than <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3503"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 if data is equal, negative value if <code class="PARAMETER">bn</code> is less or positive value if <code class="PARAMETER">bn</code>
+is greater than <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3641"></a><h3>
-<a name="XMLSECBNGETNODEVALUE"></a>xmlSecBnGetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnGetNodeValue            (<font>xmlSecBnPtr</font> bn,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse);</pre>
-<p>Converts the node content from <var class="PARAMETER">format</var> to <var class="PARAMETER">bn</var>.</p>
+<a name="XMLSECBNGETNODEVALUE"></a><h3>xmlSecBnGetNodeValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnGetNodeValue                (<font>xmlSecBnPtr</font> bn,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse);</pre>
+<p>Converts the node content from <code class="PARAMETER">format</code> to <code class="PARAMETER">bn</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3657"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3526"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3662"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3531"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3667"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3536"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3672"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3541"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	if set then reverse read buffer after reading.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative values if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3546"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3682"></a><h3>
-<a name="XMLSECBNSETNODEVALUE"></a>xmlSecBnSetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnSetNodeValue            (<font>xmlSecBnPtr</font> bn,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse,
-                                             <font>int</font> addLineBreaks);</pre>
-<p>Converts the <var class="PARAMETER">bn</var> and sets it to node content.</p>
+<a name="XMLSECBNSETNODEVALUE"></a><h3>xmlSecBnSetNodeValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnSetNodeValue                (<font>xmlSecBnPtr</font> bn,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse,
+                                                         <font>int</font> addLineBreaks);</pre>
+<p>Converts the <code class="PARAMETER">bn</code> and sets it to node content.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3698"><span style="white-space: nowrap"><var class="PARAMETER">bn</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3566"><span style="white-space: nowrap"><code class="PARAMETER">bn</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to BN.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3703"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3571"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3708"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3576"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3713"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3581"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag that indicates whether to reverse the buffer before writing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3718"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3586"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  	the flag; it is equal to 1 then linebreaks will be added before and after new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3723"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative values if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3591"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3728"></a><h3>
-<a name="XMLSECBNBLOBSETNODEVALUE"></a>xmlSecBnBlobSetNodeValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBnBlobSetNodeValue        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>xmlNodePtr</font> cur,
-                                             <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
-                                             <font>int</font> reverse,
-                                             <font>int</font> addLineBreaks);</pre>
-<p>Converts the <var class="PARAMETER">blob</var> and sets it to node content.</p>
+<a name="XMLSECBNBLOBSETNODEVALUE"></a><h3>xmlSecBnBlobSetNodeValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBnBlobSetNodeValue            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <a href="xmlsec-bn.html#XMLSECBNFORMAT">xmlSecBnFormat</a> format,
+                                                         <font>int</font> reverse,
+                                                         <font>int</font> addLineBreaks);</pre>
+<p>Converts the <code class="PARAMETER">blob</code> and sets it to node content.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3745"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3612"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to BN blob.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3750"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3617"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the size of BN blob.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3755"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3622"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3760"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3627"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the BN format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3765"><span style="white-space: nowrap"><var class="PARAMETER">reverse</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3632"><span style="white-space: nowrap"><code class="PARAMETER">reverse</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the flag that indicates whether to reverse the buffer before writing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3770"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3637"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3775"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative values if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3642"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative values if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-base64.html"><b>&lt;&lt;&lt;base64</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-buffer.html"><b>buffer&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-base64.html"><b>&lt;&lt;&lt; base64</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-buffer.html"><b>buffer &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-buffer.html b/docs/api/xmlsec-buffer.html
index 979b5b3..69dab38 100644
--- a/docs/api/xmlsec-buffer.html
+++ b/docs/api/xmlsec-buffer.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>buffer</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="bn" href="xmlsec-bn.html">
 <link rel="NEXT" title="dl" href="xmlsec-dl.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,77 +87,71 @@
 <h1>
 <a name="XMLSEC-BUFFER"></a>buffer</h1>
 <div class="REFNAMEDIV">
-<a name="AEN3785"></a><h2>Name</h2>buffer--Binary buffer implementation.</div>
+<a name="AEN3652"></a><h2>Name</h2>buffer -- Binary buffer implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN3788"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-enum        <a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a>;
-struct      <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
-<font>void</font>        <a href="xmlsec-buffer.html#XMLSECBUFFERSETDEFAULTALLOCMODE">xmlSecBufferSetDefaultAllocMode</a> (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE">xmlSecBufferCreate</a>          (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY">xmlSecBufferDestroy</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE">xmlSecBufferInitialize</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE">xmlSecBufferFinalize</a>            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>* <a href="xmlsec-buffer.html#XMLSECBUFFERGETDATA">xmlSecBufferGetData</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERSETDATA">xmlSecBufferSetData</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-buffer.html#XMLSECBUFFERGETSIZE">xmlSecBufferGetSize</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERSETSIZE">xmlSecBufferSetSize</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-buffer.html#XMLSECBUFFERGETMAXSIZE">xmlSecBufferGetMaxSize</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERSETMAXSIZE">xmlSecBufferSetMaxSize</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-buffer.html#XMLSECBUFFEREMPTY">xmlSecBufferEmpty</a>               (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERAPPEND">xmlSecBufferAppend</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERPREPEND">xmlSecBufferPrepend</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVEHEAD">xmlSecBufferRemoveHead</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVETAIL">xmlSecBufferRemoveTail</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERREADFILE">xmlSecBufferReadFile</a>            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <font>char</font> *filename);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTREAD">xmlSecBufferBase64NodeContentRead</a>
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <font>xmlNodePtr</font> node);
-<font>int</font>         <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTWRITE">xmlSecBufferBase64NodeContentWrite</a>
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> columns);
-<font>xmlOutputBufferPtr</font> <a href="xmlsec-buffer.html#XMLSECBUFFERCREATEOUTPUTBUFFER">xmlSecBufferCreateOutputBuffer</a>
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSEC-BUFFER.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">enum                <a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a>;
+struct              <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
+<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERSETDEFAULTALLOCMODE">xmlSecBufferSetDefaultAllocMode</a>     (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
+<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE">xmlSecBufferCreate</a>                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY">xmlSecBufferDestroy</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE">xmlSecBufferInitialize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE">xmlSecBufferFinalize</a>                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         <a href="xmlsec-buffer.html#XMLSECBUFFERGETDATA">xmlSecBufferGetData</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETDATA">xmlSecBufferSetData</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETSIZE">xmlSecBufferGetSize</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETSIZE">xmlSecBufferSetSize</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-buffer.html#XMLSECBUFFERGETMAXSIZE">xmlSecBufferGetMaxSize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERSETMAXSIZE">xmlSecBufferSetMaxSize</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-buffer.html#XMLSECBUFFEREMPTY">xmlSecBufferEmpty</a>                   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERAPPEND">xmlSecBufferAppend</a>                  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERPREPEND">xmlSecBufferPrepend</a>                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVEHEAD">xmlSecBufferRemoveHead</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREMOVETAIL">xmlSecBufferRemoveTail</a>              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERREADFILE">xmlSecBufferReadFile</a>                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <font>char</font> *filename);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTREAD">xmlSecBufferBase64NodeContentRead</a>   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <font>xmlNodePtr</font> node);
+<font>int</font>                 <a href="xmlsec-buffer.html#XMLSECBUFFERBASE64NODECONTENTWRITE">xmlSecBufferBase64NodeContentWrite</a>  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> columns);
+<font>xmlOutputBufferPtr</font>  <a href="xmlsec-buffer.html#XMLSECBUFFERCREATEOUTPUTBUFFER">xmlSecBufferCreateOutputBuffer</a>      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN3869"></a><h2>Description</h2>
+<a name="XMLSEC-BUFFER.DESCRIPTION"></a><h2>Description</h2>
 <p>Binary buffer implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN3872"></a><h2>Details</h2>
+<a name="XMLSEC-BUFFER.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN3874"></a><h3>
-<a name="XMLSECALLOCMODE"></a>enum xmlSecAllocMode</h3>
+<a name="XMLSECALLOCMODE"></a><h3>enum xmlSecAllocMode</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecAllocModeExact = 0,
     xmlSecAllocModeDouble
 } xmlSecAllocMode;</pre>
-<p>The memory allocation mode (used by <var class="PARAMETER">xmlSecBuffer</var> and <var class="PARAMETER">xmlSecList</var>).</p>
+<p>The memory allocation mode (used by <code class="PARAMETER">xmlSecBuffer</code> and <code class="PARAMETER">xmlSecList</code>).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3885"><span style="white-space: nowrap"><var class="LITERAL">xmlSecAllocModeExact</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECALLOCMODEEXACT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecAllocModeExact</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the memory allocation mode that minimizes total 
 			allocated memory size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3890"><span style="white-space: nowrap"><var class="LITERAL">xmlSecAllocModeDouble</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECALLOCMODEDOUBLE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecAllocModeDouble</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the memory allocation mode that tries to minimize
 			the number of malloc calls.</p></td>
 </tr>
@@ -166,10 +159,8 @@ struct      <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3895"></a><h3>
-<a name="XMLSECBUFFER"></a>struct xmlSecBuffer</h3>
+<a name="XMLSECBUFFER"></a><h3>struct xmlSecBuffer</h3>
 <pre class="PROGRAMLISTING">struct xmlSecBuffer {
-
     xmlSecByte* 	data;
     xmlSecSize 		size;
     xmlSecSize		maxSize;
@@ -180,48 +171,46 @@ struct      <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3904"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *<code class="STRUCTFIELD">data</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3769"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *<code class="STRUCTFIELD">data</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to buffer data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3910"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">size</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3775"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">size</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the current data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3916"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">maxSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3781"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">maxSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the max data size (allocated buffer size).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3922"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3787"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the buffer memory allocation mode.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3928"></a><h3>
-<a name="XMLSECBUFFERSETDEFAULTALLOCMODE"></a>xmlSecBufferSetDefaultAllocMode ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBufferSetDefaultAllocMode (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
+<a name="XMLSECBUFFERSETDEFAULTALLOCMODE"></a><h3>xmlSecBufferSetDefaultAllocMode ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferSetDefaultAllocMode     (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
 <p>Sets new global default allocation mode and minimal intial size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3940"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3804"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default buffer allocation mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3945"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3809"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default buffer minimal intial size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3950"></a><h3>
-<a name="XMLSECBUFFERCREATE"></a>xmlSecBufferCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> xmlSecBufferCreate          (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<a name="XMLSECBUFFERCREATE"></a><h3>xmlSecBufferCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     xmlSecBufferCreate                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
 <p>Allocates and initalizes new memory buffer with given size.
 Caller is responsible for calling <a href="xmlsec-buffer.html#XMLSECBUFFERDESTROY"><span class="TYPE">xmlSecBufferDestroy</span></a> function
 to free the buffer.</p>
@@ -229,428 +218,407 @@ to free the buffer.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3963"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3826"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the intial size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN3968"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated buffer or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3831"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3973"></a><h3>
-<a name="XMLSECBUFFERDESTROY"></a>xmlSecBufferDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBufferDestroy             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFERDESTROY"></a><h3>xmlSecBufferDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferDestroy                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Desrtoys buffer object created with <a href="xmlsec-buffer.html#XMLSECBUFFERCREATE"><span class="TYPE">xmlSecBufferCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN3986"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3848"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN3991"></a><h3>
-<a name="XMLSECBUFFERINITIALIZE"></a>xmlSecBufferInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferInitialize          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Initializes buffer object <var class="PARAMETER">buf</var>. Caller is responsible for calling
+<a name="XMLSECBUFFERINITIALIZE"></a><h3>xmlSecBufferInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferInitialize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Initializes buffer object <code class="PARAMETER">buf</code>. Caller is responsible for calling
 <a href="xmlsec-buffer.html#XMLSECBUFFERFINALIZE"><span class="TYPE">xmlSecBufferFinalize</span></a> function to free allocated resources.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4006"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3867"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4011"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3872"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the initial buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4016"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3877"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4021"></a><h3>
-<a name="XMLSECBUFFERFINALIZE"></a>xmlSecBufferFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBufferFinalize            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFERFINALIZE"></a><h3>xmlSecBufferFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferFinalize                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Frees allocated resource for a buffer intialized with <a href="xmlsec-buffer.html#XMLSECBUFFERINITIALIZE"><span class="TYPE">xmlSecBufferInitialize</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4034"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3894"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4039"></a><h3>
-<a name="XMLSECBUFFERGETDATA"></a>xmlSecBufferGetData ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>* xmlSecBufferGetData             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFERGETDATA"></a><h3>xmlSecBufferGetData ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>*         xmlSecBufferGetData                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Gets pointer to buffer's data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4050"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3909"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4055"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to buffer's data.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3914"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to buffer's data.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4060"></a><h3>
-<a name="XMLSECBUFFERSETDATA"></a>xmlSecBufferSetData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferSetData             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Sets the value of the buffer to <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECBUFFERSETDATA"></a><h3>xmlSecBufferSetData ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetData                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Sets the value of the buffer to <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4074"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3932"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4079"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3937"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4084"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3942"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4089"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3947"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4094"></a><h3>
-<a name="XMLSECBUFFERGETSIZE"></a>xmlSecBufferGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecBufferGetSize             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFERGETSIZE"></a><h3>xmlSecBufferGetSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBufferGetSize                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Gets the current buffer data size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4105"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3962"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4110"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the current data size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the current data size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4115"></a><h3>
-<a name="XMLSECBUFFERSETSIZE"></a>xmlSecBufferSetSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferSetSize             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<a name="XMLSECBUFFERSETSIZE"></a><h3>xmlSecBufferSetSize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetSize                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
 <p>Sets new buffer data size. If necessary, buffer grows to 
-have at least <var class="PARAMETER">size</var> bytes.</p>
+have at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4128"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3984"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4133"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN3989"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4138"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN3994"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4143"></a><h3>
-<a name="XMLSECBUFFERGETMAXSIZE"></a>xmlSecBufferGetMaxSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecBufferGetMaxSize          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFERGETMAXSIZE"></a><h3>xmlSecBufferGetMaxSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecBufferGetMaxSize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Gets the maximum (allocated) buffer size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4154"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4009"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4159"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the maximum (allocated) buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4014"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the maximum (allocated) buffer size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4164"></a><h3>
-<a name="XMLSECBUFFERSETMAXSIZE"></a>xmlSecBufferSetMaxSize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferSetMaxSize          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<a name="XMLSECBUFFERSETMAXSIZE"></a><h3>xmlSecBufferSetMaxSize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferSetMaxSize              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
 <p>Sets new buffer maximum size. If necessary, buffer grows to 
-have at least <var class="PARAMETER">size</var> bytes.</p>
+have at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4177"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4031"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4182"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4036"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new maximum size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4187"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4041"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4192"></a><h3>
-<a name="XMLSECBUFFEREMPTY"></a>xmlSecBufferEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecBufferEmpty               (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<a name="XMLSECBUFFEREMPTY"></a><h3>xmlSecBufferEmpty ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecBufferEmpty                   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
 <p>Empties the buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4203"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4056"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4208"></a><h3>
-<a name="XMLSECBUFFERAPPEND"></a>xmlSecBufferAppend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferAppend              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Appends the <var class="PARAMETER">data</var> after the current data stored in the buffer.</p>
+<a name="XMLSECBUFFERAPPEND"></a><h3>xmlSecBufferAppend ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferAppend                  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Appends the <code class="PARAMETER">data</code> after the current data stored in the buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4222"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4074"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4227"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4079"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4232"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4084"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4237"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4089"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4242"></a><h3>
-<a name="XMLSECBUFFERPREPEND"></a>xmlSecBufferPrepend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferPrepend             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Prepends the <var class="PARAMETER">data</var> before the current data stored in the buffer.</p>
+<a name="XMLSECBUFFERPREPEND"></a><h3>xmlSecBufferPrepend ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferPrepend                 (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Prepends the <code class="PARAMETER">data</code> before the current data stored in the buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4256"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4107"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4261"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4112"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4266"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4117"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4271"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4122"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4276"></a><h3>
-<a name="XMLSECBUFFERREMOVEHEAD"></a>xmlSecBufferRemoveHead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferRemoveHead          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Removes <var class="PARAMETER">size</var> bytes from the beginning of the current buffer.</p>
+<a name="XMLSECBUFFERREMOVEHEAD"></a><h3>xmlSecBufferRemoveHead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferRemoveHead              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Removes <code class="PARAMETER">size</code> bytes from the beginning of the current buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4289"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4139"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4294"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4144"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the number of bytes to be removed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4299"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4304"></a><h3>
-<a name="XMLSECBUFFERREMOVETAIL"></a>xmlSecBufferRemoveTail ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferRemoveTail          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Removes <var class="PARAMETER">size</var> bytes from the end of current buffer.</p>
+<a name="XMLSECBUFFERREMOVETAIL"></a><h3>xmlSecBufferRemoveTail ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferRemoveTail              (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Removes <code class="PARAMETER">size</code> bytes from the end of current buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4317"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4166"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4322"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4171"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the number of bytes to be removed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4332"></a><h3>
-<a name="XMLSECBUFFERREADFILE"></a>xmlSecBufferReadFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferReadFile            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             const <font>char</font> *filename);</pre>
-<p>Reads the content of the file <var class="PARAMETER">filename</var> in the buffer.</p>
+<a name="XMLSECBUFFERREADFILE"></a><h3>xmlSecBufferReadFile ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferReadFile                (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         const <font>char</font> *filename);</pre>
+<p>Reads the content of the file <code class="PARAMETER">filename</code> in the buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4345"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4193"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4350"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4198"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4355"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4360"></a><h3>
-<a name="XMLSECBUFFERBASE64NODECONTENTREAD"></a>xmlSecBufferBase64NodeContentRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferBase64NodeContentRead
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>Reads the content of the <var class="PARAMETER">node</var>, base64 decodes it and stores the
+<a name="XMLSECBUFFERBASE64NODECONTENTREAD"></a><h3>xmlSecBufferBase64NodeContentRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferBase64NodeContentRead   (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>Reads the content of the <code class="PARAMETER">node</code>, base64 decodes it and stores the
 result in the buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4373"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4220"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4378"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4225"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4383"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4388"></a><h3>
-<a name="XMLSECBUFFERBASE64NODECONTENTWRITE"></a>xmlSecBufferBase64NodeContentWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecBufferBase64NodeContentWrite
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> columns);</pre>
-<p>Sets the content of the <var class="PARAMETER">node</var> to the base64 encoded buffer data.</p>
+<a name="XMLSECBUFFERBASE64NODECONTENTWRITE"></a><h3>xmlSecBufferBase64NodeContentWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecBufferBase64NodeContentWrite  (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> columns);</pre>
+<p>Sets the content of the <code class="PARAMETER">node</code> to the base64 encoded buffer data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4402"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4248"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4407"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4253"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to a node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4412"><span style="white-space: nowrap"><var class="PARAMETER">columns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4258"><span style="white-space: nowrap"><code class="PARAMETER">columns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the max line size fro base64 encoded data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4417"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4263"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4422"></a><h3>
-<a name="XMLSECBUFFERCREATEOUTPUTBUFFER"></a>xmlSecBufferCreateOutputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font> xmlSecBufferCreateOutputBuffer
-                                            (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
-<p>Creates new LibXML output buffer to store data in the <var class="PARAMETER">buf</var>. Caller is 
-responsible for destroying <var class="PARAMETER">buf</var> when processing is done.</p>
+<a name="XMLSECBUFFERCREATEOUTPUTBUFFER"></a><h3>xmlSecBufferCreateOutputBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font>  xmlSecBufferCreateOutputBuffer      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buf);</pre>
+<p>Creates new LibXML output buffer to store data in the <code class="PARAMETER">buf</code>. Caller is 
+responsible for destroying <code class="PARAMETER">buf</code> when processing is done.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4435"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4280"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4440"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated output buffer or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN4285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated output buffer or NULL if an error
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-bn.html"><b>&lt;&lt;&lt;bn</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-dl.html"><b>dl&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-bn.html"><b>&lt;&lt;&lt; bn</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-dl.html"><b>dl &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-custom-keys-manager.html b/docs/api/xmlsec-custom-keys-manager.html
index 8035564..3332262 100644
--- a/docs/api/xmlsec-custom-keys-manager.html
+++ b/docs/api/xmlsec-custom-keys-manager.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Writing a custom keys manager.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Decrypting data with keys manager." href="xmlsec-decrypt-with-keys-mngr.html">
 <link rel="NEXT" title="APPENDIX A. XML Security Library Signature Klasses." href="xmlsec-signature-klasses.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -451,8 +450,8 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-keys-mngr.html"><b>&lt;&lt;&lt;Decrypting data with keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-signature-klasses.html"><b>APPENDIX A. XML Security Library Signature Klasses.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-keys-mngr.html"><b>&lt;&lt;&lt; Decrypting data with keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-signature-klasses.html"><b>APPENDIX A. XML Security Library Signature Klasses. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-decrypt-with-keys-mngr.html b/docs/api/xmlsec-decrypt-with-keys-mngr.html
index a8abc6d..c638354 100644
--- a/docs/api/xmlsec-decrypt-with-keys-mngr.html
+++ b/docs/api/xmlsec-decrypt-with-keys-mngr.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Decrypting data with keys manager.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Decrypting data with a single key." href="xmlsec-decrypt-with-signle-key.html">
 <link rel="NEXT" title="Writing a custom keys manager." href="xmlsec-custom-keys-manager.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -371,8 +370,8 @@ done:
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-signle-key.html"><b>&lt;&lt;&lt;Decrypting data with a single key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-custom-keys-manager.html"><b>Writing a custom keys manager.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-decrypt-with-signle-key.html"><b>&lt;&lt;&lt; Decrypting data with a single key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-custom-keys-manager.html"><b>Writing a custom keys manager. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-decrypt-with-signle-key.html b/docs/api/xmlsec-decrypt-with-signle-key.html
index 9bd7d21..8ab5476 100644
--- a/docs/api/xmlsec-decrypt-with-signle-key.html
+++ b/docs/api/xmlsec-decrypt-with-signle-key.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Decrypting data with a single key.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Encrypting data with a session key." href="xmlsec-encrypt-with-session-key.html">
 <link rel="NEXT" title="Decrypting data with keys manager." href="xmlsec-decrypt-with-keys-mngr.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -301,8 +300,8 @@ done:
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-with-session-key.html"><b>&lt;&lt;&lt;Encrypting data with a session key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-keys-mngr.html"><b>Decrypting data with keys manager.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-with-session-key.html"><b>&lt;&lt;&lt; Encrypting data with a session key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-keys-mngr.html"><b>Decrypting data with keys manager. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-dl.html b/docs/api/xmlsec-dl.html
index e525af8..1c0702a 100644
--- a/docs/api/xmlsec-dl.html
+++ b/docs/api/xmlsec-dl.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>dl</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="buffer" href="xmlsec-buffer.html">
 <link rel="NEXT" title="errors" href="xmlsec-errors.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,81 +87,74 @@
 <h1>
 <a name="XMLSEC-DL"></a>dl</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4450"></a><h2>Name</h2>dl--Dynamic crypto-engine library loading support.</div>
+<a name="AEN4295"></a><h2>Name</h2>dl -- Dynamic crypto-engine library loading support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN4453"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</a>
-                                            (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLINIT">xmlSecCryptoDLInit</a>              (void);
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">xmlSecCryptoDLShutdown</a>          (void);
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY">xmlSecCryptoDLLoadLibrary</a>       (const <font>xmlChar</font> *crypto);
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS">xmlSecCryptoDLGetLibraryFunctions</a>
-                                            (const <font>xmlChar</font> *crypto);
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">xmlSecCryptoDLUnloadLibrary</a>     (const <font>xmlChar</font> *crypto);
-<font>int</font>         <a href="xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">xmlSecCryptoDLSetFunctions</a>      (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-dl.html#XMLSECCRYPTODLGETFUNCTIONS">xmlSecCryptoDLGetFunctions</a>
-                                            (void);</pre>
+<a name="XMLSEC-DL.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS">xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms</a>
+                                                        (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
+<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLINIT">xmlSecCryptoDLInit</a>                  (void);
+<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLSHUTDOWN">xmlSecCryptoDLShutdown</a>              (void);
+<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY">xmlSecCryptoDLLoadLibrary</a>           (const <font>xmlChar</font> *crypto);
+<font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS">xmlSecCryptoDLGetLibraryFunctions</a>
+                                                        (const <font>xmlChar</font> *crypto);
+<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY">xmlSecCryptoDLUnloadLibrary</a>         (const <font>xmlChar</font> *crypto);
+<font>int</font>                 <a href="xmlsec-dl.html#XMLSECCRYPTODLSETFUNCTIONS">xmlSecCryptoDLSetFunctions</a>          (<font>xmlSecCryptoDLFunctionsPtr</font> functions);
+<font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-dl.html#XMLSECCRYPTODLGETFUNCTIONS">xmlSecCryptoDLGetFunctions</a>  (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN4477"></a><h2>Description</h2>
+<a name="XMLSEC-DL.DESCRIPTION"></a><h2>Description</h2>
 <p>Dynamic crypto-engine library loading support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN4480"></a><h2>Details</h2>
+<a name="XMLSEC-DL.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN4482"></a><h3>
-<a name="XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS"></a>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
-                                            (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
-<p>Registers the key data and transforms klasses from <var class="PARAMETER">functions</var> table in xmlsec.</p>
+<a name="XMLSECCRYPTODLFUNCTIONSREGISTERKEYDATAANDTRANSFORMS"></a><h3>xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLFunctionsRegisterKeyDataAndTransforms
+                                                        (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
+<p>Registers the key data and transforms klasses from <code class="PARAMETER">functions</code> table in xmlsec.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4494"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4338"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the functions table.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4499"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4504"></a><h3>
-<a name="XMLSECCRYPTODLINIT"></a>xmlSecCryptoDLInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLInit              (void);</pre>
+<a name="XMLSECCRYPTODLINIT"></a><h3>xmlSecCryptoDLInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLInit                  (void);</pre>
 <p>Initializes dynamic loading engine. This is an internal function
 and should not be called by application directly.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4514"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4357"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4519"></a><h3>
-<a name="XMLSECCRYPTODLSHUTDOWN"></a>xmlSecCryptoDLShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLShutdown          (void);</pre>
+<a name="XMLSECCRYPTODLSHUTDOWN"></a><h3>xmlSecCryptoDLShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLShutdown              (void);</pre>
 <p>Shutdowns dynamic loading engine. This is an internal function
 and should not be called by application directly.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4529"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4371"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4534"></a><h3>
-<a name="XMLSECCRYPTODLLOADLIBRARY"></a>xmlSecCryptoDLLoadLibrary ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLLoadLibrary       (const <font>xmlChar</font> *crypto);</pre>
+<a name="XMLSECCRYPTODLLOADLIBRARY"></a><h3>xmlSecCryptoDLLoadLibrary ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLLoadLibrary           (const <font>xmlChar</font> *crypto);</pre>
 <p>Loads the xmlsec-&lt;crypto&gt; library. This function is NOT thread safe, 
 application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>, <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>,
 and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLUnloadLibrary</span></a> functions from multiple threads.</p>
@@ -170,21 +162,20 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4551"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4392"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4556"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4397"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4561"></a><h3>
-<a name="XMLSECCRYPTODLGETLIBRARYFUNCTIONS"></a>xmlSecCryptoDLGetLibraryFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoDLGetLibraryFunctions
-                                            (const <font>xmlChar</font> *crypto);</pre>
+<a name="XMLSECCRYPTODLGETLIBRARYFUNCTIONS"></a><h3>xmlSecCryptoDLGetLibraryFunctions ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoDLGetLibraryFunctions
+                                                        (const <font>xmlChar</font> *crypto);</pre>
 <p>Loads the xmlsec-&lt;crypto&gt; library and gets global crypto functions/transforms/keys data/keys store 
 table. This function is NOT thread safe, application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>, 
 <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>, and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLUnloadLibrary</span></a> functions from multiple threads.</p>
@@ -192,20 +183,19 @@ table. This function is NOT thread safe, application MUST NOT call <a href="xmls
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4578"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4418"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4583"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the table or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the table or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4588"></a><h3>
-<a name="XMLSECCRYPTODLUNLOADLIBRARY"></a>xmlSecCryptoDLUnloadLibrary ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLUnloadLibrary     (const <font>xmlChar</font> *crypto);</pre>
+<a name="XMLSECCRYPTODLUNLOADLIBRARY"></a><h3>xmlSecCryptoDLUnloadLibrary ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLUnloadLibrary         (const <font>xmlChar</font> *crypto);</pre>
 <p>Unloads the xmlsec-&lt;crypto&gt; library. All pointers to this library
 functions tables became invalid. This function is NOT thread safe, 
 application MUST NOT call <a href="xmlsec-dl.html#XMLSECCRYPTODLLOADLIBRARY"><span class="TYPE">xmlSecCryptoDLLoadLibrary</span></a>, <a href="xmlsec-dl.html#XMLSECCRYPTODLGETLIBRARYFUNCTIONS"><span class="TYPE">xmlSecCryptoDLGetLibraryFunctions</span></a>,
@@ -214,52 +204,49 @@ and <a href="xmlsec-dl.html#XMLSECCRYPTODLUNLOADLIBRARY"><span class="TYPE">xmlS
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4605"><span style="white-space: nowrap"><var class="PARAMETER">crypto</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4444"><span style="white-space: nowrap"><code class="PARAMETER">crypto</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired crypto library name ("openssl", "nss", ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4610"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4449"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4615"></a><h3>
-<a name="XMLSECCRYPTODLSETFUNCTIONS"></a>xmlSecCryptoDLSetFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCryptoDLSetFunctions      (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
+<a name="XMLSECCRYPTODLSETFUNCTIONS"></a><h3>xmlSecCryptoDLSetFunctions ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCryptoDLSetFunctions          (<font>xmlSecCryptoDLFunctionsPtr</font> functions);</pre>
 <p>Sets global crypto functions/transforms/keys data/keys store table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4626"><span style="white-space: nowrap"><var class="PARAMETER">functions</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4464"><span style="white-space: nowrap"><code class="PARAMETER">functions</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new table</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN4631"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4469"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4636"></a><h3>
-<a name="XMLSECCRYPTODLGETFUNCTIONS"></a>xmlSecCryptoDLGetFunctions ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoDLGetFunctions
-                                            (void);</pre>
+<a name="XMLSECCRYPTODLGETFUNCTIONS"></a><h3>xmlSecCryptoDLGetFunctions ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoDLGetFunctions  (void);</pre>
 <p>Gets global crypto functions/transforms/keys data/keys store table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN4646"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the table.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN4483"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the table.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-buffer.html"><b>&lt;&lt;&lt;buffer</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-errors.html"><b>errors&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-buffer.html"><b>&lt;&lt;&lt; buffer</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-errors.html"><b>errors &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-dynamic-template.html b/docs/api/xmlsec-encrypt-dynamic-template.html
index 4d598c9..729ebd1 100644
--- a/docs/api/xmlsec-encrypt-dynamic-template.html
+++ b/docs/api/xmlsec-encrypt-dynamic-template.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Encrypting data with a dynamicaly created template.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Encrypting data with a template file." href="xmlsec-encrypt-template-file.html">
 <link rel="NEXT" title="Encrypting data with a session key." href="xmlsec-encrypt-with-session-key.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -361,8 +360,8 @@ IgL/XoAQN3B27zD91b1ZLGh6QQ9CjnVD98+hYJ9TPp4piPnII4vGUA==&lt;/CipherValue&gt;
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-template-file.html"><b>&lt;&lt;&lt;Encrypting data with a template file.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-with-session-key.html"><b>Encrypting data with a session key.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-template-file.html"><b>&lt;&lt;&lt; Encrypting data with a template file.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-with-session-key.html"><b>Encrypting data with a session key. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-template-file.html b/docs/api/xmlsec-encrypt-template-file.html
index d983682..810e8fb 100644
--- a/docs/api/xmlsec-encrypt-template-file.html
+++ b/docs/api/xmlsec-encrypt-template-file.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Encrypting data with a template file.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Verifying a signature with additional restrictions." href="xmlsec-verify-with-restrictions.html">
 <link rel="NEXT" title="Encrypting data with a dynamicaly created template." href="xmlsec-encrypt-dynamic-template.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -340,8 +339,8 @@ XML Security Library example: Encrypted binary data (encrypt1 example).
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-restrictions.html"><b>&lt;&lt;&lt;Verifying a signature with additional restrictions.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-dynamic-template.html"><b>Encrypting data with a dynamicaly created template.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-restrictions.html"><b>&lt;&lt;&lt; Verifying a signature with additional restrictions.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-dynamic-template.html"><b>Encrypting data with a dynamicaly created template. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encrypt-with-session-key.html b/docs/api/xmlsec-encrypt-with-session-key.html
index 95b7435..d0081d6 100644
--- a/docs/api/xmlsec-encrypt-with-session-key.html
+++ b/docs/api/xmlsec-encrypt-with-session-key.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Encrypting data with a session key.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Encrypting data with a dynamicaly created template." href="xmlsec-encrypt-dynamic-template.html">
 <link rel="NEXT" title="Decrypting data with a single key." href="xmlsec-decrypt-with-signle-key.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -471,8 +470,8 @@ s6ifbZgXIBsFdxPpMBUFlyTWAAO+NLooIwGoczXi14z62lHr7Ck6FA==&lt;/CipherValue&gt;
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encrypt-dynamic-template.html"><b>&lt;&lt;&lt;Encrypting data with a dynamicaly created template.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-signle-key.html"><b>Decrypting data with a single key.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encrypt-dynamic-template.html"><b>&lt;&lt;&lt; Encrypting data with a dynamicaly created template.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-decrypt-with-signle-key.html"><b>Decrypting data with a single key. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-encryption-klasses.html b/docs/api/xmlsec-encryption-klasses.html
index 9ca4db8..561a37f 100644
--- a/docs/api/xmlsec-encryption-klasses.html
+++ b/docs/api/xmlsec-encryption-klasses.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>APPENDIX B. XML Security Library Encryption Klasses.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="APPENDIX A. XML Security Library Signature Klasses." href="xmlsec-signature-klasses.html">
 <link rel="NEXT" title="XML Security Library API Reference." href="xmlsec-reference.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -94,8 +93,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-signature-klasses.html"><b>&lt;&lt;&lt;APPENDIX A. XML Security Library Signature Klasses.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-reference.html"><b>XML Security Library API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-signature-klasses.html"><b>&lt;&lt;&lt; APPENDIX A. XML Security Library Signature Klasses.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-reference.html"><b>XML Security Library API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-errors.html b/docs/api/xmlsec-errors.html
index 731028d..80788e6 100644
--- a/docs/api/xmlsec-errors.html
+++ b/docs/api/xmlsec-errors.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>errors</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="dl" href="xmlsec-dl.html">
 <link rel="NEXT" title="io" href="xmlsec-io.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,159 +87,149 @@
 <h1>
 <a name="XMLSEC-ERRORS"></a>errors</h1>
 <div class="REFNAMEDIV">
-<a name="AEN4656"></a><h2>Name</h2>errors--Error/log messages support.</div>
+<a name="AEN4493"></a><h2>Name</h2>errors -- Error/log messages support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN4659"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED-CAPS">XMLSEC_ERRORS_R_XML_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED-CAPS">XMLSEC_ERRORS_R_IO_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED-CAPS">XMLSEC_ERRORS_R_DISABLED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_DATA</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION-CAPS">XMLSEC_ERRORS_R_ASSERTION</a>
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER-CAPS">XMLSEC_ERRORS_MAX_NUMBER</a>
-<font>void</font>        (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">*xmlSecErrorsCallback</a>)         (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERRORSINIT">xmlSecErrorsInit</a>                (void);
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERRORSSHUTDOWN">xmlSecErrorsShutdown</a>            (void);
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK">xmlSecErrorsSetCallback</a>         (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">xmlSecErrorsDefaultCallback</a>     (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">xmlSecErrorsDefaultCallbackEnableOutput</a>
-                                            (<font>int</font> enabled);
-<font>int</font>         <a href="xmlsec-errors.html#XMLSECERRORSGETCODE">xmlSecErrorsGetCode</a>             (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-const <font>char</font>* <a href="xmlsec-errors.html#XMLSECERRORSGETMSG">xmlSecErrorsGetMsg</a>              (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-HERE-CAPS">XMLSEC_ERRORS_HERE</a>
-#define     <a href="xmlsec-errors.html#XMLSECERRORSSAFESTRING">xmlSecErrorsSafeString</a>          (str)
-#define     <a href="xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE-CAPS">XMLSEC_ERRORS_NO_MESSAGE</a>
-<font>void</font>        <a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>                     (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg,
-                                             ...);
-#define     <a href="xmlsec-errors.html#XMLSECASSERT">xmlSecAssert</a>                    ( p )
-#define     <a href="xmlsec-errors.html#XMLSECASSERT2">xmlSecAssert2</a>                   ( p, ret )</pre>
+<a name="XMLSEC-ERRORS.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS">XMLSEC_ERRORS_R_XMLSEC_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS">XMLSEC_ERRORS_R_MALLOC_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS">XMLSEC_ERRORS_R_STRDUP_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS">XMLSEC_ERRORS_R_CRYPTO_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED--CAPS">XMLSEC_ERRORS_R_XML_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED--CAPS">XMLSEC_ERRORS_R_XSLT_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED--CAPS">XMLSEC_ERRORS_R_IO_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED--CAPS">XMLSEC_ERRORS_R_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS">XMLSEC_ERRORS_R_NOT_IMPLEMENTED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_SIZE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_DATA</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT--CAPS">XMLSEC_ERRORS_R_INVALID_RESULT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_TYPE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS">XMLSEC_ERRORS_R_INVALID_OPERATION</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS--CAPS">XMLSEC_ERRORS_R_INVALID_STATUS</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS">XMLSEC_ERRORS_R_INVALID_FORMAT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS">XMLSEC_ERRORS_R_DATA_NOT_MATCH</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS">XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS">XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS">XMLSEC_ERRORS_R_UNEXPECTED_NODE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_NODE_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS">XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS">XMLSEC_ERRORS_R_INVALID_URI_TYPE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS">XMLSEC_ERRORS_R_TRANSFORM_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS">XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS">XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_KEY_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS">XMLSEC_ERRORS_R_KEYDATA_DISABLED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS">XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS">XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS">XMLSEC_ERRORS_R_CERT_NOT_FOUND</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED--CAPS">XMLSEC_ERRORS_R_CERT_REVOKED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS">XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS">XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS">XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS">XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS">XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION--CAPS">XMLSEC_ERRORS_R_ASSERTION</a>
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER--CAPS">XMLSEC_ERRORS_MAX_NUMBER</a>
+<font>void</font>                (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">*xmlSecErrorsCallback</a>)             (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSINIT">xmlSecErrorsInit</a>                    (void);
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSSHUTDOWN">xmlSecErrorsShutdown</a>                (void);
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK">xmlSecErrorsSetCallback</a>             (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">xmlSecErrorsDefaultCallback</a>         (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">xmlSecErrorsDefaultCallbackEnableOutput</a>
+                                                        (<font>int</font> enabled);
+<font>int</font>                 <a href="xmlsec-errors.html#XMLSECERRORSGETCODE">xmlSecErrorsGetCode</a>                 (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+const <font>char</font>*         <a href="xmlsec-errors.html#XMLSECERRORSGETMSG">xmlSecErrorsGetMsg</a>                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-HERE--CAPS">XMLSEC_ERRORS_HERE</a>
+#define             <a href="xmlsec-errors.html#XMLSECERRORSSAFESTRING">xmlSecErrorsSafeString</a>              (str)
+#define             <a href="xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE--CAPS">XMLSEC_ERRORS_NO_MESSAGE</a>
+<font>void</font>                <a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a>                         (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg,
+                                                         ...);
+#define             <a href="xmlsec-errors.html#XMLSECASSERT">xmlSecAssert</a>                        ( p )
+#define             <a href="xmlsec-errors.html#XMLSECASSERT2">xmlSecAssert2</a>                       ( p, ret )</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN4758"></a><h2>Description</h2>
+<a name="XMLSEC-ERRORS.DESCRIPTION"></a><h2>Description</h2>
 <p>Error/log messages support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN4761"></a><h2>Details</h2>
+<a name="XMLSEC-ERRORS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN4763"></a><h3>
-<a name="XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS"></a>XMLSEC_ERRORS_R_XMLSEC_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XMLSEC-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XMLSEC_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XMLSEC_FAILED		 	1</pre>
 <p>An XMLSec function failed (error subject is the failed function).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4771"></a><h3>
-<a name="XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS"></a>XMLSEC_ERRORS_R_MALLOC_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-MALLOC-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_MALLOC_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MALLOC_FAILED		 	2</pre>
 <p>Failed to allocate memory error.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4779"></a><h3>
-<a name="XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS"></a>XMLSEC_ERRORS_R_STRDUP_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-STRDUP-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_STRDUP_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_STRDUP_FAILED		 	3</pre>
 <p>Failed to duplicate string error.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4787"></a><h3>
-<a name="XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS"></a>XMLSEC_ERRORS_R_CRYPTO_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CRYPTO-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CRYPTO_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CRYPTO_FAILED		 	4</pre>
 <p>Crypto (OpenSSL) function failed (error subject is the failed function).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4795"></a><h3>
-<a name="XMLSEC-ERRORS-R-XML-FAILED-CAPS"></a>XMLSEC_ERRORS_R_XML_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XML-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XML_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XML_FAILED		 	5</pre>
 <p>LibXML function failed (error subject is the failed function).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4803"></a><h3>
-<a name="XMLSEC-ERRORS-R-XSLT-FAILED-CAPS"></a>XMLSEC_ERRORS_R_XSLT_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-XSLT-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_XSLT_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_XSLT_FAILED		 	6</pre>
 <p>LibXSLT function failed (error subject is the failed function).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4811"></a><h3>
-<a name="XMLSEC-ERRORS-R-IO-FAILED-CAPS"></a>XMLSEC_ERRORS_R_IO_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-IO-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_IO_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_IO_FAILED		 	7</pre>
 <p>IO operation failed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4819"></a><h3>
-<a name="XMLSEC-ERRORS-R-DISABLED-CAPS"></a>XMLSEC_ERRORS_R_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DISABLED		 	8</pre>
 <p>The feature is disabled during compilation.
 Check './configure --help' for details on how to
@@ -249,232 +238,203 @@ enable it.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4827"></a><h3>
-<a name="XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS"></a>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</h3>
+<a name="XMLSEC-ERRORS-R-NOT-IMPLEMENTED--CAPS"></a><h3>XMLSEC_ERRORS_R_NOT_IMPLEMENTED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NOT_IMPLEMENTED		 	9</pre>
 <p>Feature is not implemented.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4835"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-SIZE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_SIZE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-SIZE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_SIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_SIZE		 	11</pre>
 <p>Invalid size.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4843"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-DATA-CAPS"></a>XMLSEC_ERRORS_R_INVALID_DATA</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-DATA--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_DATA</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_DATA		 	12</pre>
 <p>Invalid data.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4851"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-RESULT-CAPS"></a>XMLSEC_ERRORS_R_INVALID_RESULT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-RESULT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_RESULT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_RESULT		 	13</pre>
 <p>Invalid result.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4859"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-TYPE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_TYPE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TYPE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TYPE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TYPE		 	14</pre>
 <p>Invalid type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4867"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS"></a>XMLSEC_ERRORS_R_INVALID_OPERATION</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-OPERATION--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_OPERATION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_OPERATION	 	15</pre>
 <p>Invalid operation.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4875"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-STATUS-CAPS"></a>XMLSEC_ERRORS_R_INVALID_STATUS</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-STATUS--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_STATUS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_STATUS 			16</pre>
 <p>Invalid status.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4883"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS"></a>XMLSEC_ERRORS_R_INVALID_FORMAT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-FORMAT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_FORMAT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_FORMAT 			17</pre>
 <p>Invalid format.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4891"></a><h3>
-<a name="XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS"></a>XMLSEC_ERRORS_R_DATA_NOT_MATCH</h3>
+<a name="XMLSEC-ERRORS-R-DATA-NOT-MATCH--CAPS"></a><h3>XMLSEC_ERRORS_R_DATA_NOT_MATCH</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DATA_NOT_MATCH		 	18</pre>
 <p>The data do not match our expectation.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4899"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-NODE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_NODE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE	 	 	21</pre>
 <p>Invalid node (error subject is the node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4907"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS"></a>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE-CONTENT--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_CONTENT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE_CONTENT	 	22</pre>
 <p>Invalid node content (error subject is the node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4915"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE	 	23</pre>
 <p>Invalid node attribute (error subject is the node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4923"></a><h3>
-<a name="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS"></a>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</h3>
+<a name="XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE--CAPS"></a><h3>XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE	 	25</pre>
 <p>Missing node attribute (error subject is the node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4931"></a><h3>
-<a name="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS"></a>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</h3>
+<a name="XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT--CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT	 	26</pre>
 <p>Node already present,</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4939"></a><h3>
-<a name="XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS"></a>XMLSEC_ERRORS_R_UNEXPECTED_NODE</h3>
+<a name="XMLSEC-ERRORS-R-UNEXPECTED-NODE--CAPS"></a><h3>XMLSEC_ERRORS_R_UNEXPECTED_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_UNEXPECTED_NODE	 	 	27</pre>
 <p>Unexpected node (error subject is the node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4947"></a><h3>
-<a name="XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS"></a>XMLSEC_ERRORS_R_NODE_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-NODE-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_NODE_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_NODE_NOT_FOUND 	 	 	28</pre>
 <p>Node not found (error subject is the required node name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4955"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS"></a>XMLSEC_ERRORS_R_INVALID_TRANSFORM</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TRANSFORM	 	31</pre>
 <p>This transform is invlaid here.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4963"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS"></a>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY		32</pre>
 <p>Key is invalid for this transform.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4971"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_URI_TYPE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-URI-TYPE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_URI_TYPE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_URI_TYPE 	 	33</pre>
 <p>Invalid URI type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4979"></a><h3>
-<a name="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS"></a>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</h3>
+<a name="XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED--CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED 	34</pre>
 <p>The transform requires the input document to be the same as context.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4987"></a><h3>
-<a name="XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS"></a>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-TRANSFORM-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_TRANSFORM_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_TRANSFORM_DISABLED		35</pre>
 <p>The transform is disabled.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN4995"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS"></a>XMLSEC_ERRORS_R_INVALID_KEY_DATA</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_KEY_DATA	 	41</pre>
 <p>Key data is invalid.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5003"></a><h3>
-<a name="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS"></a>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND		42</pre>
 <p>Data is not found (error subject is the data name).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5011"></a><h3>
-<a name="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS"></a>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</h3>
+<a name="XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST	 	43</pre>
 <p>The key data is already exist.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5019"></a><h3>
-<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS"></a>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</h3>
+<a name="XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE--CAPS"></a><h3>XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE	 	44</pre>
 <p>Invalid key size.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5027"></a><h3>
-<a name="XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS"></a>XMLSEC_ERRORS_R_KEY_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-KEY-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_KEY_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEY_NOT_FOUND		 	45</pre>
 <p>Key not found.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5035"></a><h3>
-<a name="XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS"></a>XMLSEC_ERRORS_R_KEYDATA_DISABLED</h3>
+<a name="XMLSEC-ERRORS-R-KEYDATA-DISABLED--CAPS"></a><h3>XMLSEC_ERRORS_R_KEYDATA_DISABLED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_KEYDATA_DISABLED		46</pre>
 <p>The key data type disabled.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5043"></a><h3>
-<a name="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS"></a>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</h3>
+<a name="XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL	 	51</pre>
 <p>Max allowed retrievals level reached.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5051"></a><h3>
-<a name="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS"></a>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</h3>
+<a name="XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH	52</pre>
 <p>The retrieved key data type does not match the one specified 
 in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node.</p>
@@ -482,274 +442,254 @@ in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5060"></a><h3>
-<a name="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS"></a>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</h3>
+<a name="XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL--CAPS"></a><h3>XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL	 	61</pre>
 <p>Max EncryptedKey level reached.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5068"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS"></a>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-VERIFY-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_VERIFY_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_VERIFY_FAILED	 	71</pre>
 <p>Certificate verification failed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5076"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS"></a>XMLSEC_ERRORS_R_CERT_NOT_FOUND</h3>
+<a name="XMLSEC-ERRORS-R-CERT-NOT-FOUND--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_NOT_FOUND		 	72</pre>
 <p>Requested certificate is not found.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5084"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-REVOKED-CAPS"></a>XMLSEC_ERRORS_R_CERT_REVOKED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-REVOKED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_REVOKED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_REVOKED		 	73</pre>
 <p>The certificate is revoked.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5092"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS"></a>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-ISSUER-FAILED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_ISSUER_FAILED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_ISSUER_FAILED	 	74</pre>
 <p>Failed to get certificate issuer.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5100"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS"></a>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</h3>
+<a name="XMLSEC-ERRORS-R-CERT-NOT-YET-VALID--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_NOT_YET_VALID</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_NOT_YET_VALID	 	75</pre>
 <p>"Not valid before" verification failed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5108"></a><h3>
-<a name="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS"></a>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</h3>
+<a name="XMLSEC-ERRORS-R-CERT-HAS-EXPIRED--CAPS"></a><h3>XMLSEC_ERRORS_R_CERT_HAS_EXPIRED</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_CERT_HAS_EXPIRED	 	76</pre>
 <p>"Not valid after" verification failed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5116"></a><h3>
-<a name="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS"></a>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</h3>
+<a name="XMLSEC-ERRORS-R-DSIG-NO-REFERENCES--CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_NO_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DSIG_NO_REFERENCES 	 	81</pre>
 <p>The &lt;dsig:Reference&gt; nodes not found.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5124"></a><h3>
-<a name="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS"></a>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</h3>
+<a name="XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE--CAPS"></a><h3>XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE 	 	82</pre>
 <p>The &lt;dsig:Reference&gt; validation failed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5132"></a><h3>
-<a name="XMLSEC-ERRORS-R-ASSERTION-CAPS"></a>XMLSEC_ERRORS_R_ASSERTION</h3>
+<a name="XMLSEC-ERRORS-R-ASSERTION--CAPS"></a><h3>XMLSEC_ERRORS_R_ASSERTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_R_ASSERTION		 	100</pre>
 <p>Invalid assertion.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5140"></a><h3>
-<a name="XMLSEC-ERRORS-MAX-NUMBER-CAPS"></a>XMLSEC_ERRORS_MAX_NUMBER</h3>
+<a name="XMLSEC-ERRORS-MAX-NUMBER--CAPS"></a><h3>XMLSEC_ERRORS_MAX_NUMBER</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_MAX_NUMBER			256</pre>
 <p>The maximum xmlsec errors number.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5148"></a><h3>
-<a name="XMLSECERRORSCALLBACK"></a>xmlSecErrorsCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecErrorsCallback)         (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSECERRORSCALLBACK"></a><h3>xmlSecErrorsCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecErrorsCallback)             (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 <p>The errors reporting callback function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5165"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4953"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5170"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4958"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5175"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4963"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5180"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4968"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5185"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4973"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5190"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4978"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5195"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN4983"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5200"></a><h3>
-<a name="XMLSECERRORSINIT"></a>xmlSecErrorsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecErrorsInit                (void);</pre>
+<a name="XMLSECERRORSINIT"></a><h3>xmlSecErrorsInit ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsInit                    (void);</pre>
 <p>Initializes the errors reporting. It is called from <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function.
 and applications must not call this function directly.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5211"></a><h3>
-<a name="XMLSECERRORSSHUTDOWN"></a>xmlSecErrorsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecErrorsShutdown            (void);</pre>
+<a name="XMLSECERRORSSHUTDOWN"></a><h3>xmlSecErrorsShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsShutdown                (void);</pre>
 <p>Cleanups the errors reporting. It is called from <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function.
 and applications must not call this function directly.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5222"></a><h3>
-<a name="XMLSECERRORSSETCALLBACK"></a>xmlSecErrorsSetCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecErrorsSetCallback         (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);</pre>
-<p>Sets the errors callback function to <var class="PARAMETER">callback</var> that will be called 
+<a name="XMLSECERRORSSETCALLBACK"></a><h3>xmlSecErrorsSetCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsSetCallback             (<a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a> callback);</pre>
+<p>Sets the errors callback function to <code class="PARAMETER">callback</code> that will be called 
 every time an error occurs.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5234"><span style="white-space: nowrap"><var class="PARAMETER">callback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5019"><span style="white-space: nowrap"><code class="PARAMETER">callback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new errors callback function.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5239"></a><h3>
-<a name="XMLSECERRORSDEFAULTCALLBACK"></a>xmlSecErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecErrorsDefaultCallback     (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSECERRORSDEFAULTCALLBACK"></a><h3>xmlSecErrorsDefaultCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsDefaultCallback         (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 <p>The default error reporting callback that utilizes LibXML
-error reporting <font><span class="TYPE">xmlGenericError</span></font> function.</p>
+error reporting <gtkdoclink href="XMLGENERICERROR"><span class="TYPE">xmlGenericError</span></gtkdoclink> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5258"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5042"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5263"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5047"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5268"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5052"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5273"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5057"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5278"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5062"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5283"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5067"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5288"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5072"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5293"></a><h3>
-<a name="XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT"></a>xmlSecErrorsDefaultCallbackEnableOutput ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecErrorsDefaultCallbackEnableOutput
-                                            (<font>int</font> enabled);</pre>
+<a name="XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT"></a><h3>xmlSecErrorsDefaultCallbackEnableOutput ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecErrorsDefaultCallbackEnableOutput
+                                                        (<font>int</font> enabled);</pre>
 <p>Enables or disables calling LibXML2 callback from the default
 errors callback.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5304"><span style="white-space: nowrap"><var class="PARAMETER">enabled</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5087"><span style="white-space: nowrap"><code class="PARAMETER">enabled</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5309"></a><h3>
-<a name="XMLSECERRORSGETCODE"></a>xmlSecErrorsGetCode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecErrorsGetCode             (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
-<p>Gets the known error code at position <var class="PARAMETER">pos</var>.</p>
+<a name="XMLSECERRORSGETCODE"></a><h3>xmlSecErrorsGetCode ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecErrorsGetCode                 (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<p>Gets the known error code at position <code class="PARAMETER">pos</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5321"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5103"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5326"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the known error code or 0 if <var class="PARAMETER">pos</var> is greater than 
+<td align="LEFT" valign="TOP"><a name="AEN5108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the known error code or 0 if <code class="PARAMETER">pos</code> is greater than 
 total number of known error codes.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5332"></a><h3>
-<a name="XMLSECERRORSGETMSG"></a>xmlSecErrorsGetMsg ()</h3>
-<pre class="PROGRAMLISTING">const <font>char</font>* xmlSecErrorsGetMsg              (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
-<p>Gets the known error message at position <var class="PARAMETER">pos</var>.</p>
+<a name="XMLSECERRORSGETMSG"></a><h3>xmlSecErrorsGetMsg ()</h3>
+<pre class="PROGRAMLISTING">const <font>char</font>*         xmlSecErrorsGetMsg                  (<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<p>Gets the known error message at position <code class="PARAMETER">pos</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5344"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5125"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5349"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the known error message or NULL if <var class="PARAMETER">pos</var> is greater than 
+<td align="LEFT" valign="TOP"><a name="AEN5130"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the known error message or NULL if <code class="PARAMETER">pos</code> is greater than 
 total number of known error codes.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5355"></a><h3>
-<a name="XMLSEC-ERRORS-HERE-CAPS"></a>XMLSEC_ERRORS_HERE</h3>
+<a name="XMLSEC-ERRORS-HERE--CAPS"></a><h3>XMLSEC_ERRORS_HERE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_HERE			__FILE__,__LINE__,__XMLSEC_FUNCTION__</pre>
 <p>The macro that specifies the location (file, line and function)
 for the <a href="xmlsec-errors.html#XMLSECERROR"><code class="FUNCTION">xmlSecError()</code></a> function.</p>
@@ -757,37 +697,34 @@ for the <a href="xmlsec-errors.html#XMLSECERROR"><code class="FUNCTION">xmlSecEr
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5365"></a><h3>
-<a name="XMLSECERRORSSAFESTRING"></a>xmlSecErrorsSafeString()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecErrorsSafeString(str)</pre>
-<p>Macro. Returns <var class="PARAMETER">str</var> if it is not NULL or pointer to "NULL" otherwise.</p>
+<a name="XMLSECERRORSSAFESTRING"></a><h3>xmlSecErrorsSafeString()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecErrorsSafeString(str)</pre>
+<p>Macro. Returns <code class="PARAMETER">str</code> if it is not NULL or pointer to "NULL" otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5375"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5154"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the string.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5380"></a><h3>
-<a name="XMLSEC-ERRORS-NO-MESSAGE-CAPS"></a>XMLSEC_ERRORS_NO_MESSAGE</h3>
+<a name="XMLSEC-ERRORS-NO-MESSAGE--CAPS"></a><h3>XMLSEC_ERRORS_NO_MESSAGE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ERRORS_NO_MESSAGE 		" "</pre>
 <p>Empty error message " ".</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5388"></a><h3>
-<a name="XMLSECERROR"></a>xmlSecError ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecError                     (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg,
-                                             ...);</pre>
+<a name="XMLSECERROR"></a><h3>xmlSecError ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecError                         (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg,
+                                                         ...);</pre>
 <p>Reports an error to the default (<a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK"><span class="TYPE">xmlSecErrorsDefaultCallback</span></a>) or 
 application specific callback installed using <a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK"><span class="TYPE">xmlSecErrorsSetCallback</span></a> 
 function.</p>
@@ -795,75 +732,73 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5409"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5186"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error location filename (__FILE__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5414"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5191"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error location line number (__LINE__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5419"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5196"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error location function (__FUNCTIION__).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5424"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5201"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5429"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5206"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5434"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5211"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5439"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5216"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the error message in printf format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5444"><span style="white-space: nowrap"><var class="PARAMETER">...</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the parameters for the <var class="PARAMETER">msg</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5221"><span style="white-space: nowrap"><code class="PARAMETER">...</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the parameters for the <code class="PARAMETER">msg</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5450"></a><h3>
-<a name="XMLSECASSERT"></a>xmlSecAssert()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecAssert( p )</pre>
-<p>Macro. Verifies that <var class="PARAMETER">p</var> is true and calls <font><code class="FUNCTION">return()</code></font> otherwise.</p>
+<a name="XMLSECASSERT"></a><h3>xmlSecAssert()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecAssert( p )</pre>
+<p>Macro. Verifies that <code class="PARAMETER">p</code> is true and calls <gtkdoclink href="RETURN"><code class="FUNCTION">return()</code></gtkdoclink> otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5462"><span style="white-space: nowrap"><var class="PARAMETER">p</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5238"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the expression.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5467"></a><h3>
-<a name="XMLSECASSERT2"></a>xmlSecAssert2()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecAssert2( p, ret )</pre>
-<p>Macro. Verifies that <var class="PARAMETER">p</var> is true and calls return(<var class="PARAMETER">ret</var>) otherwise.</p>
+<a name="XMLSECASSERT2"></a><h3>xmlSecAssert2()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecAssert2( p, ret )</pre>
+<p>Macro. Verifies that <code class="PARAMETER">p</code> is true and calls return(<code class="PARAMETER">ret</code>) otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5478"><span style="white-space: nowrap"><var class="PARAMETER">p</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5253"><span style="white-space: nowrap"><code class="PARAMETER">p</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5483"><span style="white-space: nowrap"><var class="PARAMETER">ret</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5258"><span style="white-space: nowrap"><code class="PARAMETER">ret</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the return value.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-dl.html"><b>&lt;&lt;&lt;dl</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-io.html"><b>io&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-dl.html"><b>&lt;&lt;&lt; dl</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-io.html"><b>io &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-dynamimc-template.html b/docs/api/xmlsec-examples-sign-dynamimc-template.html
index 118ce72..51064dd 100644
--- a/docs/api/xmlsec-examples-sign-dynamimc-template.html
+++ b/docs/api/xmlsec-examples-sign-dynamimc-template.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing a dynamicaly created template.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Signing a template file." href="xmlsec-examples-sign-template-file.html">
 <link rel="NEXT" title="Signing with X509 certificate." href="xmlsec-examples-sign-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -381,8 +380,8 @@ JjbFqZO+OEzDRSbw3DkmuBA/mtlx+3t13SESfEub5hqoMdVmtth/eTb64dsPdl9r
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-template-file.html"><b>&lt;&lt;&lt;Signing a template file.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-x509.html"><b>Signing with X509 certificate.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-template-file.html"><b>&lt;&lt;&lt; Signing a template file.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-x509.html"><b>Signing with X509 certificate. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-template-file.html b/docs/api/xmlsec-examples-sign-template-file.html
index 74792a3..48b06e8 100644
--- a/docs/api/xmlsec-examples-sign-template-file.html
+++ b/docs/api/xmlsec-examples-sign-template-file.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing a template file.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Examples." href="xmlsec-examples.html">
 <link rel="NEXT" title="Signing a dynamicaly created template." href="xmlsec-examples-sign-dynamimc-template.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -363,8 +362,8 @@ x+YEjSjcO7SBIR1FiUA7pw==&lt;/SignatureValue&gt;
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples.html"><b>&lt;&lt;&lt;Examples.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-dynamimc-template.html"><b>Signing a dynamicaly created template.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples.html"><b>&lt;&lt;&lt; Examples.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-dynamimc-template.html"><b>Signing a dynamicaly created template. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples-sign-x509.html b/docs/api/xmlsec-examples-sign-x509.html
index e9e1393..c40a182 100644
--- a/docs/api/xmlsec-examples-sign-x509.html
+++ b/docs/api/xmlsec-examples-sign-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing with X509 certificate.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Signing a dynamicaly created template." href="xmlsec-examples-sign-dynamimc-template.html">
 <link rel="NEXT" title="Verifying a signature with a single key." href="xmlsec-verify-with-key.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -422,8 +421,8 @@ NJ2D&lt;/X509Certificate&gt;
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-dynamimc-template.html"><b>&lt;&lt;&lt;Signing a dynamicaly created template.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-key.html"><b>Verifying a signature with a single key.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-dynamimc-template.html"><b>&lt;&lt;&lt; Signing a dynamicaly created template.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-key.html"><b>Verifying a signature with a single key. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-examples.html b/docs/api/xmlsec-examples.html
index 0572136..6379899 100644
--- a/docs/api/xmlsec-examples.html
+++ b/docs/api/xmlsec-examples.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Examples.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Sharing the results." href="xmlsec-notes-new-crypto-sharing-results.html">
 <link rel="NEXT" title="Signing a template file." href="xmlsec-examples-sign-template-file.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -112,8 +111,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-sharing-results.html"><b>&lt;&lt;&lt;Sharing the results.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples-sign-template-file.html"><b>Signing a template file.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-sharing-results.html"><b>&lt;&lt;&lt; Sharing the results.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples-sign-template-file.html"><b>Signing a template file. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-app.html b/docs/api/xmlsec-gnutls-app.html
index 54abff3..fe1a348 100644
--- a/docs/api/xmlsec-gnutls-app.html
+++ b/docs/api/xmlsec-gnutls-app.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>app</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for GnuTLS API Reference." href="xmlsec-gnutls-ref.html">
 <link rel="PREVIOUS" title="XML Security Library for GnuTLS API Reference." href="xmlsec-gnutls-ref.html">
 <link rel="NEXT" title="crypto" href="xmlsec-gnutls-crypto.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,379 +87,358 @@
 <h1>
 <a name="XMLSEC-GNUTLS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN25211"></a><h2>Name</h2>app--Application functions implementation for GnuTLS.</div>
+<a name="AEN24300"></a><h2>Name</h2>app -- Application functions implementation for GnuTLS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN25214"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPINIT">xmlSecGnuTLSAppInit</a>             (const <font>char</font> *config);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPSHUTDOWN">xmlSecGnuTLSAppShutdown</a>         (void);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT">xmlSecGnuTLSAppDefaultKeysMngrInit</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD">xmlSecGnuTLSAppDefaultKeysMngrLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE">xmlSecGnuTLSAppDefaultKeysMngrSave</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOAD">xmlSecGnuTLSAppKeysMngrCertLoad</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY">xmlSecGnuTLSAppKeysMngrCertLoadMemory</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOAD">xmlSecGnuTLSAppKeyLoad</a>         (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOADMEMORY">xmlSecGnuTLSAppKeyLoadMemory</a>   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOAD">xmlSecGnuTLSAppPkcs12Load</a>      (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOADMEMORY">xmlSecGnuTLSAppPkcs12LoadMemory</a>
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOAD">xmlSecGnuTLSAppKeyCertLoad</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOADMEMORY">xmlSecGnuTLSAppKeyCertLoadMemory</a>
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*       <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK">xmlSecGnuTLSAppGetDefaultPwdCallback</a>
-                                            (void);</pre>
+<a name="XMLSEC-GNUTLS-APP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPINIT">xmlSecGnuTLSAppInit</a>                 (const <font>char</font> *config);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPSHUTDOWN">xmlSecGnuTLSAppShutdown</a>             (void);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT">xmlSecGnuTLSAppDefaultKeysMngrInit</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecGnuTLSAppDefaultKeysMngrAdoptKey</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD">xmlSecGnuTLSAppDefaultKeysMngrLoad</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE">xmlSecGnuTLSAppDefaultKeysMngrSave</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOAD">xmlSecGnuTLSAppKeysMngrCertLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY">xmlSecGnuTLSAppKeysMngrCertLoadMemory</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOAD">xmlSecGnuTLSAppKeyLoad</a>              (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYLOADMEMORY">xmlSecGnuTLSAppKeyLoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOAD">xmlSecGnuTLSAppPkcs12Load</a>           (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPPKCS12LOADMEMORY">xmlSecGnuTLSAppPkcs12LoadMemory</a>     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOAD">xmlSecGnuTLSAppKeyCertLoad</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPKEYCERTLOADMEMORY">xmlSecGnuTLSAppKeyCertLoadMemory</a>    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>void</font>*               <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK">xmlSecGnuTLSAppGetDefaultPwdCallback</a>
+                                                        (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN25292"></a><h2>Description</h2>
+<a name="XMLSEC-GNUTLS-APP.DESCRIPTION"></a><h2>Description</h2>
 <p>Application functions implementation for GnuTLS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN25295"></a><h2>Details</h2>
+<a name="XMLSEC-GNUTLS-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN25297"></a><h3>
-<a name="XMLSECGNUTLSAPPINIT"></a>xmlSecGnuTLSAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppInit             (const <font>char</font> *config);</pre>
+<a name="XMLSECGNUTLSAPPINIT"></a><h3>xmlSecGnuTLSAppInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppInit                 (const <font>char</font> *config);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
-<var class="PARAMETER">xmlSecInit</var> function.</p>
+<code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25309"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24397"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to GnuTLS configuration (unused).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25314"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24402"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25319"></a><h3>
-<a name="XMLSECGNUTLSAPPSHUTDOWN"></a>xmlSecGnuTLSAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppShutdown         (void);</pre>
+<a name="XMLSECGNUTLSAPPSHUTDOWN"></a><h3>xmlSecGnuTLSAppShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppShutdown             (void);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
-<var class="PARAMETER">xmlSecShutdown</var> function.</p>
+<code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25330"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24417"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25335"></a><h3>
-<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"></a>xmlSecGnuTLSAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppDefaultKeysMngrInit
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
-<p>Initializes <var class="PARAMETER">mngr</var> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
+<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrInit  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default GnuTLS crypto key data stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25349"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24435"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25354"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24440"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25359"></a><h3>
-<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY"></a>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the keys manager <var class="PARAMETER">mngr</var> created with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecGnuTLSAppDefaultKeysMngrInit</span></a>
+<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrAdoptKey
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecGnuTLSAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25375"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24460"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25380"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24465"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25385"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24470"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25390"></a><h3>
-<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD"></a>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppDefaultKeysMngrLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);</pre>
-<p>Loads XML keys file from <var class="PARAMETER">uri</var> to the keys manager <var class="PARAMETER">mngr</var> created 
+<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrLoad  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);</pre>
+<p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created 
 with <a href="xmlsec-gnutls-app.html#XMLSECGNUTLSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecGnuTLSAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25406"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24490"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25411"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24495"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24500"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25421"></a><h3>
-<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE"></a>xmlSecGnuTLSAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppDefaultKeysMngrSave
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Saves keys from <var class="PARAMETER">mngr</var> to  XML keys file.</p>
+<a name="XMLSECGNUTLSAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecGnuTLSAppDefaultKeysMngrSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppDefaultKeysMngrSave  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25435"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24518"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25440"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24523"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25445"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24528"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25450"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24533"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25455"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOAD"></a>xmlSecGnuTLSAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppKeysMngrCertLoad (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">filename</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
+<a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecGnuTLSAppKeysMngrCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeysMngrCertLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25471"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24553"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25476"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24558"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25481"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24563"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25486"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
+<td align="LEFT" valign="TOP"><a name="AEN24568"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
    			trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25492"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25497"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY"></a>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppKeysMngrCertLoadMemory
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from binary buffer <var class="PARAMETER">data</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
+<a name="XMLSECGNUTLSAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeysMngrCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeysMngrCertLoadMemory
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25514"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24595"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25519"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24600"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25524"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24605"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25529"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24610"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25534"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24615"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24620"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25544"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYLOAD"></a>xmlSecGnuTLSAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecGnuTLSAppKeyLoad         (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECGNUTLSAPPKEYLOAD"></a><h3>xmlSecGnuTLSAppKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppKeyLoad              (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the a file (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25559"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24639"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25564"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24644"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25569"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24649"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25574"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24654"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25579"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24659"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24664"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25589"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYLOADMEMORY"></a>xmlSecGnuTLSAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecGnuTLSAppKeyLoadMemory   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECGNUTLSAPPKEYLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeyLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppKeyLoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the memory buffer (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25605"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24684"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25610"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24689"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25615"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24694"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25620"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24699"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25625"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24704"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25630"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24709"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25635"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24714"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25640"></a><h3>
-<a name="XMLSECGNUTLSAPPPKCS12LOAD"></a>xmlSecGnuTLSAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecGnuTLSAppPkcs12Load      (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECGNUTLSAPPPKCS12LOAD"></a><h3>xmlSecGnuTLSAppPkcs12Load ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppPkcs12Load           (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file
 (not implemented yet).
 For uniformity, call xmlSecGnuTLSAppKeyLoad instead of this function. Pass
@@ -469,37 +447,35 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25654"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24732"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25659"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24737"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25664"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24742"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25669"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24747"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25674"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24752"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25679"></a><h3>
-<a name="XMLSECGNUTLSAPPPKCS12LOADMEMORY"></a>xmlSecGnuTLSAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecGnuTLSAppPkcs12LoadMemory
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECGNUTLSAPPPKCS12LOADMEMORY"></a><h3>xmlSecGnuTLSAppPkcs12LoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecGnuTLSAppPkcs12LoadMemory     (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecGnuTLSAppKeyLoadMemory instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
@@ -507,109 +483,110 @@ in format=xmlSecKeyDataFormatPkcs12 (not implemented yet).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25694"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24771"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25699"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24776"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25704"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24781"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25709"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24786"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25714"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24791"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25719"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24796"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25724"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYCERTLOAD"></a>xmlSecGnuTLSAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppKeyCertLoad      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">filename</var> and adds it to key
+<a name="XMLSECGNUTLSAPPKEYCERTLOAD"></a><h3>xmlSecGnuTLSAppKeyCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeyCertLoad          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key
 (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25738"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24814"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25743"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24819"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25748"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24824"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25753"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24829"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25758"></a><h3>
-<a name="XMLSECGNUTLSAPPKEYCERTLOADMEMORY"></a>xmlSecGnuTLSAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSAppKeyCertLoadMemory
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECGNUTLSAPPKEYCERTLOADMEMORY"></a><h3>xmlSecGnuTLSAppKeyCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSAppKeyCertLoadMemory    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Reads the certificate from memory buffer and adds it to key (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25772"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24847"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25777"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24852"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25782"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24857"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25787"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24862"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25792"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24867"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25797"></a><h3>
-<a name="XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK"></a>xmlSecGnuTLSAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*       xmlSecGnuTLSAppGetDefaultPwdCallback
-                                            (void);</pre>
+<a name="XMLSECGNUTLSAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecGnuTLSAppGetDefaultPwdCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecGnuTLSAppGetDefaultPwdCallback
+                                                        (void);</pre>
 <p>Gets default password callback.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN24881"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> default password callback.</p></td>
+</tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-ref.html"><b>&lt;&lt;&lt;XML Security Library for GnuTLS API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-crypto.html"><b>crypto&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-ref.html"><b>&lt;&lt;&lt; XML Security Library for GnuTLS API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-crypto.html"><b>crypto &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-crypto.html b/docs/api/xmlsec-gnutls-crypto.html
index a7993a9..39966dc 100644
--- a/docs/api/xmlsec-gnutls-crypto.html
+++ b/docs/api/xmlsec-gnutls-crypto.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>crypto</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for GnuTLS API Reference." href="xmlsec-gnutls-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-gnutls-app.html">
 <link rel="NEXT" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,514 +87,468 @@
 <h1>
 <a name="XMLSEC-GNUTLS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN25811"></a><h2>Name</h2>crypto--Crypto transforms implementation for GnuTLS.</div>
+<a name="AEN24891"></a><h2>Name</h2>crypto -- Crypto transforms implementation for GnuTLS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN25814"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">xmlSecCryptoGetFunctions_gnutls</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSINIT">xmlSecGnuTLSInit</a>                (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">xmlSecGnuTLSShutdown</a>            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">xmlSecGnuTLSKeysMngrInit</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSGENERATERANDOM">xmlSecGnuTLSGenerateRandom</a>      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESID">xmlSecGnuTLSKeyDataAesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESGETKLASS">xmlSecGnuTLSKeyDataAesGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESSET">xmlSecGnuTLSKeyDataAesSet</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCID">xmlSecGnuTLSTransformAes128CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">xmlSecGnuTLSTransformAes128CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCID">xmlSecGnuTLSTransformAes192CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS">xmlSecGnuTLSTransformAes192CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCID">xmlSecGnuTLSTransformAes256CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS">xmlSecGnuTLSTransformAes256CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESID">xmlSecGnuTLSKeyDataDesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">xmlSecGnuTLSKeyDataDesGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">xmlSecGnuTLSKeyDataDesSet</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCID">xmlSecGnuTLSTransformDes3CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">xmlSecGnuTLSTransformDes3CbcGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACGETMINOUTPUTLENGTH">xmlSecGnuTLSHmacGetMinOutputLength</a>
-                                            (void);
-<font>void</font>        <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACSETMINOUTPUTLENGTH">xmlSecGnuTLSHmacSetMinOutputLength</a>
-                                            (<font>int</font> min_length);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACID">xmlSecGnuTLSKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">xmlSecGnuTLSKeyDataHmacGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">xmlSecGnuTLSKeyDataHmacSet</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5ID">xmlSecGnuTLSTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">xmlSecGnuTLSTransformHmacMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID">xmlSecGnuTLSTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGnuTLSTransformHmacRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1ID">xmlSecGnuTLSTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">xmlSecGnuTLSTransformHmacSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1ID">xmlSecGnuTLSTransformSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">xmlSecGnuTLSTransformSha1GetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-GNUTLS-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-gnutls-crypto.html#XMLSECCRYPTOGETFUNCTIONS-GNUTLS">xmlSecCryptoGetFunctions_gnutls</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSINIT">xmlSecGnuTLSInit</a>                    (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSSHUTDOWN">xmlSecGnuTLSShutdown</a>                (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYSMNGRINIT">xmlSecGnuTLSKeysMngrInit</a>            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSGENERATERANDOM">xmlSecGnuTLSGenerateRandom</a>          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESID">xmlSecGnuTLSKeyDataAesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESGETKLASS">xmlSecGnuTLSKeyDataAesGetKlass</a>      (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAAESSET">xmlSecGnuTLSKeyDataAesSet</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCID">xmlSecGnuTLSTransformAes128CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS">xmlSecGnuTLSTransformAes128CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCID">xmlSecGnuTLSTransformAes192CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS">xmlSecGnuTLSTransformAes192CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCID">xmlSecGnuTLSTransformAes256CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS">xmlSecGnuTLSTransformAes256CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESID">xmlSecGnuTLSKeyDataDesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESGETKLASS">xmlSecGnuTLSKeyDataDesGetKlass</a>      (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATADESSET">xmlSecGnuTLSKeyDataDesSet</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCID">xmlSecGnuTLSTransformDes3CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS">xmlSecGnuTLSTransformDes3CbcGetKlass</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACGETMINOUTPUTLENGTH">xmlSecGnuTLSHmacGetMinOutputLength</a>  (void);
+<font>void</font>                <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSHMACSETMINOUTPUTLENGTH">xmlSecGnuTLSHmacSetMinOutputLength</a>  (<font>int</font> min_length);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACID">xmlSecGnuTLSKeyDataHmacId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACGETKLASS">xmlSecGnuTLSKeyDataHmacGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSKEYDATAHMACSET">xmlSecGnuTLSKeyDataHmacSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5ID">xmlSecGnuTLSTransformHmacMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS">xmlSecGnuTLSTransformHmacMd5GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID">xmlSecGnuTLSTransformHmacRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecGnuTLSTransformHmacRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1ID">xmlSecGnuTLSTransformHmacSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS">xmlSecGnuTLSTransformHmacSha1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1ID">xmlSecGnuTLSTransformSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-gnutls-crypto.html#XMLSECGNUTLSTRANSFORMSHA1GETKLASS">xmlSecGnuTLSTransformSha1GetKlass</a>   (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN25883"></a><h2>Description</h2>
+<a name="XMLSEC-GNUTLS-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto transforms implementation for GnuTLS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN25886"></a><h2>Details</h2>
+<a name="XMLSEC-GNUTLS-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN25888"></a><h3>
-<a name="XMLSECCRYPTOGETFUNCTIONS-GNUTLS"></a>xmlSecCryptoGetFunctions_gnutls ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoGetFunctions_gnutls
-                                            (void);</pre>
+<a name="XMLSECCRYPTOGETFUNCTIONS-GNUTLS"></a><h3>xmlSecCryptoGetFunctions_gnutls ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_gnutls
+                                                        (void);</pre>
 <p>Gets the pointer to xmlsec-gnutls functions table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25898"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the xmlsec-gnutls functions table or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24977"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the xmlsec-gnutls functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25903"></a><h3>
-<a name="XMLSECGNUTLSINIT"></a>xmlSecGnuTLSInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSInit                (void);</pre>
+<a name="XMLSECGNUTLSINIT"></a><h3>xmlSecGnuTLSInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSInit                    (void);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25913"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24991"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25918"></a><h3>
-<a name="XMLSECGNUTLSSHUTDOWN"></a>xmlSecGnuTLSShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSShutdown            (void);</pre>
+<a name="XMLSECGNUTLSSHUTDOWN"></a><h3>xmlSecGnuTLSShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSShutdown                (void);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN25928"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25005"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25933"></a><h3>
-<a name="XMLSECGNUTLSKEYSMNGRINIT"></a>xmlSecGnuTLSKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSKeysMngrInit        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECGNUTLSKEYSMNGRINIT"></a><h3>xmlSecGnuTLSKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeysMngrInit            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Adds GnuTLS specific key data stores in keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25944"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25020"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25949"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25954"></a><h3>
-<a name="XMLSECGNUTLSGENERATERANDOM"></a>xmlSecGnuTLSGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSGenerateRandom      (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Generates <var class="PARAMETER">size</var> random bytes and puts result in <var class="PARAMETER">buffer</var>.</p>
+<a name="XMLSECGNUTLSGENERATERANDOM"></a><h3>xmlSecGnuTLSGenerateRandom ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSGenerateRandom          (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25968"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25043"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25973"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25048"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25978"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25053"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25983"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAAESID"></a>xmlSecGnuTLSKeyDataAesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSKeyDataAesId</pre>
+<a name="XMLSECGNUTLSKEYDATAAESID"></a><h3>xmlSecGnuTLSKeyDataAesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataAesId</pre>
 <p>The AES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25991"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAAESGETKLASS"></a>xmlSecGnuTLSKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecGnuTLSKeyDataAesGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSKEYDATAAESGETKLASS"></a><h3>xmlSecGnuTLSKeyDataAesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataAesGetKlass      (void);</pre>
 <p>The AES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26001"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25074"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26006"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAAESSET"></a>xmlSecGnuTLSKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSKeyDataAesSet       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECGNUTLSKEYDATAAESSET"></a><h3>xmlSecGnuTLSKeyDataAesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataAesSet           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26019"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25091"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26024"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25096"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26029"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25101"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26034"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26039"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES128CBCID"></a>xmlSecGnuTLSTransformAes128CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformAes128CbcId</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES128CBCID"></a><h3>xmlSecGnuTLSTransformAes128CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26047"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS"></a>xmlSecGnuTLSTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformAes128CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes128CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes128CbcGetKlass
+                                                        (void);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26057"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 128 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25127"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26062"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES192CBCID"></a>xmlSecGnuTLSTransformAes192CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformAes192CbcId</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES192CBCID"></a><h3>xmlSecGnuTLSTransformAes192CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26070"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS"></a>xmlSecGnuTLSTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformAes192CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes192CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes192CbcGetKlass
+                                                        (void);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 192 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25148"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26085"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES256CBCID"></a>xmlSecGnuTLSTransformAes256CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformAes256CbcId</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES256CBCID"></a><h3>xmlSecGnuTLSTransformAes256CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26093"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS"></a>xmlSecGnuTLSTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformAes256CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformAes256CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformAes256CbcGetKlass
+                                                        (void);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26103"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 256 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25169"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26108"></a><h3>
-<a name="XMLSECGNUTLSKEYDATADESID"></a>xmlSecGnuTLSKeyDataDesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSKeyDataDesId</pre>
+<a name="XMLSECGNUTLSKEYDATADESID"></a><h3>xmlSecGnuTLSKeyDataDesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataDesId</pre>
 <p>The DES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26116"></a><h3>
-<a name="XMLSECGNUTLSKEYDATADESGETKLASS"></a>xmlSecGnuTLSKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecGnuTLSKeyDataDesGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSKEYDATADESGETKLASS"></a><h3>xmlSecGnuTLSKeyDataDesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataDesGetKlass      (void);</pre>
 <p>The DES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26126"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25190"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26131"></a><h3>
-<a name="XMLSECGNUTLSKEYDATADESSET"></a>xmlSecGnuTLSKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSKeyDataDesSet       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECGNUTLSKEYDATADESSET"></a><h3>xmlSecGnuTLSKeyDataDesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataDesSet           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26144"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25207"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26149"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25212"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26154"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25217"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26159"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25222"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26164"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMDES3CBCID"></a>xmlSecGnuTLSTransformDes3CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformDes3CbcId</pre>
+<a name="XMLSECGNUTLSTRANSFORMDES3CBCID"></a><h3>xmlSecGnuTLSTransformDes3CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26172"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS"></a>xmlSecGnuTLSTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformDes3CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecGnuTLSTransformDes3CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformDes3CbcGetKlass
+                                                        (void);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26182"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to Triple DES encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25243"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26187"></a><h3>
-<a name="XMLSECGNUTLSHMACGETMINOUTPUTLENGTH"></a>xmlSecGnuTLSHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSHmacGetMinOutputLength
-                                            (void);</pre>
+<a name="XMLSECGNUTLSHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecGnuTLSHmacGetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSHmacGetMinOutputLength  (void);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the min HMAC output length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25257"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26202"></a><h3>
-<a name="XMLSECGNUTLSHMACSETMINOUTPUTLENGTH"></a>xmlSecGnuTLSHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecGnuTLSHmacSetMinOutputLength
-                                            (<font>int</font> min_length);</pre>
+<a name="XMLSECGNUTLSHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecGnuTLSHmacSetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecGnuTLSHmacSetMinOutputLength  (<font>int</font> min_length);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26213"><span style="white-space: nowrap"><var class="PARAMETER">min_length</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25272"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the new min length </p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26218"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAHMACID"></a>xmlSecGnuTLSKeyDataHmacId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSKeyDataHmacId</pre>
+<a name="XMLSECGNUTLSKEYDATAHMACID"></a><h3>xmlSecGnuTLSKeyDataHmacId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSKeyDataHmacId</pre>
 <p>The HMAC key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26226"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAHMACGETKLASS"></a>xmlSecGnuTLSKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecGnuTLSKeyDataHmacGetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSKEYDATAHMACGETKLASS"></a><h3>xmlSecGnuTLSKeyDataHmacGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecGnuTLSKeyDataHmacGetKlass     (void);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26236"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HMAC key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26241"></a><h3>
-<a name="XMLSECGNUTLSKEYDATAHMACSET"></a>xmlSecGnuTLSKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGnuTLSKeyDataHmacSet      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECGNUTLSKEYDATAHMACSET"></a><h3>xmlSecGnuTLSKeyDataHmacSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGnuTLSKeyDataHmacSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26254"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25310"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26259"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25315"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26264"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25320"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26269"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25325"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26274"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACMD5ID"></a>xmlSecGnuTLSTransformHmacMd5Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformHmacMd5Id</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACMD5ID"></a><h3>xmlSecGnuTLSTransformHmacMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26282"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS"></a>xmlSecGnuTLSTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformHmacMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacMd5GetKlass
+                                                        (void);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26292"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-MD5 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25346"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26297"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID"></a>xmlSecGnuTLSTransformHmacRipemd160Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformHmacRipemd160Id</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecGnuTLSTransformHmacRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26305"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS"></a>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformHmacRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacRipemd160GetKlass
+                                                        (void);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26315"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-RIPEMD160 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25367"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26320"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACSHA1ID"></a>xmlSecGnuTLSTransformHmacSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformHmacSha1Id</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACSHA1ID"></a><h3>xmlSecGnuTLSTransformHmacSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26328"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS"></a>xmlSecGnuTLSTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformHmacSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformHmacSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformHmacSha1GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA1 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25388"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26343"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMSHA1ID"></a>xmlSecGnuTLSTransformSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGnuTLSTransformSha1Id</pre>
+<a name="XMLSECGNUTLSTRANSFORMSHA1ID"></a><h3>xmlSecGnuTLSTransformSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGnuTLSTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26351"></a><h3>
-<a name="XMLSECGNUTLSTRANSFORMSHA1GETKLASS"></a>xmlSecGnuTLSTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecGnuTLSTransformSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECGNUTLSTRANSFORMSHA1GETKLASS"></a><h3>xmlSecGnuTLSTransformSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecGnuTLSTransformSha1GetKlass   (void);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26361"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-1 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25409"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-app.html"><b>&lt;&lt;&lt;app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-ref.html"><b>XML Security Library for NSS API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-app.html"><b>&lt;&lt;&lt; app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-ref.html"><b>XML Security Library for NSS API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-gnutls-ref.html b/docs/api/xmlsec-gnutls-ref.html
index 20b2259..391447b 100644
--- a/docs/api/xmlsec-gnutls-ref.html
+++ b/docs/api/xmlsec-gnutls-ref.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library for GnuTLS API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="x509" href="xmlsec-openssl-x509.html">
 <link rel="NEXT" title="app" href="xmlsec-gnutls-app.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -91,17 +90,17 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-gnutls-app.html">app</a>--Application functions implementation for GnuTLS.</dt>
+<a href="xmlsec-gnutls-app.html">app</a> -- Application functions implementation for GnuTLS.</dt>
 <dt>
-<a href="xmlsec-gnutls-crypto.html">crypto</a>--Crypto transforms implementation for GnuTLS.</dt>
+<a href="xmlsec-gnutls-crypto.html">crypto</a> -- Crypto transforms implementation for GnuTLS.</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-gnutls. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-x509.html"><b>&lt;&lt;&lt;x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-app.html"><b>app&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-x509.html"><b>&lt;&lt;&lt; x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-index.html b/docs/api/xmlsec-index.html
index a367a6d..1c71226 100644
--- a/docs/api/xmlsec-index.html
+++ b/docs/api/xmlsec-index.html
@@ -2,11 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library Reference Index</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="x509" href="xmlsec-mscrypto-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -89,7 +88,7 @@
 <p>	</p>
 <p></p>
 <ul>
-<li><p><a href="xmlsec-xmlsec.html#ATTRIBUTE-UNUSED-CAPS">ATTRIBUTE-UNUSED</a></p></li>
+<li><p><font>ATTRIBUTE-UNUSED</font></p></li>
 <li><p><a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECADDCHILD">xmlSecAddChild</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECADDCHILDNODE">xmlSecAddChildNode</a></p></li>
@@ -108,7 +107,7 @@
 <li><p><a href="xmlsec-base64.html#XMLSECBASE64DECODE">xmlSecBase64Decode</a></p></li>
 <li><p><a href="xmlsec-base64.html#XMLSECBASE64ENCODE">xmlSecBase64Encode</a></p></li>
 <li><p><a href="xmlsec-base64.html#XMLSECBASE64GETDEFAULTLINESIZE">xmlSecBase64GetDefaultLineSize</a></p></li>
-<li><p><a href="xmlsec-base64.html#XMLSEC-BASE64-LINESIZE-CAPS">XMLSEC-BASE64-LINESIZE</a></p></li>
+<li><p><font>XMLSEC-BASE64-LINESIZE</font></p></li>
 <li><p><a href="xmlsec-base64.html#XMLSECBASE64SETDEFAULTLINESIZE">xmlSecBase64SetDefaultLineSize</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a></p></li>
 <li><p><a href="xmlsec-bn.html#XMLSECBNADD">xmlSecBnAdd</a></p></li>
@@ -222,11 +221,11 @@
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtx</a></p></li>
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">xmlSecDSigCtxSign</a></p></li>
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">xmlSecDSigCtxVerify</a></p></li>
-<li><p><a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS</a></p></li>
-<li><p><a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES</a></p></li>
-<li><p><a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">XMLSEC-DSIG-FLAGS-STORE-SIGNATURE</a></p></li>
-<li><p><a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES</a></p></li>
-<li><p><a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK</a></p></li>
+<li><p><font>XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS</font></p></li>
+<li><p><font>XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES</font></p></li>
+<li><p><font>XMLSEC-DSIG-FLAGS-STORE-SIGNATURE</font></p></li>
+<li><p><font>XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES</font></p></li>
+<li><p><font>XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK</font></p></li>
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">xmlSecDSigReferenceCtxCreate</a></p></li>
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">xmlSecDSigReferenceCtxDebugDump</a></p></li>
 <li><p><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">xmlSecDSigReferenceCtxDebugXmlDump</a></p></li>
@@ -254,64 +253,64 @@
 <li><p><a href="xmlsec-xmlenc.html#XMLSECENCCTXRESET">xmlSecEncCtxReset</a></p></li>
 <li><p><a href="xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">xmlSecEncCtxUriEncrypt</a></p></li>
 <li><p><a href="xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">xmlSecEncCtxXmlEncrypt</a></p></li>
-<li><p><a href="xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS">XMLSEC-ENC-RETURN-REPLACED-NODE</a></p></li>
+<li><p><font>XMLSEC-ENC-RETURN-REPLACED-NODE</font></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERROR">xmlSecError</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSCALLBACK">xmlSecErrorsCallback</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACKENABLEOUTPUT">xmlSecErrorsDefaultCallbackEnableOutput</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSDEFAULTCALLBACK">xmlSecErrorsDefaultCallback</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSGETCODE">xmlSecErrorsGetCode</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSGETMSG">xmlSecErrorsGetMsg</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-HERE-CAPS">XMLSEC-ERRORS-HERE</a></p></li>
+<li><p><font>XMLSEC-ERRORS-HERE</font></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSINIT">xmlSecErrorsInit</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-MAX-NUMBER-CAPS">XMLSEC-ERRORS-MAX-NUMBER</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-NO-MESSAGE-CAPS">XMLSEC-ERRORS-NO-MESSAGE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-ASSERTION-CAPS">XMLSEC-ERRORS-R-ASSERTION</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-HAS-EXPIRED-CAPS">XMLSEC-ERRORS-R-CERT-HAS-EXPIRED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-ISSUER-FAILED-CAPS">XMLSEC-ERRORS-R-CERT-ISSUER-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-CERT-NOT-FOUND</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-NOT-YET-VALID-CAPS">XMLSEC-ERRORS-R-CERT-NOT-YET-VALID</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-REVOKED-CAPS">XMLSEC-ERRORS-R-CERT-REVOKED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CERT-VERIFY-FAILED-CAPS">XMLSEC-ERRORS-R-CERT-VERIFY-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-CRYPTO-FAILED-CAPS">XMLSEC-ERRORS-R-CRYPTO-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DATA-NOT-MATCH-CAPS">XMLSEC-ERRORS-R-DATA-NOT-MATCH</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DISABLED-CAPS">XMLSEC-ERRORS-R-DISABLED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE-CAPS">XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-DSIG-NO-REFERENCES-CAPS">XMLSEC-ERRORS-R-DSIG-NO-REFERENCES</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-DATA-CAPS">XMLSEC-ERRORS-R-INVALID-DATA</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-FORMAT-CAPS">XMLSEC-ERRORS-R-INVALID-FORMAT</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-CAPS">XMLSEC-ERRORS-R-INVALID-KEY-DATA</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE-CAPS">XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE-CAPS">XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CONTENT-CAPS">XMLSEC-ERRORS-R-INVALID-NODE-CONTENT</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-NODE-CAPS">XMLSEC-ERRORS-R-INVALID-NODE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-OPERATION-CAPS">XMLSEC-ERRORS-R-INVALID-OPERATION</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-RESULT-CAPS">XMLSEC-ERRORS-R-INVALID-RESULT</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-SIZE-CAPS">XMLSEC-ERRORS-R-INVALID-SIZE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-STATUS-CAPS">XMLSEC-ERRORS-R-INVALID-STATUS</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY-CAPS">XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TRANSFORM-CAPS">XMLSEC-ERRORS-R-INVALID-TRANSFORM</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-TYPE-CAPS">XMLSEC-ERRORS-R-INVALID-TYPE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-INVALID-URI-TYPE-CAPS">XMLSEC-ERRORS-R-INVALID-URI-TYPE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-IO-FAILED-CAPS">XMLSEC-ERRORS-R-IO-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST-CAPS">XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEYDATA-DISABLED-CAPS">XMLSEC-ERRORS-R-KEYDATA-DISABLED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-KEY-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-KEY-NOT-FOUND</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MALLOC-FAILED-CAPS">XMLSEC-ERRORS-R-MALLOC-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL-CAPS">XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL-CAPS">XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH-CAPS">XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE-CAPS">XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT-CAPS">XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NODE-NOT-FOUND-CAPS">XMLSEC-ERRORS-R-NODE-NOT-FOUND</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-NOT-IMPLEMENTED-CAPS">XMLSEC-ERRORS-R-NOT-IMPLEMENTED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-STRDUP-FAILED-CAPS">XMLSEC-ERRORS-R-STRDUP-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-DISABLED-CAPS">XMLSEC-ERRORS-R-TRANSFORM-DISABLED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED-CAPS">XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-UNEXPECTED-NODE-CAPS">XMLSEC-ERRORS-R-UNEXPECTED-NODE</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XML-FAILED-CAPS">XMLSEC-ERRORS-R-XML-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XMLSEC-FAILED-CAPS">XMLSEC-ERRORS-R-XMLSEC-FAILED</a></p></li>
-<li><p><a href="xmlsec-errors.html#XMLSEC-ERRORS-R-XSLT-FAILED-CAPS">XMLSEC-ERRORS-R-XSLT-FAILED</a></p></li>
+<li><p><font>XMLSEC-ERRORS-MAX-NUMBER</font></p></li>
+<li><p><font>XMLSEC-ERRORS-NO-MESSAGE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-ASSERTION</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-HAS-EXPIRED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-ISSUER-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-NOT-FOUND</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-NOT-YET-VALID</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-REVOKED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CERT-VERIFY-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-CRYPTO-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-DATA-NOT-MATCH</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-DISABLED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-DSIG-INVALID-REFERENCE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-DSIG-NO-REFERENCES</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-DATA</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-FORMAT</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-KEY-DATA</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-KEY-DATA-SIZE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-NODE-ATTRIBUTE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-NODE-CONTENT</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-NODE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-OPERATION</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-RESULT</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-SIZE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-STATUS</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-TRANSFORM-KEY</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-TRANSFORM</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-TYPE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-INVALID-URI-TYPE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-IO-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-KEY-DATA-ALREADY-EXIST</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-KEYDATA-DISABLED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-KEY-DATA-NOT-FOUND</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-KEY-NOT-FOUND</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-MALLOC-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-MAX-ENCKEY-LEVEL</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-MAX-RETRIEVALS-LEVEL</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-MAX-RETRIEVAL-TYPE-MISMATCH</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-MISSING-NODE-ATTRIBUTE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-NODE-ALREADY-PRESENT</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-NODE-NOT-FOUND</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-NOT-IMPLEMENTED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-STRDUP-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-TRANSFORM-DISABLED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-TRANSFORM-SAME-DOCUMENT-REQUIRED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-UNEXPECTED-NODE</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-XML-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-XMLSEC-FAILED</font></p></li>
+<li><p><font>XMLSEC-ERRORS-R-XSLT-FAILED</font></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSSAFESTRING">xmlSecErrorsSafeString</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSSETCALLBACK">xmlSecErrorsSetCallback</a></p></li>
 <li><p><a href="xmlsec-errors.html#XMLSECERRORSSHUTDOWN">xmlSecErrorsShutdown</a></p></li>
@@ -529,19 +528,19 @@
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">xmlSecKeyInfoCtxInitialize</a></p></li>
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a></p></li>
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">xmlSecKeyInfoCtxReset</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT</a></p></li>
-<li><p><a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD</a></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT</font></p></li>
+<li><p><font>XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD</font></p></li>
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a></p></li>
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">xmlSecKeyInfoNodeRead</a></p></li>
 <li><p><a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">xmlSecKeyInfoNodeWrite</a></p></li>
@@ -697,7 +696,7 @@
 <li><p><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">xmlSecMSCryptoX509StoreGetKlass</a></p></li>
 <li><p><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREID">xmlSecMSCryptoX509StoreId</a></p></li>
 <li><p><a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREVERIFY">xmlSecMSCryptoX509StoreVerify</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-NO-AES-CAPS">XMLSEC-NO-AES</a></p></li>
+<li><p><font>XMLSEC-NO-AES</font></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">xmlSecNodeEncodeAndSetContent</a></p></li>
 <li><p><a href="xmlsec-xmltree.html#XMLSECNODEGETNAME">xmlSecNodeGetName</a></p></li>
 <li><p><a href="xmlsec-nodeset.html#XMLSECNODESETADDLIST">xmlSecNodeSetAddList</a></p></li>
@@ -714,10 +713,10 @@
 <li><p><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a></p></li>
 <li><p><a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a></p></li>
 <li><p><a href="xmlsec-nodeset.html#XMLSECNODESETWALK">xmlSecNodeSetWalk</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA224-CAPS">XMLSEC-NO-SHA224</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA256-CAPS">XMLSEC-NO-SHA256</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA384-CAPS">XMLSEC-NO-SHA384</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA512-CAPS">XMLSEC-NO-SHA512</a></p></li>
+<li><p><font>XMLSEC-NO-SHA224</font></p></li>
+<li><p><font>XMLSEC-NO-SHA256</font></p></li>
+<li><p><font>XMLSEC-NO-SHA384</font></p></li>
+<li><p><font>XMLSEC-NO-SHA512</font></p></li>
 <li><p><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecNssAppDefaultKeysMngrAdoptKey</a></p></li>
 <li><p><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">xmlSecNssAppDefaultKeysMngrInit</a></p></li>
 <li><p><a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">xmlSecNssAppDefaultKeysMngrLoad</a></p></li>
@@ -844,8 +843,8 @@
 <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a></p></li>
 <li><p><a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a></p></li>
 <li><p><a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">XMLSEC-OPENSSL-ERRORS-FUNCTION</a></p></li>
-<li><p><a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB-CAPS">XMLSEC-OPENSSL-ERRORS-LIB</a></p></li>
+<li><p><font>XMLSEC-OPENSSL-ERRORS-FUNCTION</font></p></li>
+<li><p><font>XMLSEC-OPENSSL-ERRORS-LIB</font></p></li>
 <li><p><a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">xmlSecOpenSSLEvpKeyAdopt</a></p></li>
 <li><p><a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">xmlSecOpenSSLEvpKeyDataAdoptEvp</a></p></li>
 <li><p><a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">xmlSecOpenSSLEvpKeyDataGetEvp</a></p></li>
@@ -969,6 +968,7 @@
 <li><p><a href="xmlsec-parser.html#XMLSECPARSEFILE">xmlSecParseFile</a></p></li>
 <li><p><a href="xmlsec-parser.html#XMLSECPARSEMEMORYEXT">xmlSecParseMemoryExt</a></p></li>
 <li><p><a href="xmlsec-parser.html#XMLSECPARSEMEMORY">xmlSecParseMemory</a></p></li>
+<li><p><a href="xmlsec-xmltree.html#XMLSECPRINTXMLSTRING">xmlSecPrintXmlString</a></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">xmlSecPtrDestroyItemMethod</a></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">xmlSecPtrDuplicateItemMethod</a></p></li>
@@ -1055,8 +1055,8 @@
 <li><p><font>xmlSecSoap12GetBody</font></p></li>
 <li><p><font>xmlSecSoap12GetFaultEntry</font></p></li>
 <li><p><font>xmlSecSoap12GetHeader</font></p></li>
-<li><p><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC-STACK-OF-X509-CRL</a></p></li>
-<li><p><a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CAPS">XMLSEC-STACK-OF-X509</a></p></li>
+<li><p><font>XMLSEC-STACK-OF-X509-CRL</font></p></li>
+<li><p><font>XMLSEC-STACK-OF-X509</font></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">xmlSecStringListGetKlass</a></p></li>
 <li><p><a href="xmlsec-list.html#XMLSECSTRINGLISTID">xmlSecStringListId</a></p></li>
 <li><p><font>xmlSecStrPrintf</font></p></li>
@@ -1111,7 +1111,7 @@
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">xmlSecTransformBase64GetKlass</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64ID">xmlSecTransformBase64Id</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">xmlSecTransformBase64SetLineSize</a></p></li>
-<li><p><a href="xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">XMLSEC-TRANSFORM-BINARY-CHUNK</a></p></li>
+<li><p><font>XMLSEC-TRANSFORM-BINARY-CHUNK</font></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">xmlSecTransformCheckId</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">xmlSecTransformCheckSize</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">xmlSecTransformCheckType</a></p></li>
@@ -1130,7 +1130,7 @@
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">xmlSecTransformCtxDestroy</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">xmlSecTransformCtxExecute</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">xmlSecTransformCtxFinalize</a></p></li>
-<li><p><a href="xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK</a></p></li>
+<li><p><font>XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK</font></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">xmlSecTransformCtxInitialize</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">xmlSecTransformCtxNodeRead</a></p></li>
@@ -1315,24 +1315,24 @@
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">xmlSecTransformXPointerSetExpr</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">xmlSecTransformXsltGetKlass</a></p></li>
 <li><p><a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTID">xmlSecTransformXsltId</a></p></li>
-<li><p><a href="xmlsec-version.html#XMLSEC-VERSION-INFO-CAPS">XMLSEC-VERSION-INFO</a></p></li>
-<li><p><a href="xmlsec-version.html#XMLSEC-VERSION-MAJOR-CAPS">XMLSEC-VERSION-MAJOR</a></p></li>
-<li><p><a href="xmlsec-version.html#XMLSEC-VERSION-MINOR-CAPS">XMLSEC-VERSION-MINOR</a></p></li>
-<li><p><a href="xmlsec-version.html#XMLSEC-VERSION-CAPS">XMLSEC-VERSION</a></p></li>
-<li><p><a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC-VERSION-SUBMINOR</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC-X509DATA-CERTIFICATE-NODE</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC-X509DATA-CRL-NODE</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC-X509DATA-DEFAULT</a></p></li>
+<li><p><font>XMLSEC-VERSION-INFO</font></p></li>
+<li><p><font>XMLSEC-VERSION-MAJOR</font></p></li>
+<li><p><font>XMLSEC-VERSION-MINOR</font></p></li>
+<li><p><font>XMLSEC-VERSION</font></p></li>
+<li><p><font>XMLSEC-VERSION-SUBMINOR</font></p></li>
+<li><p><font>XMLSEC-X509DATA-CERTIFICATE-NODE</font></p></li>
+<li><p><font>XMLSEC-X509DATA-CRL-NODE</font></p></li>
+<li><p><font>XMLSEC-X509DATA-DEFAULT</font></p></li>
 <li><p><a href="xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">xmlSecX509DataGetNodeContent</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC-X509DATA-ISSUERSERIAL-NODE</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC-X509DATA-SKI-NODE</a></p></li>
-<li><p><a href="xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC-X509DATA-SUBJECTNAME-NODE</a></p></li>
+<li><p><font>XMLSEC-X509DATA-ISSUERSERIAL-NODE</font></p></li>
+<li><p><font>XMLSEC-X509DATA-SKI-NODE</font></p></li>
+<li><p><font>XMLSEC-X509DATA-SUBJECTNAME-NODE</font></p></li>
 <li><p><a href="xmlsec-app.html#XMLSECX509STOREGETKLASS">xmlSecX509StoreGetKlass</a></p></li>
 <li><p><a href="xmlsec-app.html#XMLSECX509STOREID">xmlSecX509StoreId</a></p></li>
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-x509.html"><b>&lt;&lt;&lt;x509</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-x509.html"><b>&lt;&lt;&lt; x509</b></a></td>
 <td align="right"></td>
 </tr></table>
 </td></tr></table></td>
diff --git a/docs/api/xmlsec-index.sgml b/docs/api/xmlsec-index.sgml
index 4243883..9a23c38 100644
--- a/docs/api/xmlsec-index.sgml
+++ b/docs/api/xmlsec-index.sgml
@@ -878,6 +878,7 @@
 <listitem><para><link linkend="xmlSecParseFile">xmlSecParseFile</link></para></listitem>
 <listitem><para><link linkend="xmlSecParseMemoryExt">xmlSecParseMemoryExt</link></para></listitem>
 <listitem><para><link linkend="xmlSecParseMemory">xmlSecParseMemory</link></para></listitem>
+<listitem><para><link linkend="xmlSecPrintXmlString">xmlSecPrintXmlString</link></para></listitem>
 <listitem><para><link linkend="xmlSecPtrDebugDumpItemMethod">xmlSecPtrDebugDumpItemMethod</link></para></listitem>
 <listitem><para><link linkend="xmlSecPtrDestroyItemMethod">xmlSecPtrDestroyItemMethod</link></para></listitem>
 <listitem><para><link linkend="xmlSecPtrDuplicateItemMethod">xmlSecPtrDuplicateItemMethod</link></para></listitem>
diff --git a/docs/api/xmlsec-io.html b/docs/api/xmlsec-io.html
index fef9eea..39d6a51 100644
--- a/docs/api/xmlsec-io.html
+++ b/docs/api/xmlsec-io.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>io</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="errors" href="xmlsec-errors.html">
 <link rel="NEXT" title="keyinfo" href="xmlsec-keyinfo.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,161 +87,147 @@
 <h1>
 <a name="XMLSEC-IO"></a>io</h1>
 <div class="REFNAMEDIV">
-<a name="AEN5493"></a><h2>Name</h2>io--Input/output support.</div>
+<a name="AEN5268"></a><h2>Name</h2>io -- Input/output support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN5496"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-io.html#XMLSECIOINIT">xmlSecIOInit</a>                    (void);
-<font>void</font>        <a href="xmlsec-io.html#XMLSECIOSHUTDOWN">xmlSecIOShutdown</a>                (void);
-<font>void</font>        <a href="xmlsec-io.html#XMLSECIOCLEANUPCALLBACKS">xmlSecIOCleanupCallbacks</a>        (void);
-<font>int</font>         <a href="xmlsec-io.html#XMLSECIOREGISTERDEFAULTCALLBACKS">xmlSecIORegisterDefaultCallbacks</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-io.html#XMLSECIOREGISTERCALLBACKS">xmlSecIORegisterCallbacks</a>       (<font>xmlInputMatchCallback</font> matchFunc,
-                                             <font>xmlInputOpenCallback</font> openFunc,
-                                             <font>xmlInputReadCallback</font> readFunc,
-                                             <font>xmlInputCloseCallback</font> closeFunc);
-#define     <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIID">xmlSecTransformInputURIId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIGETKLASS">xmlSecTransformInputURIGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIOPEN">xmlSecTransformInputURIOpen</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *uri);</pre>
+<a name="XMLSEC-IO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-io.html#XMLSECIOINIT">xmlSecIOInit</a>                        (void);
+<font>void</font>                <a href="xmlsec-io.html#XMLSECIOSHUTDOWN">xmlSecIOShutdown</a>                    (void);
+<font>void</font>                <a href="xmlsec-io.html#XMLSECIOCLEANUPCALLBACKS">xmlSecIOCleanupCallbacks</a>            (void);
+<font>int</font>                 <a href="xmlsec-io.html#XMLSECIOREGISTERDEFAULTCALLBACKS">xmlSecIORegisterDefaultCallbacks</a>    (void);
+<font>int</font>                 <a href="xmlsec-io.html#XMLSECIOREGISTERCALLBACKS">xmlSecIORegisterCallbacks</a>           (<font>xmlInputMatchCallback</font> matchFunc,
+                                                         <font>xmlInputOpenCallback</font> openFunc,
+                                                         <font>xmlInputReadCallback</font> readFunc,
+                                                         <font>xmlInputCloseCallback</font> closeFunc);
+#define             <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIID">xmlSecTransformInputURIId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIGETKLASS">xmlSecTransformInputURIGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-io.html#XMLSECTRANSFORMINPUTURIOPEN">xmlSecTransformInputURIOpen</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *uri);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN5520"></a><h2>Description</h2>
+<a name="XMLSEC-IO.DESCRIPTION"></a><h2>Description</h2>
 <p>Input/output support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN5523"></a><h2>Details</h2>
+<a name="XMLSEC-IO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN5525"></a><h3>
-<a name="XMLSECIOINIT"></a>xmlSecIOInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecIOInit                    (void);</pre>
+<a name="XMLSECIOINIT"></a><h3>xmlSecIOInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIOInit                        (void);</pre>
 <p>The IO initialization (called from <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function).
 Applications should not call this function directly.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5537"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5542"></a><h3>
-<a name="XMLSECIOSHUTDOWN"></a>xmlSecIOShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecIOShutdown                (void);</pre>
+<a name="XMLSECIOSHUTDOWN"></a><h3>xmlSecIOShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecIOShutdown                    (void);</pre>
 <p>The IO clenaup (called from <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function).
 Applications should not call this function directly.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5553"></a><h3>
-<a name="XMLSECIOCLEANUPCALLBACKS"></a>xmlSecIOCleanupCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecIOCleanupCallbacks        (void);</pre>
+<a name="XMLSECIOCLEANUPCALLBACKS"></a><h3>xmlSecIOCleanupCallbacks ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecIOCleanupCallbacks            (void);</pre>
 <p>Clears the entire input callback table. this includes the
 compiled-in I/O.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5562"></a><h3>
-<a name="XMLSECIOREGISTERDEFAULTCALLBACKS"></a>xmlSecIORegisterDefaultCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecIORegisterDefaultCallbacks
-                                            (void);</pre>
+<a name="XMLSECIOREGISTERDEFAULTCALLBACKS"></a><h3>xmlSecIORegisterDefaultCallbacks ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIORegisterDefaultCallbacks    (void);</pre>
 <p>Registers the default compiled-in I/O handlers.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5572"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5577"></a><h3>
-<a name="XMLSECIOREGISTERCALLBACKS"></a>xmlSecIORegisterCallbacks ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecIORegisterCallbacks       (<font>xmlInputMatchCallback</font> matchFunc,
-                                             <font>xmlInputOpenCallback</font> openFunc,
-                                             <font>xmlInputReadCallback</font> readFunc,
-                                             <font>xmlInputCloseCallback</font> closeFunc);</pre>
+<a name="XMLSECIOREGISTERCALLBACKS"></a><h3>xmlSecIORegisterCallbacks ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIORegisterCallbacks           (<font>xmlInputMatchCallback</font> matchFunc,
+                                                         <font>xmlInputOpenCallback</font> openFunc,
+                                                         <font>xmlInputReadCallback</font> readFunc,
+                                                         <font>xmlInputCloseCallback</font> closeFunc);</pre>
 <p>Register a new set of I/O callback for handling parser input.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5591"><span style="white-space: nowrap"><var class="PARAMETER">matchFunc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5361"><span style="white-space: nowrap"><code class="PARAMETER">matchFunc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  	the protocol match callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5596"><span style="white-space: nowrap"><var class="PARAMETER">openFunc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5366"><span style="white-space: nowrap"><code class="PARAMETER">openFunc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  		the open stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5601"><span style="white-space: nowrap"><var class="PARAMETER">readFunc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5371"><span style="white-space: nowrap"><code class="PARAMETER">readFunc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  		the read from stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5606"><span style="white-space: nowrap"><var class="PARAMETER">closeFunc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5376"><span style="white-space: nowrap"><code class="PARAMETER">closeFunc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>  	the close stream callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the 0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5381"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5616"></a><h3>
-<a name="XMLSECTRANSFORMINPUTURIID"></a>xmlSecTransformInputURIId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformInputURIId</pre>
+<a name="XMLSECTRANSFORMINPUTURIID"></a><h3>xmlSecTransformInputURIId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformInputURIId</pre>
 <p>The Input URI transform id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5624"></a><h3>
-<a name="XMLSECTRANSFORMINPUTURIGETKLASS"></a>xmlSecTransformInputURIGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformInputURIGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMINPUTURIGETKLASS"></a><h3>xmlSecTransformInputURIGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInputURIGetKlass     (void);</pre>
 <p>The input uri transform klass. Reads binary data from an uri.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN5634"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>input URI transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5402"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> input URI transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5639"></a><h3>
-<a name="XMLSECTRANSFORMINPUTURIOPEN"></a>xmlSecTransformInputURIOpen ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformInputURIOpen     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *uri);</pre>
-<p>Opens the given <var class="PARAMETER">uri</var> for reading.</p>
+<a name="XMLSECTRANSFORMINPUTURIOPEN"></a><h3>xmlSecTransformInputURIOpen ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformInputURIOpen         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *uri);</pre>
+<p>Opens the given <code class="PARAMETER">uri</code> for reading.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5652"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5419"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to IO transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5657"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5424"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URL to open.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5662"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5429"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-errors.html"><b>&lt;&lt;&lt;errors</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keyinfo.html"><b>keyinfo&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-errors.html"><b>&lt;&lt;&lt; errors</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keyinfo.html"><b>keyinfo &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keyinfo.html b/docs/api/xmlsec-keyinfo.html
index bd86db6..bfb27ec 100644
--- a/docs/api/xmlsec-keyinfo.html
+++ b/docs/api/xmlsec-keyinfo.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keyinfo</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="io" href="xmlsec-io.html">
 <link rel="NEXT" title="keysdata" href="xmlsec-keysdata.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,146 +87,139 @@
 <h1>
 <a name="XMLSEC-KEYINFO"></a>keyinfo</h1>
 <div class="REFNAMEDIV">
-<a name="AEN5672"></a><h2>Name</h2>keyinfo--<a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</div>
+<a name="AEN5439"></a><h2>Name</h2>keyinfo -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN5676"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">xmlSecKeyInfoNodeRead</a>           (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">xmlSecKeyInfoNodeWrite</a>          (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-enum        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a>;
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</a>
-#define     <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</a>
-struct      <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a>;
-<font>xmlSecKeyInfoCtxPtr</font> <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE">xmlSecKeyInfoCtxCreate</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY">xmlSecKeyInfoCtxDestroy</a>         (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">xmlSecKeyInfoCtxInitialize</a>      (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE">xmlSecKeyInfoCtxFinalize</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">xmlSecKeyInfoCtxReset</a>           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCOPYUSERPREF">xmlSecKeyInfoCtxCopyUserPref</a>    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);
-<font>int</font>         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATEENCCTX">xmlSecKeyInfoCtxCreateEncCtx</a>    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGDUMP">xmlSecKeyInfoCtxDebugDump</a>       (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGXMLDUMP">xmlSecKeyInfoCtxDebugXmlDump</a>    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEID">xmlSecKeyDataNameId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEGETKLASS">xmlSecKeyDataNameGetKlass</a>   (void);
-#define     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEID">xmlSecKeyDataValueId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEGETKLASS">xmlSecKeyDataValueGetKlass</a>  (void);
-#define     <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODID">xmlSecKeyDataRetrievalMethodId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODGETKLASS">xmlSecKeyDataRetrievalMethodGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYID">xmlSecKeyDataEncryptedKeyId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYGETKLASS">xmlSecKeyDataEncryptedKeyGetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-KEYINFO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEREAD">xmlSecKeyInfoNodeRead</a>               (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFONODEWRITE">xmlSecKeyInfoNodeWrite</a>              (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+enum                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a>;
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS">XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS">XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS">XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS">XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS">XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</a>
+#define             <a href="xmlsec-keyinfo.html#XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS">XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</a>
+struct              <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a>;
+<font>xmlSecKeyInfoCtxPtr</font>  <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE">xmlSecKeyInfoCtxCreate</a>             (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY">xmlSecKeyInfoCtxDestroy</a>             (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE">xmlSecKeyInfoCtxInitialize</a>          (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE">xmlSecKeyInfoCtxFinalize</a>            (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXRESET">xmlSecKeyInfoCtxReset</a>               (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCOPYUSERPREF">xmlSecKeyInfoCtxCopyUserPref</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);
+<font>int</font>                 <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATEENCCTX">xmlSecKeyInfoCtxCreateEncCtx</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGDUMP">xmlSecKeyInfoCtxDebugDump</a>           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDEBUGXMLDUMP">xmlSecKeyInfoCtxDebugXmlDump</a>        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEID">xmlSecKeyDataNameId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATANAMEGETKLASS">xmlSecKeyDataNameGetKlass</a>           (void);
+#define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEID">xmlSecKeyDataValueId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAVALUEGETKLASS">xmlSecKeyDataValueGetKlass</a>          (void);
+#define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODID">xmlSecKeyDataRetrievalMethodId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATARETRIEVALMETHODGETKLASS">xmlSecKeyDataRetrievalMethodGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYID">xmlSecKeyDataEncryptedKeyId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keyinfo.html#XMLSECKEYDATAENCRYPTEDKEYGETKLASS">xmlSecKeyDataEncryptedKeyGetKlass</a>   (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN5747"></a><h2>Description</h2>
+<a name="XMLSEC-KEYINFO.DESCRIPTION"></a><h2>Description</h2>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN5751"></a><h2>Details</h2>
+<a name="XMLSEC-KEYINFO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN5753"></a><h3>
-<a name="XMLSECKEYINFONODEREAD"></a>xmlSecKeyInfoNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyInfoNodeRead           (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Parses the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element <var class="PARAMETER">keyInfoNode</var>, extracts the key data
-and stores into <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYINFONODEREAD"></a><h3>xmlSecKeyInfoNodeRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoNodeRead               (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Parses the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element <code class="PARAMETER">keyInfoNode</code>, extracts the key data
+and stores into <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5769"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5535"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5775"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5541"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to result key object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5780"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5546"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5786"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or -1 if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5791"></a><h3>
-<a name="XMLSECKEYINFONODEWRITE"></a>xmlSecKeyInfoNodeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyInfoNodeWrite          (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Writes the <var class="PARAMETER">key</var> into the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element template <var class="PARAMETER">keyInfoNode</var>.</p>
+<a name="XMLSECKEYINFONODEWRITE"></a><h3>xmlSecKeyInfoNodeWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoNodeWrite              (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Writes the <code class="PARAMETER">key</code> into the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element template <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5807"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5572"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5813"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5578"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5818"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5583"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5824"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or -1 if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5589"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or -1 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5829"></a><h3>
-<a name="XMLSECKEYINFOMODE"></a>enum xmlSecKeyInfoMode</h3>
+<a name="XMLSECKEYINFOMODE"></a><h3>enum xmlSecKeyInfoMode</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecKeyInfoModeRead = 0,
     xmlSecKeyInfoModeWrite
 } xmlSecKeyInfoMode;</pre>
-<p>The <var class="PARAMETER">xmlSecKeyInfoCtx</var> operation mode (read or write).</p>
+<p>The <code class="PARAMETER">xmlSecKeyInfoCtx</code> operation mode (read or write).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5839"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyInfoModeRead</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYINFOMODEREAD"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyInfoModeRead</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5845"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyInfoModeWrite</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYINFOMODEWRITE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyInfoModeWrite</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5851"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND-CAPS"></a>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-DONT-STOP-ON-KEY-FOUND--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_DONT_STOP_ON_KEY_FOUND		0x00000001</pre>
 <p>If flag is set then we will continue reading <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> 
 element even when key is already found.</p>
@@ -235,8 +227,7 @@ element even when key is already found.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5860"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD-CAPS"></a>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_STOP_ON_UNKNOWN_CHILD		0x00000002</pre>
 <p>If flag is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> 
 child is found.</p>
@@ -244,8 +235,7 @@ child is found.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5869"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN-CAPS"></a>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-KEYNAME-STOP-ON-UNKNOWN--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_KEYNAME_STOP_ON_UNKNOWN		0x00000004</pre>
 <p>If flags is set then we abort if an unknown key name 
 (content of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName%20"; target="_top">&lt;dsig:KeyName /&gt;</a> element) is found.</p>
@@ -253,8 +243,7 @@ child is found.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5878"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD-CAPS"></a>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-KEYVALUE-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_KEYVALUE_STOP_ON_UNKNOWN_CHILD	0x00000008</pre>
 <p>If flags is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> 
 child is found.</p>
@@ -262,8 +251,7 @@ child is found.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5887"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF-CAPS"></a>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-UNKNOWN-HREF--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_UNKNOWN_HREF	0x00000010</pre>
 <p>If flag is set then we abort if an unknown href attribute
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element is found.</p>
@@ -271,8 +259,7 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5896"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF-CAPS"></a>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-RETRMETHOD-STOP-ON-MISMATCH-HREF--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_RETRMETHOD_STOP_ON_MISMATCH_HREF	0x00000020</pre>
 <p>If flag is set then we abort if an href attribute <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> 
 element does not match the real key data type.</p>
@@ -280,8 +267,7 @@ element does not match the real key data type.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5905"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD-CAPS"></a>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CHILD--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CHILD	0x00000100</pre>
 <p>If flags is set then we abort if an unknown <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a> 
 child is found.</p>
@@ -289,8 +275,7 @@ child is found.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5914"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS-CAPS"></a>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-DONT-VERIFY-CERTS--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS		0x00000200</pre>
 <p>If flag is set then we'll load certificates from <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a>
 element without verification.</p>
@@ -298,8 +283,7 @@ element without verification.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5923"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT-CAPS"></a>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-UNKNOWN-CERT--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT	0x00000400</pre>
 <p>If flag is set then we'll stop when we could not resolve reference
 to certificate from <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial%20"; target="_top">&lt;dsig:X509IssuerSerial /&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI%20"; target="_top">&lt;dsig:X509SKI /&gt;</a> or 
@@ -308,8 +292,7 @@ to certificate from <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSe
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5934"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT-CAPS"></a>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-STOP-ON-INVALID-CERT--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_INVALID_CERT	0x00000800</pre>
 <p>If the flag is set then we'll stop when <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data%20"; target="_top">&lt;dsig:X509Data /&gt;</a> element
 processing does not return a verified certificate.</p>
@@ -317,8 +300,7 @@ processing does not return a verified certificate.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5943"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION-CAPS"></a>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-ENCKEY-DONT-STOP-ON-FAILED-DECRYPTION--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_ENCKEY_DONT_STOP_ON_FAILED_DECRYPTION 0x00001000</pre>
 <p>If the flag is set then we'll stop when <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element
 processing fails.</p>
@@ -326,8 +308,7 @@ processing fails.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5952"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE-CAPS"></a>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-STOP-ON-EMPTY-NODE--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_STOP_ON_EMPTY_NODE			0x00002000</pre>
 <p>If the flag is set then we'll stop when we found an empty node.
 Otherwise we just ignore it.</p>
@@ -335,18 +316,15 @@ Otherwise we just ignore it.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5960"></a><h3>
-<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS-CAPS"></a>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</h3>
+<a name="XMLSEC-KEYINFO-FLAGS-X509DATA-SKIP-STRICT-CHECKS--CAPS"></a><h3>XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS	0x00004000</pre>
 <p>If the flag is set then we'll skip strict checking of certs and CRLs</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN5968"></a><h3>
-<a name="XMLSECKEYINFOCTX"></a>struct xmlSecKeyInfoCtx</h3>
+<a name="XMLSECKEYINFOCTX"></a><h3>struct xmlSecKeyInfoCtx</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyInfoCtx {
-
     void*				userData;
     unsigned int			flags;
     unsigned int			flags2;
@@ -388,102 +366,101 @@ Otherwise we just ignore it.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5978"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5728"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to user data (xmlsec and xmlsec-crypto 
 		never touch this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5984"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5734"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the bit mask for flags that control processin.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5990"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5740"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		reserved for future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN5996"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> <code class="STRUCTFIELD">keysMngr</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5746"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> <code class="STRUCTFIELD">keysMngr</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to current keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6002"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a> <code class="STRUCTFIELD">mode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5752"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOMODE">xmlSecKeyInfoMode</a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		do we read or write <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> element.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6009"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledKeyData</code></span></a></td>
-<td align="LEFT" valign="TOP"><p> 	the list of enabled <var class="PARAMETER">xmlSecKeyDataId</var> (if list is 
+<td align="LEFT" valign="TOP"><a name="AEN5759"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledKeyData</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p> 	the list of enabled <code class="PARAMETER">xmlSecKeyDataId</code> (if list is 
 		empty then all data ids are enabled).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6016"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">base64LineSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5766"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">base64LineSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the max columns size for base64 encoding.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6022"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">retrievalMethodCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5772"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">retrievalMethodCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the transforms context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a>
 			element processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6029"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxRetrievalMethodLevel</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5779"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxRetrievalMethodLevel</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the max recursion level when processing
 		<a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element; default level is 1 
-		(see also <var class="PARAMETER">curRetrievalMethodLevel</var>).</p></td>
+		(see also <code class="PARAMETER">curRetrievalMethodLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6037"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> <code class="STRUCTFIELD">encCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5787"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> <code class="STRUCTFIELD">encCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the encryption context for <a href="http://www.w3.org/TR/xmldsig-core/#sec-EncryptedKey%20"; target="_top">&lt;dsig:EncryptedKey /&gt;</a> element
 		processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6044"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxEncryptedKeyLevel</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5794"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">maxEncryptedKeyLevel</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the max recursion level when processing 
 		<a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element; default level is 1 
-		(see <var class="PARAMETER">curEncryptedKeyLevel</var>).</p></td>
+		(see <code class="PARAMETER">curEncryptedKeyLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6052"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">certsVerificationTime</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5802"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">certsVerificationTime</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the time to use for X509 certificates verification
 		("not valid before" and "not valid after" checks);
-		if <var class="PARAMETER">certsVerificationTime</var> is equal to 0 (default) 
+		if <code class="PARAMETER">certsVerificationTime</code> is equal to 0 (default) 
 		then we verify certificates against the system's 
 		clock "now".</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6059"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">certsVerificationDepth</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5809"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">certsVerificationDepth</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the max certifications chain length (default is 9).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6065"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">pgpReserved</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5815"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">pgpReserved</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	reserved for PGP.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6071"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curRetrievalMethodLevel</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5821"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curRetrievalMethodLevel</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the current <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> element 
-		processing level (see <var class="PARAMETER">maxRetrievalMethodLevel</var>).</p></td>
+		processing level (see <code class="PARAMETER">maxRetrievalMethodLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6079"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curEncryptedKeyLevel</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5829"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">curEncryptedKeyLevel</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the current <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey%20"; target="_top">&lt;enc:EncryptedKey /&gt;</a> element
-		processing level (see <var class="PARAMETER">maxEncryptedKeyLevel</var>).</p></td>
+		processing level (see <code class="PARAMETER">maxEncryptedKeyLevel</code>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6087"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a> <code class="STRUCTFIELD">keyReq</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5837"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a> <code class="STRUCTFIELD">keyReq</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the current key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6093"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5843"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6099"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5849"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6105"></a><h3>
-<a name="XMLSECKEYINFOCTXCREATE"></a>xmlSecKeyInfoCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyInfoCtxPtr</font> xmlSecKeyInfoCtxCreate  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECKEYINFOCTXCREATE"></a><h3>xmlSecKeyInfoCtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyInfoCtxPtr</font>  xmlSecKeyInfoCtxCreate             (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Allocates and initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.
 Caller is responsible for freeing it by calling <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXDESTROY"><span class="TYPE">xmlSecKeyInfoCtxDestroy</span></a> 
 function.</p>
@@ -491,179 +468,169 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6119"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5868"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6124"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated object or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5873"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6129"></a><h3>
-<a name="XMLSECKEYINFOCTXDESTROY"></a>xmlSecKeyInfoCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyInfoCtxDestroy         (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Destroys <var class="PARAMETER">keyInfoCtx</var> object created with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE"><span class="TYPE">xmlSecKeyInfoCtxCreate</span></a> function.</p>
+<a name="XMLSECKEYINFOCTXDESTROY"></a><h3>xmlSecKeyInfoCtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDestroy             (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Destroys <code class="PARAMETER">keyInfoCtx</code> object created with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXCREATE"><span class="TYPE">xmlSecKeyInfoCtxCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6143"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5891"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6149"></a><h3>
-<a name="XMLSECKEYINFOCTXINITIALIZE"></a>xmlSecKeyInfoCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyInfoCtxInitialize      (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECKEYINFOCTXINITIALIZE"></a><h3>xmlSecKeyInfoCtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxInitialize          (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context. Caller is 
 responsible for cleaning it up by <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXFINALIZE"><span class="TYPE">xmlSecKeyInfoCtxFinalize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6164"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5911"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6170"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5917"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6175"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5922"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6180"></a><h3>
-<a name="XMLSECKEYINFOCTXFINALIZE"></a>xmlSecKeyInfoCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyInfoCtxFinalize        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Cleans up the <var class="PARAMETER">keyInfoCtx</var> initialized with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE"><span class="TYPE">xmlSecKeyInfoCtxInitialize</span></a>
+<a name="XMLSECKEYINFOCTXFINALIZE"></a><h3>xmlSecKeyInfoCtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxFinalize            (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Cleans up the <code class="PARAMETER">keyInfoCtx</code> initialized with <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTXINITIALIZE"><span class="TYPE">xmlSecKeyInfoCtxInitialize</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6194"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5940"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6200"></a><h3>
-<a name="XMLSECKEYINFOCTXRESET"></a>xmlSecKeyInfoCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyInfoCtxReset           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Resets the <var class="PARAMETER">keyInfoCtx</var> state. User settings are not changed.</p>
+<a name="XMLSECKEYINFOCTXRESET"></a><h3>xmlSecKeyInfoCtxReset ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxReset               (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Resets the <code class="PARAMETER">keyInfoCtx</code> state. User settings are not changed.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6212"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5957"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6218"></a><h3>
-<a name="XMLSECKEYINFOCTXCOPYUSERPREF"></a>xmlSecKeyInfoCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyInfoCtxCopyUserPref    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);</pre>
-<p>Copies user preferences from <var class="PARAMETER">src</var> context to <var class="PARAMETER">dst</var> context.</p>
+<a name="XMLSECKEYINFOCTXCOPYUSERPREF"></a><h3>xmlSecKeyInfoCtxCopyUserPref ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxCopyUserPref        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> dst,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> src);</pre>
+<p>Copies user preferences from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code> context.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6232"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5976"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6237"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN5981"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN5986"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6247"></a><h3>
-<a name="XMLSECKEYINFOCTXCREATEENCCTX"></a>xmlSecKeyInfoCtxCreateEncCtx ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyInfoCtxCreateEncCtx    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYINFOCTXCREATEENCCTX"></a><h3>xmlSecKeyInfoCtxCreateEncCtx ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyInfoCtxCreateEncCtx        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Creates encryption context form processing <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6260"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6003"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6266"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6271"></a><h3>
-<a name="XMLSECKEYINFOCTXDEBUGDUMP"></a>xmlSecKeyInfoCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyInfoCtxDebugDump       (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints user settings and current context state to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYINFOCTXDEBUGDUMP"></a><h3>xmlSecKeyInfoCtxDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDebugDump           (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints user settings and current context state to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6284"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6026"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6290"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6032"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output file pointer.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6295"></a><h3>
-<a name="XMLSECKEYINFOCTXDEBUGXMLDUMP"></a>xmlSecKeyInfoCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyInfoCtxDebugXmlDump    (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints user settings and current context state in XML format to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYINFOCTXDEBUGXMLDUMP"></a><h3>xmlSecKeyInfoCtxDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyInfoCtxDebugXmlDump        (<a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints user settings and current context state in XML format to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6308"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6049"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6314"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6055"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output file pointer.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6319"></a><h3>
-<a name="XMLSECKEYDATANAMEID"></a>xmlSecKeyDataNameId</h3>
+<a name="XMLSECKEYDATANAMEID"></a><h3>xmlSecKeyDataNameId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataNameId 		xmlSecKeyDataNameGetKlass()</pre>
 <p>The &lt;dsig:KeyName&gt; processing class.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6327"></a><h3>
-<a name="XMLSECKEYDATANAMEGETKLASS"></a>xmlSecKeyDataNameGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataNameGetKlass   (void);</pre>
+<a name="XMLSECKEYDATANAMEGETKLASS"></a><h3>xmlSecKeyDataNameGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataNameGetKlass           (void);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element key data klass 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-KeyName</span></font>):</p>
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-KEYNAME"><span class="TYPE">sec-KeyName</span></gtkdoclink>):</p>
 <p>The KeyName element contains a string value (in which white space is 
 significant) which may be used by the signer to communicate a key 
 identifier to the recipient. Typically, KeyName contains an identifier 
@@ -674,50 +641,46 @@ a distinguished name (DN), an email address, etc.)</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6341"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element processing key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6347"></a><h3>
-<a name="XMLSECKEYDATAVALUEID"></a>xmlSecKeyDataValueId</h3>
+<a name="XMLSECKEYDATAVALUEID"></a><h3>xmlSecKeyDataValueId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataValueId		xmlSecKeyDataValueGetKlass()</pre>
 <p>The &lt;dsig:KeyValue&gt; processing class.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6355"></a><h3>
-<a name="XMLSECKEYDATAVALUEGETKLASS"></a>xmlSecKeyDataValueGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataValueGetKlass  (void);</pre>
+<a name="XMLSECKEYDATAVALUEGETKLASS"></a><h3>xmlSecKeyDataValueGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataValueGetKlass          (void);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element key data klass 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-KeyValue</span></font>):</p>
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-KEYVALUE"><span class="TYPE">sec-KeyValue</span></gtkdoclink>):</p>
 <p>The KeyValue element contains a single public key that may be useful in 
 validating the signature.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6369"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element processing key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6375"></a><h3>
-<a name="XMLSECKEYDATARETRIEVALMETHODID"></a>xmlSecKeyDataRetrievalMethodId</h3>
+<a name="XMLSECKEYDATARETRIEVALMETHODID"></a><h3>xmlSecKeyDataRetrievalMethodId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataRetrievalMethodId	xmlSecKeyDataRetrievalMethodGetKlass()</pre>
 <p>The &lt;dsig:RetrievalMethod&gt; processing class.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6383"></a><h3>
-<a name="XMLSECKEYDATARETRIEVALMETHODGETKLASS"></a>xmlSecKeyDataRetrievalMethodGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataRetrievalMethodGetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYDATARETRIEVALMETHODGETKLASS"></a><h3>xmlSecKeyDataRetrievalMethodGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataRetrievalMethodGetKlass
+                                                        (void);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> element key data klass 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-RetrievalMethod</span></font>):
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-RETRIEVALMETHOD"><span class="TYPE">sec-RetrievalMethod</span></gtkdoclink>):
 A RetrievalMethod element within KeyInfo is used to convey a reference to 
 KeyInfo information that is stored at another location. For example, 
 several signatures in a document might use a key verified by an X.509v3 
@@ -730,26 +693,23 @@ Reference's URI and The Reference Processing Model.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6397"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> element processing key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6132"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6403"></a><h3>
-<a name="XMLSECKEYDATAENCRYPTEDKEYID"></a>xmlSecKeyDataEncryptedKeyId</h3>
+<a name="XMLSECKEYDATAENCRYPTEDKEYID"></a><h3>xmlSecKeyDataEncryptedKeyId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataEncryptedKeyId	xmlSecKeyDataEncryptedKeyGetKlass()</pre>
 <p>The &lt;enc:EncryptedKey&gt; processing class.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6411"></a><h3>
-<a name="XMLSECKEYDATAENCRYPTEDKEYGETKLASS"></a>xmlSecKeyDataEncryptedKeyGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataEncryptedKeyGetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYDATAENCRYPTEDKEYGETKLASS"></a><h3>xmlSecKeyDataEncryptedKeyGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataEncryptedKeyGetKlass   (void);</pre>
 <p>The <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element key data klass 
-(http://www.w3.org/TR/xmlenc-core/<font><span class="TYPE">sec-EncryptedKey</span></font>):</p>
+(http://www.w3.org/TR/xmlenc-core/<gtkdoclink href="SEC-ENCRYPTEDKEY"><span class="TYPE">sec-EncryptedKey</span></gtkdoclink>):</p>
 <p>The EncryptedKey element is used to transport encryption keys from 
 the originator to a known recipient(s). It may be used as a stand-alone 
 XML document, be placed within an application document, or appear inside 
@@ -760,14 +720,14 @@ without any additional processing.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6425"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6158"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing key data klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-io.html"><b>&lt;&lt;&lt;io</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keysdata.html"><b>keysdata&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-io.html"><b>&lt;&lt;&lt; io</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keysdata.html"><b>keysdata &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keys.html b/docs/api/xmlsec-keys.html
index 93c6a15..1833567 100644
--- a/docs/api/xmlsec-keys.html
+++ b/docs/api/xmlsec-keys.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keys</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="keysdata" href="xmlsec-keysdata.html">
 <link rel="NEXT" title="keysmngr" href="xmlsec-keysmngr.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,363 +87,339 @@
 <h1>
 <a name="XMLSEC-KEYS"></a>keys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN8968"></a><h2>Name</h2>keys--Crypto key object definition.</div>
+<a name="AEN8602"></a><h2>Name</h2>keys -- Crypto key object definition.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN8971"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-typedef     <a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a>;
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGESIGN">xmlSecKeyUsageSign</a>
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGEVERIFY">xmlSecKeyUsageVerify</a>
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGEENCRYPT">xmlSecKeyUsageEncrypt</a>
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGEDECRYPT">xmlSecKeyUsageDecrypt</a>
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGEKEYEXCHANGE">xmlSecKeyUsageKeyExchange</a>
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSAGEANY">xmlSecKeyUsageAny</a>
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYUSEWITHINITIALIZE">xmlSecKeyUseWithInitialize</a>      (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYUSEWITHFINALIZE">xmlSecKeyUseWithFinalize</a>        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYUSEWITHRESET">xmlSecKeyUseWithReset</a>           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCOPY">xmlSecKeyUseWithCopy</a>            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
-                                             <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);
-<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCREATE">xmlSecKeyUseWithCreate</a>  (const <font>xmlChar</font> *application,
-                                             const <font>xmlChar</font> *identifier);
-<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDUPLICATE">xmlSecKeyUseWithDuplicate</a>
-                                            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDESTROY">xmlSecKeyUseWithDestroy</a>         (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYUSEWITHSET">xmlSecKeyUseWithSet</a>             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             const <font>xmlChar</font> *application,
-                                             const <font>xmlChar</font> *identifier);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGDUMP">xmlSecKeyUseWithDebugDump</a>       (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGXMLDUMP">xmlSecKeyUseWithDebugXmlDump</a>    (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             <font>FILE</font> *output);
-struct      <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWith</a>;
-#define     <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTID">xmlSecKeyUseWithPtrListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTGETKLASS">xmlSecKeyUseWithPtrListGetKlass</a>
-                                            (void);
-struct      <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a>;
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE">xmlSecKeyReqInitialize</a>          (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE">xmlSecKeyReqFinalize</a>            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYREQRESET">xmlSecKeyReqReset</a>               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYREQCOPY">xmlSecKeyReqCopy</a>                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEY">xmlSecKeyReqMatchKey</a>            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEYVALUE">xmlSecKeyReqMatchKeyValue</a>       (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGDUMP">xmlSecKeyReqDebugDump</a>           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGXMLDUMP">xmlSecKeyReqDebugXmlDump</a>        (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <font>FILE</font> *output);
-struct      <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKey</a>;
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYCREATE">xmlSecKeyCreate</a>                (void);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYDESTROY">xmlSecKeyDestroy</a>                (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYEMPTY">xmlSecKeyEmpty</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>xmlSecKeyPtr</font> <a href="xmlsec-keys.html#XMLSECKEYDUPLICATE">xmlSecKeyDuplicate</a>             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYCOPY">xmlSecKeyCopy</a>                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);
-const <font>xmlChar</font>* <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKeyGetName</a>             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYSETNAME">xmlSecKeySetName</a>                (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>xmlChar</font> *name);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> <a href="xmlsec-keys.html#XMLSECKEYGETTYPE">xmlSecKeyGetType</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>xmlSecKeyDataPtr</font> <a href="xmlsec-keys.html#XMLSECKEYGETVALUE">xmlSecKeyGetValue</a>          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYSETVALUE">xmlSecKeySetValue</a>               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
-<font>xmlSecKeyDataPtr</font> <a href="xmlsec-keys.html#XMLSECKEYGETDATA">xmlSecKeyGetData</a>           (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlSecKeyDataId</font> dataId);
-<font>xmlSecKeyDataPtr</font> <a href="xmlsec-keys.html#XMLSECKEYENSUREDATA">xmlSecKeyEnsureData</a>        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlSecKeyDataId</font> dataId);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYADOPTDATA">xmlSecKeyAdoptData</a>              (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYDEBUGDUMP">xmlSecKeyDebugDump</a>              (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keys.html#XMLSECKEYDEBUGXMLDUMP">xmlSecKeyDebugXmlDump</a>           (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>FILE</font> *output);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYGENERATE">xmlSecKeyGenerate</a>              (<font>xmlSecKeyDataId</font> dataId,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYGENERATEBYNAME">xmlSecKeyGenerateByName</a>        (const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-keys.html#XMLSECKEYMATCH">xmlSecKeyMatch</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYREADBUFFER">xmlSecKeyReadBuffer</a>            (<font>xmlSecKeyDataId</font> dataId,
-                                             <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYREADBINARYFILE">xmlSecKeyReadBinaryFile</a>        (<font>xmlSecKeyDataId</font> dataId,
-                                             const <font>char</font> *filename);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-keys.html#XMLSECKEYREADMEMORY">xmlSecKeyReadMemory</a>            (<font>xmlSecKeyDataId</font> dataId,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-#define     <a href="xmlsec-keys.html#XMLSECKEYISVALID">xmlSecKeyIsValid</a>                (key)
-#define     <a href="xmlsec-keys.html#XMLSECKEYCHECKID">xmlSecKeyCheckId</a>                (key, keyId)
-#define     <a href="xmlsec-keys.html#XMLSECKEYPTRLISTID">xmlSecKeyPtrListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">xmlSecKeyPtrListGetKlass</a>    (void);</pre>
+<a name="XMLSEC-KEYS.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">typedef             <a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a>;
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGESIGN">xmlSecKeyUsageSign</a>
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEVERIFY">xmlSecKeyUsageVerify</a>
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEENCRYPT">xmlSecKeyUsageEncrypt</a>
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEDECRYPT">xmlSecKeyUsageDecrypt</a>
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEKEYEXCHANGE">xmlSecKeyUsageKeyExchange</a>
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSAGEANY">xmlSecKeyUsageAny</a>
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHINITIALIZE">xmlSecKeyUseWithInitialize</a>          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHFINALIZE">xmlSecKeyUseWithFinalize</a>            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHRESET">xmlSecKeyUseWithReset</a>               (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCOPY">xmlSecKeyUseWithCopy</a>                (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);
+<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a>  <a href="xmlsec-keys.html#XMLSECKEYUSEWITHCREATE">xmlSecKeyUseWithCreate</a>             (const <font>xmlChar</font> *application,
+                                                         const <font>xmlChar</font> *identifier);
+<font>xmlSecKeyUseWithPtr</font>  <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDUPLICATE">xmlSecKeyUseWithDuplicate</a>          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDESTROY">xmlSecKeyUseWithDestroy</a>             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYUSEWITHSET">xmlSecKeyUseWithSet</a>                 (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         const <font>xmlChar</font> *application,
+                                                         const <font>xmlChar</font> *identifier);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGDUMP">xmlSecKeyUseWithDebugDump</a>           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYUSEWITHDEBUGXMLDUMP">xmlSecKeyUseWithDebugXmlDump</a>        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         <font>FILE</font> *output);
+struct              <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWith</a>;
+#define             <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTID">xmlSecKeyUseWithPtrListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-keys.html#XMLSECKEYUSEWITHPTRLISTGETKLASS">xmlSecKeyUseWithPtrListGetKlass</a>     (void);
+struct              <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReq</a>;
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE">xmlSecKeyReqInitialize</a>              (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE">xmlSecKeyReqFinalize</a>                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQRESET">xmlSecKeyReqReset</a>                   (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQCOPY">xmlSecKeyReqCopy</a>                    (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEY">xmlSecKeyReqMatchKey</a>                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYREQMATCHKEYVALUE">xmlSecKeyReqMatchKeyValue</a>           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGDUMP">xmlSecKeyReqDebugDump</a>               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYREQDEBUGXMLDUMP">xmlSecKeyReqDebugXmlDump</a>            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <font>FILE</font> *output);
+struct              <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKey</a>;
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYCREATE">xmlSecKeyCreate</a>                     (void);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDESTROY">xmlSecKeyDestroy</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYEMPTY">xmlSecKeyEmpty</a>                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>xmlSecKeyPtr</font>        <a href="xmlsec-keys.html#XMLSECKEYDUPLICATE">xmlSecKeyDuplicate</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYCOPY">xmlSecKeyCopy</a>                       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);
+const <font>xmlChar</font>*      <a href="xmlsec-keys.html#XMLSECKEYGETNAME">xmlSecKeyGetName</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYSETNAME">xmlSecKeySetName</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>xmlChar</font> *name);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   <a href="xmlsec-keys.html#XMLSECKEYGETTYPE">xmlSecKeyGetType</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYGETVALUE">xmlSecKeyGetValue</a>                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYSETVALUE">xmlSecKeySetValue</a>                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);
+<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYGETDATA">xmlSecKeyGetData</a>                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlSecKeyDataId</font> dataId);
+<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keys.html#XMLSECKEYENSUREDATA">xmlSecKeyEnsureData</a>                 (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlSecKeyDataId</font> dataId);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYADOPTDATA">xmlSecKeyAdoptData</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDEBUGDUMP">xmlSecKeyDebugDump</a>                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keys.html#XMLSECKEYDEBUGXMLDUMP">xmlSecKeyDebugXmlDump</a>               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>FILE</font> *output);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATE">xmlSecKeyGenerate</a>                   (<font>xmlSecKeyDataId</font> dataId,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYGENERATEBYNAME">xmlSecKeyGenerateByName</a>             (const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-keys.html#XMLSECKEYMATCH">xmlSecKeyMatch</a>                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADBUFFER">xmlSecKeyReadBuffer</a>                 (<font>xmlSecKeyDataId</font> dataId,
+                                                         <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADBINARYFILE">xmlSecKeyReadBinaryFile</a>             (<font>xmlSecKeyDataId</font> dataId,
+                                                         const <font>char</font> *filename);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-keys.html#XMLSECKEYREADMEMORY">xmlSecKeyReadMemory</a>                 (<font>xmlSecKeyDataId</font> dataId,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+#define             <a href="xmlsec-keys.html#XMLSECKEYISVALID">xmlSecKeyIsValid</a>                    (key)
+#define             <a href="xmlsec-keys.html#XMLSECKEYCHECKID">xmlSecKeyCheckId</a>                    (key, keyId)
+#define             <a href="xmlsec-keys.html#XMLSECKEYPTRLISTID">xmlSecKeyPtrListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-keys.html#XMLSECKEYPTRLISTGETKLASS">xmlSecKeyPtrListGetKlass</a>            (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN9137"></a><h2>Description</h2>
+<a name="XMLSEC-KEYS.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto key object definition.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN9140"></a><h2>Details</h2>
+<a name="XMLSEC-KEYS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN9142"></a><h3>
-<a name="XMLSECKEYUSAGE"></a>xmlSecKeyUsage</h3>
+<a name="XMLSECKEYUSAGE"></a><h3>xmlSecKeyUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int 			xmlSecKeyUsage;</pre>
 <p>The key usage.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9150"></a><h3>
-<a name="XMLSECKEYUSAGESIGN"></a>xmlSecKeyUsageSign</h3>
+<a name="XMLSECKEYUSAGESIGN"></a><h3>xmlSecKeyUsageSign</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageSign		0x00000001</pre>
 <p>Key can be used in any way.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9158"></a><h3>
-<a name="XMLSECKEYUSAGEVERIFY"></a>xmlSecKeyUsageVerify</h3>
+<a name="XMLSECKEYUSAGEVERIFY"></a><h3>xmlSecKeyUsageVerify</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageVerify		0x00000002</pre>
 <p>Key for signing.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9166"></a><h3>
-<a name="XMLSECKEYUSAGEENCRYPT"></a>xmlSecKeyUsageEncrypt</h3>
+<a name="XMLSECKEYUSAGEENCRYPT"></a><h3>xmlSecKeyUsageEncrypt</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageEncrypt		0x00000004</pre>
 <p>Key for signature verification.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9174"></a><h3>
-<a name="XMLSECKEYUSAGEDECRYPT"></a>xmlSecKeyUsageDecrypt</h3>
+<a name="XMLSECKEYUSAGEDECRYPT"></a><h3>xmlSecKeyUsageDecrypt</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageDecrypt		0x00000008</pre>
 <p>An encryption key.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9182"></a><h3>
-<a name="XMLSECKEYUSAGEKEYEXCHANGE"></a>xmlSecKeyUsageKeyExchange</h3>
+<a name="XMLSECKEYUSAGEKEYEXCHANGE"></a><h3>xmlSecKeyUsageKeyExchange</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageKeyExchange	0x00000010</pre>
 <p>The key is used for key exchange.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9190"></a><h3>
-<a name="XMLSECKEYUSAGEANY"></a>xmlSecKeyUsageAny</h3>
+<a name="XMLSECKEYUSAGEANY"></a><h3>xmlSecKeyUsageAny</h3>
 <pre class="PROGRAMLISTING">#define	xmlSecKeyUsageAny		0xFFFFFFFF</pre>
 <p>A decryption key.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9198"></a><h3>
-<a name="XMLSECKEYUSEWITHINITIALIZE"></a>xmlSecKeyUseWithInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyUseWithInitialize      (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
-<p>Initializes <var class="PARAMETER">keyUseWith</var> object.</p>
+<a name="XMLSECKEYUSEWITHINITIALIZE"></a><h3>xmlSecKeyUseWithInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithInitialize          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<p>Initializes <code class="PARAMETER">keyUseWith</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9210"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8836"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9215"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8841"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9220"></a><h3>
-<a name="XMLSECKEYUSEWITHFINALIZE"></a>xmlSecKeyUseWithFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyUseWithFinalize        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
-<p>Finalizes <var class="PARAMETER">keyUseWith</var> object.</p>
+<a name="XMLSECKEYUSEWITHFINALIZE"></a><h3>xmlSecKeyUseWithFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithFinalize            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<p>Finalizes <code class="PARAMETER">keyUseWith</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9232"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8857"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9237"></a><h3>
-<a name="XMLSECKEYUSEWITHRESET"></a>xmlSecKeyUseWithReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyUseWithReset           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
-<p>Resets the <var class="PARAMETER">keyUseWith</var> to its state after initialization.</p>
+<a name="XMLSECKEYUSEWITHRESET"></a><h3>xmlSecKeyUseWithReset ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithReset               (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<p>Resets the <code class="PARAMETER">keyUseWith</code> to its state after initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9249"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8873"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9254"></a><h3>
-<a name="XMLSECKEYUSEWITHCOPY"></a>xmlSecKeyUseWithCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyUseWithCopy            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
-                                             <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);</pre>
-<p>Copies information from <var class="PARAMETER">dst</var> to <var class="PARAMETER">src</var>.</p>
+<a name="XMLSECKEYUSEWITHCOPY"></a><h3>xmlSecKeyUseWithCopy ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithCopy                (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> dst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> src);</pre>
+<p>Copies information from <code class="PARAMETER">dst</code> to <code class="PARAMETER">src</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9268"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8891"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to destination object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9273"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8896"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to source object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9278"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8901"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9283"></a><h3>
-<a name="XMLSECKEYUSEWITHCREATE"></a>xmlSecKeyUseWithCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> xmlSecKeyUseWithCreate  (const <font>xmlChar</font> *application,
-                                             const <font>xmlChar</font> *identifier);</pre>
+<a name="XMLSECKEYUSEWITHCREATE"></a><h3>xmlSecKeyUseWithCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a>  xmlSecKeyUseWithCreate             (const <font>xmlChar</font> *application,
+                                                         const <font>xmlChar</font> *identifier);</pre>
 <p>Creates new xmlSecKeyUseWith object. The caller is responsible for destroying
-returned object with <var class="PARAMETER">xmlSecKeyUseWithDestroy</var> function.</p>
+returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9296"><span style="white-space: nowrap"><var class="PARAMETER">application</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8918"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9301"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8923"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the identifier value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9306"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created object or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8928"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9311"></a><h3>
-<a name="XMLSECKEYUSEWITHDUPLICATE"></a>xmlSecKeyUseWithDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> xmlSecKeyUseWithDuplicate
-                                            (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
-<p>Duplicates <var class="PARAMETER">keyUseWith</var> object. The caller is responsible for destroying
-returned object with <var class="PARAMETER">xmlSecKeyUseWithDestroy</var> function.</p>
+<a name="XMLSECKEYUSEWITHDUPLICATE"></a><h3>xmlSecKeyUseWithDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyUseWithPtr</font>  xmlSecKeyUseWithDuplicate          (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<p>Duplicates <code class="PARAMETER">keyUseWith</code> object. The caller is responsible for destroying
+returned object with <code class="PARAMETER">xmlSecKeyUseWithDestroy</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9324"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8945"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9329"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created object or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8950"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9334"></a><h3>
-<a name="XMLSECKEYUSEWITHDESTROY"></a>xmlSecKeyUseWithDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyUseWithDestroy         (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
-<p>Destroys <var class="PARAMETER">keyUseWith</var> created with <var class="PARAMETER">xmlSecKeyUseWithCreate</var> or <var class="PARAMETER">xmlSecKeyUseWithDuplicate</var>
+<a name="XMLSECKEYUSEWITHDESTROY"></a><h3>xmlSecKeyUseWithDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDestroy             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith);</pre>
+<p>Destroys <code class="PARAMETER">keyUseWith</code> created with <code class="PARAMETER">xmlSecKeyUseWithCreate</code> or <code class="PARAMETER">xmlSecKeyUseWithDuplicate</code>
 functions.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9348"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8968"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9353"></a><h3>
-<a name="XMLSECKEYUSEWITHSET"></a>xmlSecKeyUseWithSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyUseWithSet             (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             const <font>xmlChar</font> *application,
-                                             const <font>xmlChar</font> *identifier);</pre>
-<p>Sets <var class="PARAMETER">application</var> and <var class="PARAMETER">identifier</var> in the <var class="PARAMETER">keyUseWith</var>.</p>
+<a name="XMLSECKEYUSEWITHSET"></a><h3>xmlSecKeyUseWithSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyUseWithSet                 (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         const <font>xmlChar</font> *application,
+                                                         const <font>xmlChar</font> *identifier);</pre>
+<p>Sets <code class="PARAMETER">application</code> and <code class="PARAMETER">identifier</code> in the <code class="PARAMETER">keyUseWith</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9369"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8988"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9374"><span style="white-space: nowrap"><var class="PARAMETER">application</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8993"><span style="white-space: nowrap"><code class="PARAMETER">application</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the new application value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9379"><span style="white-space: nowrap"><var class="PARAMETER">identifier</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8998"><span style="white-space: nowrap"><code class="PARAMETER">identifier</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the new identifier value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9384"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9003"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9389"></a><h3>
-<a name="XMLSECKEYUSEWITHDEBUGDUMP"></a>xmlSecKeyUseWithDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyUseWithDebugDump       (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints xmlSecKeyUseWith debug information to a file <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYUSEWITHDEBUGDUMP"></a><h3>xmlSecKeyUseWithDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDebugDump           (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints xmlSecKeyUseWith debug information to a file <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9402"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9020"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9407"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9025"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9412"></a><h3>
-<a name="XMLSECKEYUSEWITHDEBUGXMLDUMP"></a>xmlSecKeyUseWithDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyUseWithDebugXmlDump    (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints xmlSecKeyUseWith debug information to a file <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECKEYUSEWITHDEBUGXMLDUMP"></a><h3>xmlSecKeyUseWithDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyUseWithDebugXmlDump        (<a href="xmlsec-keys.html#XMLSECKEYUSEWITH">xmlSecKeyUseWithPtr</a> keyUseWith,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints xmlSecKeyUseWith debug information to a file <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9425"><span style="white-space: nowrap"><var class="PARAMETER">keyUseWith</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9042"><span style="white-space: nowrap"><code class="PARAMETER">keyUseWith</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the pointer to information about key application/user.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9430"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9047"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9435"></a><h3>
-<a name="XMLSECKEYUSEWITH"></a>struct xmlSecKeyUseWith</h3>
+<a name="XMLSECKEYUSEWITH"></a><h3>struct xmlSecKeyUseWith</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyUseWith {
-
     xmlChar*                    application;
     xmlChar*                    identifier;
 
@@ -456,51 +431,46 @@ functions.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9444"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">application</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9060"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">application</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the application.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9450"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">identifier</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9066"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">identifier</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the identifier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9456"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9072"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for future use.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9462"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9078"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for future use.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9468"></a><h3>
-<a name="XMLSECKEYUSEWITHPTRLISTID"></a>xmlSecKeyUseWithPtrListId</h3>
+<a name="XMLSECKEYUSEWITHPTRLISTID"></a><h3>xmlSecKeyUseWithPtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyUseWithPtrListId	xmlSecKeyUseWithPtrListGetKlass()</pre>
 <p>The keys list klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9476"></a><h3>
-<a name="XMLSECKEYUSEWITHPTRLISTGETKLASS"></a>xmlSecKeyUseWithPtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecKeyUseWithPtrListGetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYUSEWITHPTRLISTGETKLASS"></a><h3>xmlSecKeyUseWithPtrListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyUseWithPtrListGetKlass     (void);</pre>
 <p>The key data list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key data list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9100"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key data list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9491"></a><h3>
-<a name="XMLSECKEYREQ"></a>struct xmlSecKeyReq</h3>
+<a name="XMLSECKEYREQ"></a><h3>struct xmlSecKeyReq</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyReq {
-
     xmlSecKeyDataId	        keyId;
     xmlSecKeyDataType		keyType;
     xmlSecKeyUsage		keyUsage;
@@ -515,202 +485,192 @@ functions.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9500"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">keyId</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9113"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">keyId</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key value klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9506"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> <code class="STRUCTFIELD">keyType</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9119"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> <code class="STRUCTFIELD">keyType</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9512"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">keyUsage</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9125"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">keyUsage</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9518"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">keyBitsSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9131"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">keyBitsSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9524"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">keyUseWithList</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9137"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">keyUseWithList</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the desired key use with application/identifier information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9530"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9143"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for future use.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9536"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9149"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for future use.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9542"></a><h3>
-<a name="XMLSECKEYREQINITIALIZE"></a>xmlSecKeyReqInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyReqInitialize          (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<a name="XMLSECKEYREQINITIALIZE"></a><h3>xmlSecKeyReqInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqInitialize              (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
 <p>Initialize key requirements object. Caller is responsible for
 cleaning it with <a href="xmlsec-keys.html#XMLSECKEYREQFINALIZE"><span class="TYPE">xmlSecKeyReqFinalize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9555"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9167"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9565"></a><h3>
-<a name="XMLSECKEYREQFINALIZE"></a>xmlSecKeyReqFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyReqFinalize            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<a name="XMLSECKEYREQFINALIZE"></a><h3>xmlSecKeyReqFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqFinalize                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
 <p>Cleans the key requirements object initialized with <a href="xmlsec-keys.html#XMLSECKEYREQINITIALIZE"><span class="TYPE">xmlSecKeyReqInitialize</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9578"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9189"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9583"></a><h3>
-<a name="XMLSECKEYREQRESET"></a>xmlSecKeyReqReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyReqReset               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<a name="XMLSECKEYREQRESET"></a><h3>xmlSecKeyReqReset ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqReset                   (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
 <p>Resets key requirements object for new key search.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9594"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9204"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9599"></a><h3>
-<a name="XMLSECKEYREQCOPY"></a>xmlSecKeyReqCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyReqCopy                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);</pre>
-<p>Copies key requirements from <var class="PARAMETER">src</var> object to <var class="PARAMETER">dst</var> object.</p>
+<a name="XMLSECKEYREQCOPY"></a><h3>xmlSecKeyReqCopy ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqCopy                    (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> dst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> src);</pre>
+<p>Copies key requirements from <code class="PARAMETER">src</code> object to <code class="PARAMETER">dst</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9613"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9222"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9618"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9227"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9623"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9232"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9628"></a><h3>
-<a name="XMLSECKEYREQMATCHKEY"></a>xmlSecKeyReqMatchKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyReqMatchKey            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Checks whether <var class="PARAMETER">key</var> matches key requirements <var class="PARAMETER">keyReq</var>.</p>
+<a name="XMLSECKEYREQMATCHKEY"></a><h3>xmlSecKeyReqMatchKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqMatchKey                (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Checks whether <code class="PARAMETER">key</code> matches key requirements <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9642"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9250"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9647"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9255"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9652"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if key matches requirements, 0 if not and a negative value
+<td align="LEFT" valign="TOP"><a name="AEN9260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if key matches requirements, 0 if not and a negative value
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9657"></a><h3>
-<a name="XMLSECKEYREQMATCHKEYVALUE"></a>xmlSecKeyReqMatchKeyValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyReqMatchKeyValue       (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
-<p>Checks whether <var class="PARAMETER">keyValue</var> matches key requirements <var class="PARAMETER">keyReq</var>.</p>
+<a name="XMLSECKEYREQMATCHKEYVALUE"></a><h3>xmlSecKeyReqMatchKeyValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyReqMatchKeyValue           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
+<p>Checks whether <code class="PARAMETER">keyValue</code> matches key requirements <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9671"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9278"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9676"><span style="white-space: nowrap"><var class="PARAMETER">value</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9283"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9681"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if key value matches requirements, 0 if not and a negative value
+<td align="LEFT" valign="TOP"><a name="AEN9288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if key value matches requirements, 0 if not and a negative value
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9686"></a><h3>
-<a name="XMLSECKEYREQDEBUGDUMP"></a>xmlSecKeyReqDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyReqDebugDump           (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">keyReq</var> into <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYREQDEBUGDUMP"></a><h3>xmlSecKeyReqDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqDebugDump               (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">keyReq</code> into <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9700"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9306"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9705"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9311"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9710"></a><h3>
-<a name="XMLSECKEYREQDEBUGXMLDUMP"></a>xmlSecKeyReqDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyReqDebugXmlDump        (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">keyReq</var> into <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECKEYREQDEBUGXMLDUMP"></a><h3>xmlSecKeyReqDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyReqDebugXmlDump            (<a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">keyReq</code> into <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9724"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9329"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9729"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9334"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9734"></a><h3>
-<a name="XMLSECKEY"></a>struct xmlSecKey</h3>
+<a name="XMLSECKEY"></a><h3>struct xmlSecKey</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKey {
-
     xmlChar*				name;
     xmlSecKeyDataPtr			value;
     xmlSecPtrListPtr			dataList;
@@ -723,557 +683,532 @@ if an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9743"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9347"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9749"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <code class="STRUCTFIELD">value</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9353"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <code class="STRUCTFIELD">value</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9755"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">dataList</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9359"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">dataList</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9761"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">usage</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9365"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEYUSAGE">xmlSecKeyUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9767"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidBefore</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9371"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidBefore</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the start key validity interval.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9773"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidAfter</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9377"><span style="white-space: nowrap"><font>time_t</font> <code class="STRUCTFIELD">notValidAfter</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the end key validity interval.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9779"></a><h3>
-<a name="XMLSECKEYCREATE"></a>xmlSecKeyCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyCreate                (void);</pre>
+<a name="XMLSECKEYCREATE"></a><h3>xmlSecKeyCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyCreate                     (void);</pre>
 <p>Allocates and initializes new key. Caller is responsible for 
 freeing returned object with <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9791"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated <var class="PARAMETER">xmlSecKey</var> structure
+<td align="LEFT" valign="TOP"><a name="AEN9394"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated <code class="PARAMETER">xmlSecKey</code> structure
 or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9797"></a><h3>
-<a name="XMLSECKEYDESTROY"></a>xmlSecKeyDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDestroy                (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<a name="XMLSECKEYDESTROY"></a><h3>xmlSecKeyDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDestroy                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
 <p>Destroys the key created using <a href="xmlsec-keys.html#XMLSECKEYCREATE"><span class="TYPE">xmlSecKeyCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9810"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9412"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9815"></a><h3>
-<a name="XMLSECKEYEMPTY"></a>xmlSecKeyEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyEmpty                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Clears the <var class="PARAMETER">key</var> data.</p>
+<a name="XMLSECKEYEMPTY"></a><h3>xmlSecKeyEmpty ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyEmpty                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Clears the <code class="PARAMETER">key</code> data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN9827"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9428"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9832"></a><h3>
-<a name="XMLSECKEYDUPLICATE"></a>xmlSecKeyDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> xmlSecKeyDuplicate             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Creates a duplicate of the given <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYDUPLICATE"></a><h3>xmlSecKeyDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeyDuplicate                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Creates a duplicate of the given <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9844"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9444"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9851"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure
+<td align="LEFT" valign="TOP"><a name="AEN9451"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated <a href="xmlsec-keys.html#XMLSECKEY"><span class="TYPE">xmlSecKey</span></a> structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9858"></a><h3>
-<a name="XMLSECKEYCOPY"></a>xmlSecKeyCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyCopy                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);</pre>
-<p>Copies key data from <var class="PARAMETER">keySrc</var> to <var class="PARAMETER">keyDst</var>.</p>
+<a name="XMLSECKEYCOPY"></a><h3>xmlSecKeyCopy ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyCopy                       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keyDst,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> keySrc);</pre>
+<p>Copies key data from <code class="PARAMETER">keySrc</code> to <code class="PARAMETER">keyDst</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9872"><span style="white-space: nowrap"><var class="PARAMETER">keyDst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9471"><span style="white-space: nowrap"><code class="PARAMETER">keyDst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9877"><span style="white-space: nowrap"><var class="PARAMETER">keySrc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9476"><span style="white-space: nowrap"><code class="PARAMETER">keySrc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9481"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9887"></a><h3>
-<a name="XMLSECKEYGETNAME"></a>xmlSecKeyGetName ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>* xmlSecKeyGetName             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<a name="XMLSECKEYGETNAME"></a><h3>xmlSecKeyGetName ()</h3>
+<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecKeyGetName                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
 <p>Gets key name (see also <a href="xmlsec-keys.html#XMLSECKEYSETNAME"><span class="TYPE">xmlSecKeySetName</span></a> function).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9900"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9498"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9905"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key name.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9503"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key name.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9910"></a><h3>
-<a name="XMLSECKEYSETNAME"></a>xmlSecKeySetName ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeySetName                (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>xmlChar</font> *name);</pre>
+<a name="XMLSECKEYSETNAME"></a><h3>xmlSecKeySetName ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeySetName                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>xmlChar</font> *name);</pre>
 <p>Sets key name (see also <a href="xmlsec-keys.html#XMLSECKEYGETNAME"><span class="TYPE">xmlSecKeyGetName</span></a> function).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9924"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9521"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9929"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9526"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9934"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9531"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9939"></a><h3>
-<a name="XMLSECKEYGETTYPE"></a>xmlSecKeyGetType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> xmlSecKeyGetType          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Gets <var class="PARAMETER">key</var> type.</p>
+<a name="XMLSECKEYGETTYPE"></a><h3>xmlSecKeyGetType ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   xmlSecKeyGetType                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Gets <code class="PARAMETER">key</code> type.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9951"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9547"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9956"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key type.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9961"></a><h3>
-<a name="XMLSECKEYGETVALUE"></a>xmlSecKeyGetValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font> xmlSecKeyGetValue          (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<a name="XMLSECKEYGETVALUE"></a><h3>xmlSecKeyGetValue ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyGetValue                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
 <p>Gets key value (see also <a href="xmlsec-keys.html#XMLSECKEYSETVALUE"><span class="TYPE">xmlSecKeySetValue</span></a> function).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9974"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9569"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9979"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key value (crypto material).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key value (crypto material).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN9984"></a><h3>
-<a name="XMLSECKEYSETVALUE"></a>xmlSecKeySetValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeySetValue               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
+<a name="XMLSECKEYSETVALUE"></a><h3>xmlSecKeySetValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeySetValue                   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> value);</pre>
 <p>Sets key value (see also <a href="xmlsec-keys.html#XMLSECKEYGETVALUE"><span class="TYPE">xmlSecKeyGetValue</span></a> function).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN9998"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9592"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10003"><span style="white-space: nowrap"><var class="PARAMETER">value</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9597"><span style="white-space: nowrap"><code class="PARAMETER">value</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10008"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10013"></a><h3>
-<a name="XMLSECKEYGETDATA"></a>xmlSecKeyGetData ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font> xmlSecKeyGetData           (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlSecKeyDataId</font> dataId);</pre>
+<a name="XMLSECKEYGETDATA"></a><h3>xmlSecKeyGetData ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyGetData                    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
 <p>Gets key's data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10025"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9618"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10030"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9623"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>additional data associated with the <var class="PARAMETER">key</var> (see also 
+<td align="LEFT" valign="TOP"><a name="AEN9628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> additional data associated with the <code class="PARAMETER">key</code> (see also 
 <a href="xmlsec-keys.html#XMLSECKEYADOPTDATA"><span class="TYPE">xmlSecKeyAdoptData</span></a> function).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10043"></a><h3>
-<a name="XMLSECKEYENSUREDATA"></a>xmlSecKeyEnsureData ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font> xmlSecKeyEnsureData        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlSecKeyDataId</font> dataId);</pre>
-<p>If necessary, creates key data of <var class="PARAMETER">dataId</var> klass and adds to <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYENSUREDATA"></a><h3>xmlSecKeyEnsureData ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyEnsureData                 (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
+<p>If necessary, creates key data of <code class="PARAMETER">dataId</code> klass and adds to <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10057"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9649"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10062"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9654"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10067"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to key data or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9659"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to key data or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10072"></a><h3>
-<a name="XMLSECKEYADOPTDATA"></a>xmlSecKeyAdoptData ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyAdoptData              (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Adds <var class="PARAMETER">data</var> to the <var class="PARAMETER">key</var>. The <var class="PARAMETER">data</var> object will be destroyed
-by <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYADOPTDATA"></a><h3>xmlSecKeyAdoptData ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyAdoptData                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Adds <code class="PARAMETER">data</code> to the <code class="PARAMETER">key</code>. The <code class="PARAMETER">data</code> object will be destroyed
+by <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10088"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9679"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10093"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9684"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10103"></a><h3>
-<a name="XMLSECKEYDEBUGDUMP"></a>xmlSecKeyDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDebugDump              (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the information about the <var class="PARAMETER">key</var> to the <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYDEBUGDUMP"></a><h3>xmlSecKeyDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDebugDump                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the information about the <code class="PARAMETER">key</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10117"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9707"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10122"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9712"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10127"></a><h3>
-<a name="XMLSECKEYDEBUGXMLDUMP"></a>xmlSecKeyDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDebugXmlDump           (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the information about the <var class="PARAMETER">key</var> to the <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECKEYDEBUGXMLDUMP"></a><h3>xmlSecKeyDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDebugXmlDump               (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the information about the <code class="PARAMETER">key</code> to the <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10141"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9730"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10146"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9735"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10151"></a><h3>
-<a name="XMLSECKEYGENERATE"></a>xmlSecKeyGenerate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyGenerate              (<font>xmlSecKeyDataId</font> dataId,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Generates new key of requested klass <var class="PARAMETER">dataId</var> and <var class="PARAMETER">type</var>.</p>
+<a name="XMLSECKEYGENERATE"></a><h3>xmlSecKeyGenerate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyGenerate                   (<font>xmlSecKeyDataId</font> dataId,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Generates new key of requested klass <code class="PARAMETER">dataId</code> and <code class="PARAMETER">type</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10166"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9754"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested key klass (rsa, dsa, aes, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10171"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9759"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10176"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9764"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10181"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9769"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10186"></a><h3>
-<a name="XMLSECKEYGENERATEBYNAME"></a>xmlSecKeyGenerateByName ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyGenerateByName        (const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Generates new key of requested <var class="PARAMETER">klass</var> and <var class="PARAMETER">type</var>.</p>
+<a name="XMLSECKEYGENERATEBYNAME"></a><h3>xmlSecKeyGenerateByName ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyGenerateByName             (const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Generates new key of requested <code class="PARAMETER">klass</code> and <code class="PARAMETER">type</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10201"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9788"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the requested key klass name (rsa, dsa, aes, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10206"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9793"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key size (in bits!).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10211"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9798"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new key type (session, permanent, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10216"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9803"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10221"></a><h3>
-<a name="XMLSECKEYMATCH"></a>xmlSecKeyMatch ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyMatch                  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
-<p>Checks whether the <var class="PARAMETER">key</var> matches the given criteria.</p>
+<a name="XMLSECKEYMATCH"></a><h3>xmlSecKeyMatch ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyMatch                      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<p>Checks whether the <code class="PARAMETER">key</code> matches the given criteria.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10235"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9821"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10240"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9826"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key name (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10245"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9831"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key requirements.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if the key satisfies the given criteria or 0 otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if the key satisfies the given criteria or 0 otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10255"></a><h3>
-<a name="XMLSECKEYREADBUFFER"></a>xmlSecKeyReadBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyReadBuffer            (<font>xmlSecKeyDataId</font> dataId,
-                                             <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);</pre>
-<p>Reads the key value of klass <var class="PARAMETER">dataId</var> from a buffer.</p>
+<a name="XMLSECKEYREADBUFFER"></a><h3>xmlSecKeyReadBuffer ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadBuffer                 (<font>xmlSecKeyDataId</font> dataId,
+                                                         <a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> *buffer);</pre>
+<p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10268"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9853"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10273"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9858"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer that contains the binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10278"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9863"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10283"></a><h3>
-<a name="XMLSECKEYREADBINARYFILE"></a>xmlSecKeyReadBinaryFile ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyReadBinaryFile        (<font>xmlSecKeyDataId</font> dataId,
-                                             const <font>char</font> *filename);</pre>
-<p>Reads the key value of klass <var class="PARAMETER">dataId</var> from a binary file <var class="PARAMETER">filename</var>.</p>
+<a name="XMLSECKEYREADBINARYFILE"></a><h3>xmlSecKeyReadBinaryFile ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadBinaryFile             (<font>xmlSecKeyDataId</font> dataId,
+                                                         const <font>char</font> *filename);</pre>
+<p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a binary file <code class="PARAMETER">filename</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10297"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9881"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10302"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9886"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10307"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9891"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10312"></a><h3>
-<a name="XMLSECKEYREADMEMORY"></a>xmlSecKeyReadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecKeyReadMemory            (<font>xmlSecKeyDataId</font> dataId,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
-<p>Reads the key value of klass <var class="PARAMETER">dataId</var> from a memory block <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECKEYREADMEMORY"></a><h3>xmlSecKeyReadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecKeyReadMemory                 (<font>xmlSecKeyDataId</font> dataId,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<p>Reads the key value of klass <code class="PARAMETER">dataId</code> from a memory block <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10327"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9910"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10332"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9915"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the memory containing the key</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10337"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9920"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the size of the memory block</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10342"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9925"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10347"></a><h3>
-<a name="XMLSECKEYISVALID"></a>xmlSecKeyIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyIsValid(key)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">key</var> is not NULL and <var class="PARAMETER">key</var>-&gt;id is not NULL
+<a name="XMLSECKEYISVALID"></a><h3>xmlSecKeyIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyIsValid(key)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">key</code> is not NULL and <code class="PARAMETER">key</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10358"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9940"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10363"></a><h3>
-<a name="XMLSECKEYCHECKID"></a>xmlSecKeyCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyCheckId(key, keyId)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">key</var> is valid and <var class="PARAMETER">key</var>'s id is equal to <var class="PARAMETER">keyId</var>.</p>
+<a name="XMLSECKEYCHECKID"></a><h3>xmlSecKeyCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyCheckId(key, keyId)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">key</code> is valid and <code class="PARAMETER">key</code>'s id is equal to <code class="PARAMETER">keyId</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10375"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9956"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10380"><span style="white-space: nowrap"><var class="PARAMETER">keyId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN9961"><span style="white-space: nowrap"><code class="PARAMETER">keyId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the key Id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10385"></a><h3>
-<a name="XMLSECKEYPTRLISTID"></a>xmlSecKeyPtrListId</h3>
+<a name="XMLSECKEYPTRLISTID"></a><h3>xmlSecKeyPtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyPtrListId	xmlSecKeyPtrListGetKlass()</pre>
 <p>The keys list klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10393"></a><h3>
-<a name="XMLSECKEYPTRLISTGETKLASS"></a>xmlSecKeyPtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecKeyPtrListGetKlass    (void);</pre>
+<a name="XMLSECKEYPTRLISTGETKLASS"></a><h3>xmlSecKeyPtrListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyPtrListGetKlass            (void);</pre>
 <p>The keys list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10403"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>keys list id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN9982"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> keys list id.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keysdata.html"><b>&lt;&lt;&lt;keysdata</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keysmngr.html"><b>keysmngr&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keysdata.html"><b>&lt;&lt;&lt; keysdata</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keysmngr.html"><b>keysmngr &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keysdata.html b/docs/api/xmlsec-keysdata.html
index 97f8f41..568c286 100644
--- a/docs/api/xmlsec-keysdata.html
+++ b/docs/api/xmlsec-keysdata.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keysdata</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="keyinfo" href="xmlsec-keyinfo.html">
 <link rel="NEXT" title="keys" href="xmlsec-keys.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,251 +87,226 @@
 <h1>
 <a name="XMLSEC-KEYSDATA"></a>keysdata</h1>
 <div class="REFNAMEDIV">
-<a name="AEN6436"></a><h2>Name</h2>keysdata--Crypto key data object definition.</div>
+<a name="AEN6169"></a><h2>Name</h2>keysdata -- Crypto key data object definition.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN6439"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-typedef     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a>;
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEUNKNOWN">xmlSecKeyDataUsageUnknown</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEREAD">xmlSecKeyDataUsageKeyInfoNodeRead</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEWRITE">xmlSecKeyDataUsageKeyInfoNodeWrite</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEREAD">xmlSecKeyDataUsageKeyValueNodeRead</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEWRITE">xmlSecKeyDataUsageKeyValueNodeWrite</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML">xmlSecKeyDataUsageRetrievalMethodNodeXml</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN">xmlSecKeyDataUsageRetrievalMethodNodeBin</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEANY">xmlSecKeyDataUsageAny</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODE">xmlSecKeyDataUsageKeyInfoNode</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODE">xmlSecKeyDataUsageKeyValueNode</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODE">xmlSecKeyDataUsageRetrievalMethodNode</a>
-typedef     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>;
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEUNKNOWN">xmlSecKeyDataTypeUnknown</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPENONE">xmlSecKeyDataTypeNone</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPUBLIC">xmlSecKeyDataTypePublic</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPRIVATE">xmlSecKeyDataTypePrivate</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPESYMMETRIC">xmlSecKeyDataTypeSymmetric</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPESESSION">xmlSecKeyDataTypeSession</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPERMANENT">xmlSecKeyDataTypePermanent</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPETRUSTED">xmlSecKeyDataTypeTrusted</a>
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEANY">xmlSecKeyDataTypeAny</a>
-enum        <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a>;
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSGET">xmlSecKeyDataIdsGet</a>        (void);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSINIT">xmlSecKeyDataIdsInit</a>            (void);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSSHUTDOWN">xmlSecKeyDataIdsShutdown</a>        (void);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTERDEFAULT">xmlSecKeyDataIdsRegisterDefault</a> (void);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTER">xmlSecKeyDataIdsRegister</a>        (<font>xmlSecKeyDataId</font> id);
-struct      <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyData</a>;
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-keysdata.html#XMLSECKEYDATACREATE">xmlSecKeyDataCreate</a>        (<font>xmlSecKeyDataId</font> id);
-<font>xmlSecKeyDataPtr</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATE">xmlSecKeyDataDuplicate</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY">xmlSecKeyDataDestroy</a>            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATE">xmlSecKeyDataGenerate</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPE">xmlSecKeyDataGetType</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZE">xmlSecKeyDataGetSize</a>            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-const <font>xmlChar</font>* <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIER">xmlSecKeyDataGetIdentifier</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMP">xmlSecKeyDataDebugDump</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGXMLDUMP">xmlSecKeyDataDebugXmlDump</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREAD">xmlSecKeyDataXmlRead</a>            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITE">xmlSecKeyDataXmlWrite</a>           (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINREAD">xmlSecKeyDataBinRead</a>            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITE">xmlSecKeyDataBinWrite</a>           (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETNAME">xmlSecKeyDataGetName</a>            (data)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAISVALID">xmlSecKeyDataIsValid</a>            (data)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKID">xmlSecKeyDataCheckId</a>            (data, dataId)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKUSAGE">xmlSecKeyDataCheckUsage</a>         (data, usg)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKSIZE">xmlSecKeyDataCheckSize</a>          (data, size)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDUNKNOWN">xmlSecKeyDataIdUnknown</a>
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">*xmlSecKeyDataInitMethod</a>)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">*xmlSecKeyDataDuplicateMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
-<font>void</font>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">*xmlSecKeyDataFinalizeMethod</a>)  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">*xmlSecKeyDataXmlReadMethod</a>)   (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">*xmlSecKeyDataXmlWriteMethod</a>)  (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">*xmlSecKeyDataBinReadMethod</a>)   (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">*xmlSecKeyDataBinWriteMethod</a>)  (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">*xmlSecKeyDataGenerateMethod</a>)  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">*xmlSecKeyDataGetTypeMethod</a>)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">*xmlSecKeyDataGetSizeMethod</a>)   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-const <font>xmlChar</font>* (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">*xmlSecKeyDataGetIdentifierMethod</a>)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>void</font>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">*xmlSecKeyDataDebugDumpMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);
-struct      <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASS">xmlSecKeyDataKlass</a>;
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASSGETNAME">xmlSecKeyDataKlassGetName</a>       (klass)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTID">xmlSecKeyDataListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTGETKLASS">xmlSecKeyDataListGetKlass</a>   (void);
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTID">xmlSecKeyDataIdListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTGETKLASS">xmlSecKeyDataIdListGetKlass</a> (void);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFIND">xmlSecKeyDataIdListFind</a>         (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecKeyDataId</font> dataId);
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNODE">xmlSecKeyDataIdListFindByNode</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYHREF">xmlSecKeyDataIdListFindByHref</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *href,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>xmlSecKeyDataId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNAME">xmlSecKeyDataIdListFindByName</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGDUMP">xmlSecKeyDataIdListDebugDump</a>    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGXMLDUMP">xmlSecKeyDataIdListDebugXmlDump</a> (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYSIZE">xmlSecKeyDataBinarySize</a>
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEINITIALIZE">xmlSecKeyDataBinaryValueInitialize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDUPLICATE">xmlSecKeyDataBinaryValueDuplicate</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEFINALIZE">xmlSecKeyDataBinaryValueFinalize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLREAD">xmlSecKeyDataBinaryValueXmlRead</a> (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLWRITE">xmlSecKeyDataBinaryValueXmlWrite</a>
-                                            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINREAD">xmlSecKeyDataBinaryValueBinRead</a> (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINWRITE">xmlSecKeyDataBinaryValueBinWrite</a>
-                                            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGDUMP">xmlSecKeyDataBinaryValueDebugDump</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP">xmlSecKeyDataBinaryValueDebugXmlDump</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETSIZE">xmlSecKeyDataBinaryValueGetSize</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETBUFFER">xmlSecKeyDataBinaryValueGetBuffer</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUESETBUFFER">xmlSecKeyDataBinaryValueSetBuffer</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-struct      <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStore</a>;
-<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE">xmlSecKeyDataStoreCreate</a>
-                                            (<font>xmlSecKeyDataStoreId</font> id);
-<font>void</font>        <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY">xmlSecKeyDataStoreDestroy</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREGETNAME">xmlSecKeyDataStoreGetName</a>       (store)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREISVALID">xmlSecKeyDataStoreIsValid</a>       (store)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKID">xmlSecKeyDataStoreCheckId</a>       (store, storeId)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKSIZE">xmlSecKeyDataStoreCheckSize</a>     (store, size)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREIDUNKNOWN">xmlSecKeyDataStoreIdUnknown</a>
-<font>int</font>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">*xmlSecKeyDataStoreInitializeMethod</a>)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-<font>void</font>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">*xmlSecKeyDataStoreFinalizeMethod</a>)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-struct      <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">xmlSecKeyDataStoreKlass</a>;
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASSGETNAME">xmlSecKeyDataStoreKlassGetName</a>  (klass)
-#define     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTID">xmlSecKeyDataStorePtrListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTGETKLASS">xmlSecKeyDataStorePtrListGetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-KEYSDATA.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">typedef             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a>;
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEUNKNOWN">xmlSecKeyDataUsageUnknown</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEREAD">xmlSecKeyDataUsageKeyInfoNodeRead</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODEWRITE">xmlSecKeyDataUsageKeyInfoNodeWrite</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEREAD">xmlSecKeyDataUsageKeyValueNodeRead</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODEWRITE">xmlSecKeyDataUsageKeyValueNodeWrite</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML">xmlSecKeyDataUsageRetrievalMethodNodeXml</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN">xmlSecKeyDataUsageRetrievalMethodNodeBin</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEANY">xmlSecKeyDataUsageAny</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYINFONODE">xmlSecKeyDataUsageKeyInfoNode</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGEKEYVALUENODE">xmlSecKeyDataUsageKeyValueNode</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGERETRIEVALMETHODNODE">xmlSecKeyDataUsageRetrievalMethodNode</a>
+typedef             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>;
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEUNKNOWN">xmlSecKeyDataTypeUnknown</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPENONE">xmlSecKeyDataTypeNone</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPUBLIC">xmlSecKeyDataTypePublic</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPRIVATE">xmlSecKeyDataTypePrivate</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPESYMMETRIC">xmlSecKeyDataTypeSymmetric</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPESESSION">xmlSecKeyDataTypeSession</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEPERMANENT">xmlSecKeyDataTypePermanent</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPETRUSTED">xmlSecKeyDataTypeTrusted</a>
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEANY">xmlSecKeyDataTypeAny</a>
+enum                <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a>;
+<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSGET">xmlSecKeyDataIdsGet</a>                 (void);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSINIT">xmlSecKeyDataIdsInit</a>                (void);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSSHUTDOWN">xmlSecKeyDataIdsShutdown</a>            (void);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTERDEFAULT">xmlSecKeyDataIdsRegisterDefault</a>     (void);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDSREGISTER">xmlSecKeyDataIdsRegister</a>            (<font>xmlSecKeyDataId</font> id);
+struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyData</a>;
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-keysdata.html#XMLSECKEYDATACREATE">xmlSecKeyDataCreate</a>                 (<font>xmlSecKeyDataId</font> id);
+<font>xmlSecKeyDataPtr</font>    <a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATE">xmlSecKeyDataDuplicate</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY">xmlSecKeyDataDestroy</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATE">xmlSecKeyDataGenerate</a>               (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPE">xmlSecKeyDataGetType</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZE">xmlSecKeyDataGetSize</a>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+const <font>xmlChar</font>*      <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIER">xmlSecKeyDataGetIdentifier</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMP">xmlSecKeyDataDebugDump</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGXMLDUMP">xmlSecKeyDataDebugXmlDump</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREAD">xmlSecKeyDataXmlRead</a>                (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITE">xmlSecKeyDataXmlWrite</a>               (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINREAD">xmlSecKeyDataBinRead</a>                (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITE">xmlSecKeyDataBinWrite</a>               (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAGETNAME">xmlSecKeyDataGetName</a>                (data)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAISVALID">xmlSecKeyDataIsValid</a>                (data)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKID">xmlSecKeyDataCheckId</a>                (data, dataId)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKUSAGE">xmlSecKeyDataCheckUsage</a>             (data, usg)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATACHECKSIZE">xmlSecKeyDataCheckSize</a>              (data, size)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDUNKNOWN">xmlSecKeyDataIdUnknown</a>
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">*xmlSecKeyDataInitMethod</a>)          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">*xmlSecKeyDataDuplicateMethod</a>)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
+<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">*xmlSecKeyDataFinalizeMethod</a>)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">*xmlSecKeyDataXmlReadMethod</a>)       (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">*xmlSecKeyDataXmlWriteMethod</a>)      (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">*xmlSecKeyDataBinReadMethod</a>)       (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">*xmlSecKeyDataBinWriteMethod</a>)      (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">*xmlSecKeyDataGenerateMethod</a>)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">*xmlSecKeyDataGetTypeMethod</a>)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">*xmlSecKeyDataGetSizeMethod</a>)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+const <font>xmlChar</font> *     (<a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">*xmlSecKeyDataGetIdentifierMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">*xmlSecKeyDataDebugDumpMethod</a>)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);
+struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASS">xmlSecKeyDataKlass</a>;
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAKLASSGETNAME">xmlSecKeyDataKlassGetName</a>           (klass)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTID">xmlSecKeyDataListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATALISTGETKLASS">xmlSecKeyDataListGetKlass</a>           (void);
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTID">xmlSecKeyDataIdListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTGETKLASS">xmlSecKeyDataIdListGetKlass</a>         (void);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFIND">xmlSecKeyDataIdListFind</a>             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecKeyDataId</font> dataId);
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNODE">xmlSecKeyDataIdListFindByNode</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYHREF">xmlSecKeyDataIdListFindByHref</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *href,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTFINDBYNAME">xmlSecKeyDataIdListFindByName</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGDUMP">xmlSecKeyDataIdListDebugDump</a>        (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATAIDLISTDEBUGXMLDUMP">xmlSecKeyDataIdListDebugXmlDump</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYSIZE">xmlSecKeyDataBinarySize</a>
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEINITIALIZE">xmlSecKeyDataBinaryValueInitialize</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDUPLICATE">xmlSecKeyDataBinaryValueDuplicate</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEFINALIZE">xmlSecKeyDataBinaryValueFinalize</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLREAD">xmlSecKeyDataBinaryValueXmlRead</a>     (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEXMLWRITE">xmlSecKeyDataBinaryValueXmlWrite</a>    (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINREAD">xmlSecKeyDataBinaryValueBinRead</a>     (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEBINWRITE">xmlSecKeyDataBinaryValueBinWrite</a>    (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGDUMP">xmlSecKeyDataBinaryValueDebugDump</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP">xmlSecKeyDataBinaryValueDebugXmlDump</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETSIZE">xmlSecKeyDataBinaryValueGetSize</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>xmlSecBufferPtr</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUEGETBUFFER">xmlSecKeyDataBinaryValueGetBuffer</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-keysdata.html#XMLSECKEYDATABINARYVALUESETBUFFER">xmlSecKeyDataBinaryValueSetBuffer</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStore</a>;
+<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a>  <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE">xmlSecKeyDataStoreCreate</a>         (<font>xmlSecKeyDataStoreId</font> id);
+<font>void</font>                <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY">xmlSecKeyDataStoreDestroy</a>           (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREGETNAME">xmlSecKeyDataStoreGetName</a>           (store)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREISVALID">xmlSecKeyDataStoreIsValid</a>           (store)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKID">xmlSecKeyDataStoreCheckId</a>           (store, storeId)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECHECKSIZE">xmlSecKeyDataStoreCheckSize</a>         (store, size)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREIDUNKNOWN">xmlSecKeyDataStoreIdUnknown</a>
+<font>int</font>                 (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">*xmlSecKeyDataStoreInitializeMethod</a>)
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+<font>void</font>                (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">*xmlSecKeyDataStoreFinalizeMethod</a>) (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+struct              <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASS">xmlSecKeyDataStoreKlass</a>;
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREKLASSGETNAME">xmlSecKeyDataStoreKlassGetName</a>      (klass)
+#define             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTID">xmlSecKeyDataStorePtrListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREPTRLISTGETKLASS">xmlSecKeyDataStorePtrListGetKlass</a>   (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN6709"></a><h2>Description</h2>
+<a name="XMLSEC-KEYSDATA.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto key data object definition.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN6712"></a><h2>Details</h2>
+<a name="XMLSEC-KEYSDATA.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN6714"></a><h3>
-<a name="XMLSECKEYDATAUSAGE"></a>xmlSecKeyDataUsage</h3>
+<a name="XMLSECKEYDATAUSAGE"></a><h3>xmlSecKeyDataUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int					xmlSecKeyDataUsage;</pre>
 <p>The bits mask that determines possible keys data usage.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6722"></a><h3>
-<a name="XMLSECKEYDATAUSAGEUNKNOWN"></a>xmlSecKeyDataUsageUnknown</h3>
+<a name="XMLSECKEYDATAUSAGEUNKNOWN"></a><h3>xmlSecKeyDataUsageUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageUnknown			0x00000</pre>
 <p>The key data usage is unknown.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6730"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYINFONODEREAD"></a>xmlSecKeyDataUsageKeyInfoNodeRead</h3>
+<a name="XMLSECKEYDATAUSAGEKEYINFONODEREAD"></a><h3>xmlSecKeyDataUsageKeyInfoNodeRead</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyInfoNodeRead		0x00001</pre>
 <p>The key data could be read from a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6739"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYINFONODEWRITE"></a>xmlSecKeyDataUsageKeyInfoNodeWrite</h3>
+<a name="XMLSECKEYDATAUSAGEKEYINFONODEWRITE"></a><h3>xmlSecKeyDataUsageKeyInfoNodeWrite</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyInfoNodeWrite		0x00002</pre>
 <p>The key data could be written to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6748"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYVALUENODEREAD"></a>xmlSecKeyDataUsageKeyValueNodeRead</h3>
+<a name="XMLSECKEYDATAUSAGEKEYVALUENODEREAD"></a><h3>xmlSecKeyDataUsageKeyValueNodeRead</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyValueNodeRead		0x00004</pre>
 <p>The key data could be read from a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6757"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYVALUENODEWRITE"></a>xmlSecKeyDataUsageKeyValueNodeWrite</h3>
+<a name="XMLSECKEYDATAUSAGEKEYVALUENODEWRITE"></a><h3>xmlSecKeyDataUsageKeyValueNodeWrite</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageKeyValueNodeWrite		0x00008</pre>
 <p>The key data could be written to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6766"></a><h3>
-<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML"></a>xmlSecKeyDataUsageRetrievalMethodNodeXml</h3>
+<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEXML"></a><h3>xmlSecKeyDataUsageRetrievalMethodNodeXml</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageRetrievalMethodNodeXml	0x00010</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in XML format.</p>
@@ -340,8 +314,7 @@ in XML format.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6775"></a><h3>
-<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN"></a>xmlSecKeyDataUsageRetrievalMethodNodeBin</h3>
+<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODEBIN"></a><h3>xmlSecKeyDataUsageRetrievalMethodNodeBin</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageRetrievalMethodNodeBin	0x00020</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in binary format.</p>
@@ -349,121 +322,106 @@ in binary format.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6784"></a><h3>
-<a name="XMLSECKEYDATAUSAGEANY"></a>xmlSecKeyDataUsageAny</h3>
+<a name="XMLSECKEYDATAUSAGEANY"></a><h3>xmlSecKeyDataUsageAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataUsageAny				0xFFFFF</pre>
 <p>Any key data usage.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6792"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYINFONODE"></a>xmlSecKeyDataUsageKeyInfoNode</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataUsageKeyInfoNode</pre>
+<a name="XMLSECKEYDATAUSAGEKEYINFONODE"></a><h3>xmlSecKeyDataUsageKeyInfoNode</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageKeyInfoNode</pre>
 <p>The key data could be read and written from/to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo%20"; target="_top">&lt;dsig:KeyInfo /&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6801"></a><h3>
-<a name="XMLSECKEYDATAUSAGEKEYVALUENODE"></a>xmlSecKeyDataUsageKeyValueNode</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataUsageKeyValueNode</pre>
+<a name="XMLSECKEYDATAUSAGEKEYVALUENODE"></a><h3>xmlSecKeyDataUsageKeyValueNode</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageKeyValueNode</pre>
 <p>The key data could be read and written from/to a <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue%20"; target="_top">&lt;dsig:KeyValue /&gt;</a> child.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6810"></a><h3>
-<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODE"></a>xmlSecKeyDataUsageRetrievalMethodNode</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataUsageRetrievalMethodNode</pre>
+<a name="XMLSECKEYDATAUSAGERETRIEVALMETHODNODE"></a><h3>xmlSecKeyDataUsageRetrievalMethodNode</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataUsageRetrievalMethodNode</pre>
 <p>The key data could be retrieved using <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod%20"; target="_top">&lt;dsig:RetrievalMethod /&gt;</a> node
 in any format.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6819"></a><h3>
-<a name="XMLSECKEYDATATYPE"></a>xmlSecKeyDataType</h3>
+<a name="XMLSECKEYDATATYPE"></a><h3>xmlSecKeyDataType</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int				xmlSecKeyDataType;</pre>
 <p>The key data type (public/private, session/permanet, etc.).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6827"></a><h3>
-<a name="XMLSECKEYDATATYPEUNKNOWN"></a>xmlSecKeyDataTypeUnknown</h3>
+<a name="XMLSECKEYDATATYPEUNKNOWN"></a><h3>xmlSecKeyDataTypeUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeUnknown			0x0000</pre>
 <p>The key data type is unknown (same as <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPENONE"><span class="TYPE">xmlSecKeyDataTypeNone</span></a>).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6837"></a><h3>
-<a name="XMLSECKEYDATATYPENONE"></a>xmlSecKeyDataTypeNone</h3>
+<a name="XMLSECKEYDATATYPENONE"></a><h3>xmlSecKeyDataTypeNone</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeNone				xmlSecKeyDataTypeUnknown</pre>
 <p>The key data type is unknown (same as <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPEUNKNOWN"><span class="TYPE">xmlSecKeyDataTypeUnknown</span></a>).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6847"></a><h3>
-<a name="XMLSECKEYDATATYPEPUBLIC"></a>xmlSecKeyDataTypePublic</h3>
+<a name="XMLSECKEYDATATYPEPUBLIC"></a><h3>xmlSecKeyDataTypePublic</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePublic				0x0001</pre>
 <p>The key data contain a public key.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6855"></a><h3>
-<a name="XMLSECKEYDATATYPEPRIVATE"></a>xmlSecKeyDataTypePrivate</h3>
+<a name="XMLSECKEYDATATYPEPRIVATE"></a><h3>xmlSecKeyDataTypePrivate</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePrivate			0x0002</pre>
 <p>The key data contain a private key.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6863"></a><h3>
-<a name="XMLSECKEYDATATYPESYMMETRIC"></a>xmlSecKeyDataTypeSymmetric</h3>
+<a name="XMLSECKEYDATATYPESYMMETRIC"></a><h3>xmlSecKeyDataTypeSymmetric</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeSymmetric			0x0004</pre>
 <p>The key data contain a symmetric key.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6871"></a><h3>
-<a name="XMLSECKEYDATATYPESESSION"></a>xmlSecKeyDataTypeSession</h3>
+<a name="XMLSECKEYDATATYPESESSION"></a><h3>xmlSecKeyDataTypeSession</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeSession			0x0008</pre>
 <p>The key data contain session key (one time key, not stored in keys manager).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6879"></a><h3>
-<a name="XMLSECKEYDATATYPEPERMANENT"></a>xmlSecKeyDataTypePermanent</h3>
+<a name="XMLSECKEYDATATYPEPERMANENT"></a><h3>xmlSecKeyDataTypePermanent</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypePermanent			0x0010</pre>
 <p>The key data contain permanent key (stored in keys manager).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6887"></a><h3>
-<a name="XMLSECKEYDATATYPETRUSTED"></a>xmlSecKeyDataTypeTrusted</h3>
+<a name="XMLSECKEYDATATYPETRUSTED"></a><h3>xmlSecKeyDataTypeTrusted</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeTrusted			0x0100</pre>
 <p>The key data is trusted.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6895"></a><h3>
-<a name="XMLSECKEYDATATYPEANY"></a>xmlSecKeyDataTypeAny</h3>
+<a name="XMLSECKEYDATATYPEANY"></a><h3>xmlSecKeyDataTypeAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataTypeAny				0xFFFF</pre>
 <p>Any key data.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6903"></a><h3>
-<a name="XMLSECKEYDATAFORMAT"></a>enum xmlSecKeyDataFormat</h3>
+<a name="XMLSECKEYDATAFORMAT"></a><h3>enum xmlSecKeyDataFormat</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecKeyDataFormatUnknown = 0,
     xmlSecKeyDataFormatBinary,
@@ -480,119 +438,112 @@ in any format.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6912"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatUnknown</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATUNKNOWN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatUnknown</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data format is unknown.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6917"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatBinary</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATBINARY"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatBinary</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6922"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatPem</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPem</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PEM key data (cert or public/private key).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6927"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatDer</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATDER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatDer</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the DER key data (cert or public/private key).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6932"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatPkcs8Pem</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS8PEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs8Pem</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the PKCS8 PEM private key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6937"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatPkcs8Der</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS8DER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs8Der</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the PKCS8 DER private key. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6942"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatPkcs12</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATPKCS12"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatPkcs12</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 format (bag of keys and certs)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6947"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatCertPem</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATCERTPEM"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatCertPem</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PEM cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN6952"><span style="white-space: nowrap"><var class="LITERAL">xmlSecKeyDataFormatCertDer</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECKEYDATAFORMATCERTDER"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecKeyDataFormatCertDer</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>		the DER cert.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6957"></a><h3>
-<a name="XMLSECKEYDATAIDSGET"></a>xmlSecKeyDataIdsGet ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> xmlSecKeyDataIdsGet        (void);</pre>
+<a name="XMLSECKEYDATAIDSGET"></a><h3>xmlSecKeyDataIdsGet ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecKeyDataIdsGet                 (void);</pre>
 <p>Gets global registered key data klasses list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to list of all registered key data klasses.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6676"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to list of all registered key data klasses.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6972"></a><h3>
-<a name="XMLSECKEYDATAIDSINIT"></a>xmlSecKeyDataIdsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataIdsInit            (void);</pre>
+<a name="XMLSECKEYDATAIDSINIT"></a><h3>xmlSecKeyDataIdsInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsInit                (void);</pre>
 <p>Initializes the key data klasses. This function is called from the 
 <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function and the application should not call it directly.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN6984"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6692"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN6989"></a><h3>
-<a name="XMLSECKEYDATAIDSSHUTDOWN"></a>xmlSecKeyDataIdsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataIdsShutdown        (void);</pre>
+<a name="XMLSECKEYDATAIDSSHUTDOWN"></a><h3>xmlSecKeyDataIdsShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdsShutdown            (void);</pre>
 <p>Shuts down the keys data klasses. This function is called from the 
 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function and the application should not call it directly.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7000"></a><h3>
-<a name="XMLSECKEYDATAIDSREGISTERDEFAULT"></a>xmlSecKeyDataIdsRegisterDefault ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataIdsRegisterDefault (void);</pre>
+<a name="XMLSECKEYDATAIDSREGISTERDEFAULT"></a><h3>xmlSecKeyDataIdsRegisterDefault ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsRegisterDefault     (void);</pre>
 <p>Registers default (implemented by XML Security Library)
 key data klasses: <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> element processing klass, 
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> element processing klass, ...</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7012"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6718"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7017"></a><h3>
-<a name="XMLSECKEYDATAIDSREGISTER"></a>xmlSecKeyDataIdsRegister ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataIdsRegister        (<font>xmlSecKeyDataId</font> id);</pre>
-<p>Registers <var class="PARAMETER">id</var> in the global list of key data klasses.</p>
+<a name="XMLSECKEYDATAIDSREGISTER"></a><h3>xmlSecKeyDataIdsRegister ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdsRegister            (<font>xmlSecKeyDataId</font> id);</pre>
+<p>Registers <code class="PARAMETER">id</code> in the global list of key data klasses.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7029"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6734"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the key data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7034"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7039"></a><h3>
-<a name="XMLSECKEYDATA"></a>struct xmlSecKeyData</h3>
+<a name="XMLSECKEYDATA"></a><h3>struct xmlSecKeyData</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyData {
-
     xmlSecKeyDataId			id;
     void*				reserved0;
     void*				reserved1;
@@ -602,757 +553,722 @@ key data klasses: <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; targe
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7048"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">id</code></span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the data id (<font><span class="TYPE">xmlSecKeyDataId</span></font>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6752"><span style="white-space: nowrap"><font>xmlSecKeyDataId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the data id (<gtkdoclink href="XMLSECKEYDATAID"><span class="TYPE">xmlSecKeyDataId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7056"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6760"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7062"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6766"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7068"></a><h3>
-<a name="XMLSECKEYDATACREATE"></a>xmlSecKeyDataCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecKeyDataCreate        (<font>xmlSecKeyDataId</font> id);</pre>
-<p>Allocates and initializes new key data of the specified type <var class="PARAMETER">id</var>.
+<a name="XMLSECKEYDATACREATE"></a><h3>xmlSecKeyDataCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecKeyDataCreate                 (<font>xmlSecKeyDataId</font> id);</pre>
+<p>Allocates and initializes new key data of the specified type <code class="PARAMETER">id</code>.
 Caller is responsible for destroing returend object with 
 <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY"><span class="TYPE">xmlSecKeyDataDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7082"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6785"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7087"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated key data structure
+<td align="LEFT" valign="TOP"><a name="AEN6790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7092"></a><h3>
-<a name="XMLSECKEYDATADUPLICATE"></a>xmlSecKeyDataDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font> xmlSecKeyDataDuplicate     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Creates a duplicate of the given <var class="PARAMETER">data</var>. Caller is responsible for 
+<a name="XMLSECKEYDATADUPLICATE"></a><h3>xmlSecKeyDataDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataPtr</font>    xmlSecKeyDataDuplicate              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Creates a duplicate of the given <code class="PARAMETER">data</code>. Caller is responsible for 
 destroing returend object with <a href="xmlsec-keysdata.html#XMLSECKEYDATADESTROY"><span class="TYPE">xmlSecKeyDataDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7106"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6808"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7111"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated key data structure
+<td align="LEFT" valign="TOP"><a name="AEN6813"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7116"></a><h3>
-<a name="XMLSECKEYDATADESTROY"></a>xmlSecKeyDataDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataDestroy            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATADESTROY"></a><h3>xmlSecKeyDataDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDestroy                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Destroys the data and frees all allocated memory.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7127"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6828"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7132"></a><h3>
-<a name="XMLSECKEYDATAGENERATE"></a>xmlSecKeyDataGenerate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataGenerate           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECKEYDATAGENERATE"></a><h3>xmlSecKeyDataGenerate ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataGenerate               (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Generates new key data of given size and type.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7145"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6845"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7150"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6850"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the desired key data size (in bits).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7155"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6855"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7160"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6860"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7165"></a><h3>
-<a name="XMLSECKEYDATAGETTYPE"></a>xmlSecKeyDataGetType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> xmlSecKeyDataGetType      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETTYPE"></a><h3>xmlSecKeyDataGetType ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   xmlSecKeyDataGetType                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets key data type.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7176"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6875"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7181"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6880"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data type.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7186"></a><h3>
-<a name="XMLSECKEYDATAGETSIZE"></a>xmlSecKeyDataGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecKeyDataGetSize            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETSIZE"></a><h3>xmlSecKeyDataGetSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecKeyDataGetSize                (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets key data size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7197"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6895"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7202"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data size (in bits).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6900"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data size (in bits).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7207"></a><h3>
-<a name="XMLSECKEYDATAGETIDENTIFIER"></a>xmlSecKeyDataGetIdentifier ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>* xmlSecKeyDataGetIdentifier   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETIDENTIFIER"></a><h3>xmlSecKeyDataGetIdentifier ()</h3>
+<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecKeyDataGetIdentifier          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets key data identifier string.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7218"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6915"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data id string.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN6920"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data id string.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7228"></a><h3>
-<a name="XMLSECKEYDATADEBUGDUMP"></a>xmlSecKeyDataDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataDebugDump          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSECKEYDATADEBUGDUMP"></a><h3>xmlSecKeyDataDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDebugDump              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);</pre>
 <p>Prints key data debug info.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7240"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6936"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7245"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6941"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7250"></a><h3>
-<a name="XMLSECKEYDATADEBUGXMLDUMP"></a>xmlSecKeyDataDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataDebugXmlDump       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSECKEYDATADEBUGXMLDUMP"></a><h3>xmlSecKeyDataDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataDebugXmlDump           (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);</pre>
 <p>Prints key data debug info in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7262"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6957"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7267"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6962"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7272"></a><h3>
-<a name="XMLSECKEYDATAXMLREAD"></a>xmlSecKeyDataXmlRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataXmlRead            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads the key data of klass <var class="PARAMETER">id</var> from XML <var class="PARAMETER">node</var> and adds them to <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYDATAXMLREAD"></a><h3>xmlSecKeyDataXmlRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataXmlRead                (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads the key data of klass <code class="PARAMETER">id</code> from XML <code class="PARAMETER">node</code> and adds them to <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7289"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6983"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7294"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6988"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7299"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6993"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7304"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN6998"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7310"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7004"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7315"></a><h3>
-<a name="XMLSECKEYDATAXMLWRITE"></a>xmlSecKeyDataXmlWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataXmlWrite           (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Writes the key data of klass <var class="PARAMETER">id</var> from <var class="PARAMETER">key</var> to an XML <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECKEYDATAXMLWRITE"></a><h3>xmlSecKeyDataXmlWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataXmlWrite               (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Writes the key data of klass <code class="PARAMETER">id</code> from <code class="PARAMETER">key</code> to an XML <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7332"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7025"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7337"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7030"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7342"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7035"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7347"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7040"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7353"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7046"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7358"></a><h3>
-<a name="XMLSECKEYDATABINREAD"></a>xmlSecKeyDataBinRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinRead            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads the key data of klass <var class="PARAMETER">id</var> from binary buffer <var class="PARAMETER">buf</var> to <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYDATABINREAD"></a><h3>xmlSecKeyDataBinRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinRead                (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads the key data of klass <code class="PARAMETER">id</code> from binary buffer <code class="PARAMETER">buf</code> to <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7376"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7068"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7381"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7073"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7386"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7078"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7391"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7083"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7396"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7088"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7402"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7094"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7407"></a><h3>
-<a name="XMLSECKEYDATABINWRITE"></a>xmlSecKeyDataBinWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinWrite           (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Writes the key data of klass <var class="PARAMETER">id</var> from the <var class="PARAMETER">key</var> to a binary buffer <var class="PARAMETER">buf</var>.</p>
+<a name="XMLSECKEYDATABINWRITE"></a><h3>xmlSecKeyDataBinWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinWrite               (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Writes the key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> to a binary buffer <code class="PARAMETER">buf</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7425"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7116"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7430"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7121"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7435"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7126"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7440"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7131"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7445"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7136"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7451"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7142"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7456"></a><h3>
-<a name="XMLSECKEYDATAGETNAME"></a>xmlSecKeyDataGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataGetName(data)</pre>
+<a name="XMLSECKEYDATAGETNAME"></a><h3>xmlSecKeyDataGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataGetName(data)</pre>
 <p>Macro. Returns the key data name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7465"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7155"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7470"></a><h3>
-<a name="XMLSECKEYDATAISVALID"></a>xmlSecKeyDataIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataIsValid(data)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">data</var> is not NULL and <var class="PARAMETER">data</var>-&gt;id is not NULL
+<a name="XMLSECKEYDATAISVALID"></a><h3>xmlSecKeyDataIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataIsValid(data)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">data</code> is not NULL and <code class="PARAMETER">data</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7481"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7170"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7486"></a><h3>
-<a name="XMLSECKEYDATACHECKID"></a>xmlSecKeyDataCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataCheckId(data, dataId)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">data</var> is valid and <var class="PARAMETER">data</var>'s id is equal to <var class="PARAMETER">dataId</var>.</p>
+<a name="XMLSECKEYDATACHECKID"></a><h3>xmlSecKeyDataCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckId(data, dataId)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">data</code>'s id is equal to <code class="PARAMETER">dataId</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7498"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7186"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7503"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7191"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data Id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7508"></a><h3>
-<a name="XMLSECKEYDATACHECKUSAGE"></a>xmlSecKeyDataCheckUsage()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataCheckUsage(data, usg)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">data</var> is valid and could be used for <var class="PARAMETER">usg</var>.</p>
+<a name="XMLSECKEYDATACHECKUSAGE"></a><h3>xmlSecKeyDataCheckUsage()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckUsage(data, usg)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and could be used for <code class="PARAMETER">usg</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7519"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7206"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7524"><span style="white-space: nowrap"><var class="PARAMETER">usg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7211"><span style="white-space: nowrap"><code class="PARAMETER">usg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data usage.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7529"></a><h3>
-<a name="XMLSECKEYDATACHECKSIZE"></a>xmlSecKeyDataCheckSize()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataCheckSize(data, size)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">data</var> is valid and <var class="PARAMETER">data</var>'s object has at least <var class="PARAMETER">size</var> bytes.</p>
+<a name="XMLSECKEYDATACHECKSIZE"></a><h3>xmlSecKeyDataCheckSize()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataCheckSize(data, size)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">data</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7541"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7227"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7546"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7232"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7551"></a><h3>
-<a name="XMLSECKEYDATAIDUNKNOWN"></a>xmlSecKeyDataIdUnknown</h3>
+<a name="XMLSECKEYDATAIDUNKNOWN"></a><h3>xmlSecKeyDataIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataIdUnknown 			((xmlSecKeyDataId)NULL)</pre>
 <p>The "unknown" id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7559"></a><h3>
-<a name="XMLSECKEYDATAINITMETHOD"></a>xmlSecKeyDataInitMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataInitMethod)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAINITMETHOD"></a><h3>xmlSecKeyDataInitMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataInitMethod)          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Key data specific initialization method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7570"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7254"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7575"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7259"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7580"></a><h3>
-<a name="XMLSECKEYDATADUPLICATEMETHOD"></a>xmlSecKeyDataDuplicateMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataDuplicateMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<a name="XMLSECKEYDATADUPLICATEMETHOD"></a><h3>xmlSecKeyDataDuplicateMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataDuplicateMethod)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
 <p>Key data specific duplication (copy) method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7592"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7275"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to destination key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7597"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7280"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the poiniter to source key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7285"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7607"></a><h3>
-<a name="XMLSECKEYDATAFINALIZEMETHOD"></a>xmlSecKeyDataFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecKeyDataFinalizeMethod)  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAFINALIZEMETHOD"></a><h3>xmlSecKeyDataFinalizeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataFinalizeMethod)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Key data specific finalization method. All the objects and resources allocated
 by the key data object must be freed inside this method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN7618"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7300"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7623"></a><h3>
-<a name="XMLSECKEYDATAXMLREADMETHOD"></a>xmlSecKeyDataXmlReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataXmlReadMethod)   (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYDATAXMLREADMETHOD"></a><h3>xmlSecKeyDataXmlReadMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataXmlReadMethod)       (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Key data specific method for reading XML node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7637"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7318"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7642"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7323"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7647"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7328"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data's value XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7652"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7333"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7658"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7339"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7663"></a><h3>
-<a name="XMLSECKEYDATAXMLWRITEMETHOD"></a>xmlSecKeyDataXmlWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataXmlWriteMethod)  (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYDATAXMLWRITEMETHOD"></a><h3>xmlSecKeyDataXmlWriteMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataXmlWriteMethod)      (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Key data specific method for writing XML node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7677"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7357"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7682"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7362"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7687"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7367"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to data's value XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7692"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7372"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the &lt;dsig:KeyInfo&gt; node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7697"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7377"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7702"></a><h3>
-<a name="XMLSECKEYDATABINREADMETHOD"></a>xmlSecKeyDataBinReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataBinReadMethod)   (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYDATABINREADMETHOD"></a><h3>xmlSecKeyDataBinReadMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataBinReadMethod)       (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Key data specific method for reading binary buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7717"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7396"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7722"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7401"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7727"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7406"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7732"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7411"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7737"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7416"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7743"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7422"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7748"></a><h3>
-<a name="XMLSECKEYDATABINWRITEMETHOD"></a>xmlSecKeyDataBinWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataBinWriteMethod)  (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYDATABINWRITEMETHOD"></a><h3>xmlSecKeyDataBinWriteMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataBinWriteMethod)      (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Key data specific method for reading binary buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7763"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7441"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7768"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7446"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7773"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7451"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7778"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7456"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7783"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7461"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7789"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7794"></a><h3>
-<a name="XMLSECKEYDATAGENERATEMETHOD"></a>xmlSecKeyDataGenerateMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataGenerateMethod)  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECKEYDATAGENERATEMETHOD"></a><h3>xmlSecKeyDataGenerateMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataGenerateMethod)      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> sizeBits,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Key data specific method for generating new key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7807"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7484"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7812"><span style="white-space: nowrap"><var class="PARAMETER">sizeBits</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7489"><span style="white-space: nowrap"><code class="PARAMETER">sizeBits</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key data specific size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7817"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7494"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the required key type (session/permanent, etc.)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7822"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7499"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7827"></a><h3>
-<a name="XMLSECKEYDATAGETTYPEMETHOD"></a>xmlSecKeyDataGetTypeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> (*xmlSecKeyDataGetTypeMethod)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETTYPEMETHOD"></a><h3>xmlSecKeyDataGetTypeMethod ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a>   (*xmlSecKeyDataGetTypeMethod)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Key data specific method to get the key type.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7838"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7514"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		 the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7843"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the key type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7519"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the key type.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7848"></a><h3>
-<a name="XMLSECKEYDATAGETSIZEMETHOD"></a>xmlSecKeyDataGetSizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  (*xmlSecKeyDataGetSizeMethod)   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETSIZEMETHOD"></a><h3>xmlSecKeyDataGetSizeMethod ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          (*xmlSecKeyDataGetSizeMethod)       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Key data specific method to get the key size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7859"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7534"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7864"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the key size in bits.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the key size in bits.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7869"></a><h3>
-<a name="XMLSECKEYDATAGETIDENTIFIERMETHOD"></a>xmlSecKeyDataGetIdentifierMethod ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>* (*xmlSecKeyDataGetIdentifierMethod)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATAGETIDENTIFIERMETHOD"></a><h3>xmlSecKeyDataGetIdentifierMethod ()</h3>
+<pre class="PROGRAMLISTING">const <font>xmlChar</font> *     (*xmlSecKeyDataGetIdentifierMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Key data specific method to get the key data identifier string (for example,
 X509 data identifier is the subject of the verified cert).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7880"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7554"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7885"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the identifier string or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7559"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the identifier string or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7890"></a><h3>
-<a name="XMLSECKEYDATADEBUGDUMPMETHOD"></a>xmlSecKeyDataDebugDumpMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecKeyDataDebugDumpMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSECKEYDATADEBUGDUMPMETHOD"></a><h3>xmlSecKeyDataDebugDumpMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataDebugDumpMethod)     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);</pre>
 <p>Key data specific method for printing debug info.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7902"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7575"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7907"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7580"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the FILE to print debug info (should be open for writing).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN7912"></a><h3>
-<a name="XMLSECKEYDATAKLASS"></a>struct xmlSecKeyDataKlass</h3>
+<a name="XMLSECKEYDATAKLASS"></a><h3>struct xmlSecKeyDataKlass</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyDataKlass {
-
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -1393,644 +1309,607 @@ X509 data identifier is the subject of the verified cert).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7921"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7593"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7927"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7599"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the object size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7933"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7605"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the object name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7939"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> <code class="STRUCTFIELD">usage</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7611"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the allowed data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7945"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7617"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the identification string (href).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7951"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeName</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7623"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeName</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the data's XML node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7957"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeNs</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7629"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">dataNodeNs</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data's XML node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7963"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">xmlSecKeyDataInitMethod</a> <code class="STRUCTFIELD">initialize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7635"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAINITMETHOD">xmlSecKeyDataInitMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the initialization method.  </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7969"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">xmlSecKeyDataDuplicateMethod</a> <code class="STRUCTFIELD">duplicate</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7641"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADUPLICATEMETHOD">xmlSecKeyDataDuplicateMethod</a> <code class="STRUCTFIELD">duplicate</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the duplicate (copy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7975"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">xmlSecKeyDataFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7647"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAFINALIZEMETHOD">xmlSecKeyDataFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7981"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">xmlSecKeyDataGenerateMethod</a> <code class="STRUCTFIELD">generate</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7653"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGENERATEMETHOD">xmlSecKeyDataGenerateMethod</a> <code class="STRUCTFIELD">generate</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the new data generation method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7987"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">xmlSecKeyDataGetTypeMethod</a> <code class="STRUCTFIELD">getType</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7659"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETTYPEMETHOD">xmlSecKeyDataGetTypeMethod</a> <code class="STRUCTFIELD">getType</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method to access data's type information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7993"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">xmlSecKeyDataGetSizeMethod</a> <code class="STRUCTFIELD">getSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7665"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETSIZEMETHOD">xmlSecKeyDataGetSizeMethod</a> <code class="STRUCTFIELD">getSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method to access data's size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN7999"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">xmlSecKeyDataGetIdentifierMethod</a> <code class="STRUCTFIELD">getIdentifier</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7671"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAGETIDENTIFIERMETHOD">xmlSecKeyDataGetIdentifierMethod</a> <code class="STRUCTFIELD">getIdentifier</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the method to access data's string identifier.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8005"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">xmlSecKeyDataXmlReadMethod</a> <code class="STRUCTFIELD">xmlRead</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7677"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLREADMETHOD">xmlSecKeyDataXmlReadMethod</a> <code class="STRUCTFIELD">xmlRead</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method for reading data from XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8011"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">xmlSecKeyDataXmlWriteMethod</a> <code class="STRUCTFIELD">xmlWrite</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7683"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATAXMLWRITEMETHOD">xmlSecKeyDataXmlWriteMethod</a> <code class="STRUCTFIELD">xmlWrite</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method for writing data to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8017"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">xmlSecKeyDataBinReadMethod</a> <code class="STRUCTFIELD">binRead</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7689"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINREADMETHOD">xmlSecKeyDataBinReadMethod</a> <code class="STRUCTFIELD">binRead</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method for reading data from a binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8023"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">xmlSecKeyDataBinWriteMethod</a> <code class="STRUCTFIELD">binWrite</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7695"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATABINWRITEMETHOD">xmlSecKeyDataBinWriteMethod</a> <code class="STRUCTFIELD">binWrite</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the method for writing data to binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8029"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugDump</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7701"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugDump</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the method for printing debug data information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8035"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugXmlDump</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7707"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATADEBUGDUMPMETHOD">xmlSecKeyDataDebugDumpMethod</a> <code class="STRUCTFIELD">debugXmlDump</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the method for printing debug data information in XML format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8041"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7713"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8047"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7719"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8053"></a><h3>
-<a name="XMLSECKEYDATAKLASSGETNAME"></a>xmlSecKeyDataKlassGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataKlassGetName(klass)</pre>
+<a name="XMLSECKEYDATAKLASSGETNAME"></a><h3>xmlSecKeyDataKlassGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataKlassGetName(klass)</pre>
 <p>Macro. Returns data klass name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8062"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7733"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8067"></a><h3>
-<a name="XMLSECKEYDATALISTID"></a>xmlSecKeyDataListId</h3>
+<a name="XMLSECKEYDATALISTID"></a><h3>xmlSecKeyDataListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataListId	xmlSecKeyDataListGetKlass()</pre>
 <p>The key data klasses list klass id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8075"></a><h3>
-<a name="XMLSECKEYDATALISTGETKLASS"></a>xmlSecKeyDataListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecKeyDataListGetKlass   (void);</pre>
+<a name="XMLSECKEYDATALISTGETKLASS"></a><h3>xmlSecKeyDataListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataListGetKlass           (void);</pre>
 <p>The key data list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8085"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key data list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7754"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key data list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8090"></a><h3>
-<a name="XMLSECKEYDATAIDLISTID"></a>xmlSecKeyDataIdListId</h3>
+<a name="XMLSECKEYDATAIDLISTID"></a><h3>xmlSecKeyDataIdListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataIdListId	xmlSecKeyDataIdListGetKlass()</pre>
 <p>The key data list klass id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8098"></a><h3>
-<a name="XMLSECKEYDATAIDLISTGETKLASS"></a>xmlSecKeyDataIdListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecKeyDataIdListGetKlass (void);</pre>
+<a name="XMLSECKEYDATAIDLISTGETKLASS"></a><h3>xmlSecKeyDataIdListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataIdListGetKlass         (void);</pre>
 <p>The key data id list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key data id list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7775"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key data id list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8113"></a><h3>
-<a name="XMLSECKEYDATAIDLISTFIND"></a>xmlSecKeyDataIdListFind ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataIdListFind         (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecKeyDataId</font> dataId);</pre>
-<p>Lookups <var class="PARAMETER">dataId</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECKEYDATAIDLISTFIND"></a><h3>xmlSecKeyDataIdListFind ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataIdListFind             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecKeyDataId</font> dataId);</pre>
+<p>Lookups <code class="PARAMETER">dataId</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8127"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7793"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8132"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7798"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if <var class="PARAMETER">dataId</var> is found in the <var class="PARAMETER">list</var>, 0 if not and a negative
+<td align="LEFT" valign="TOP"><a name="AEN7803"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">dataId</code> is found in the <code class="PARAMETER">list</code>, 0 if not and a negative
 value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8144"></a><h3>
-<a name="XMLSECKEYDATAIDLISTFINDBYNODE"></a>xmlSecKeyDataIdListFindByNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataIdListFindByNode
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
-<p>Lookups data klass in the list with given <var class="PARAMETER">nodeName</var>, <var class="PARAMETER">nodeNs</var> and 
-<var class="PARAMETER">usage</var> in the <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECKEYDATAIDLISTFINDBYNODE"></a><h3>xmlSecKeyDataIdListFindByNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByNode       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<p>Lookups data klass in the list with given <code class="PARAMETER">nodeName</code>, <code class="PARAMETER">nodeNs</code> and 
+<code class="PARAMETER">usage</code> in the <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8162"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7827"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8167"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7832"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data klass XML node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8172"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7837"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data klass XML node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8177"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7842"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8182"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data klass is found and NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7847"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8187"></a><h3>
-<a name="XMLSECKEYDATAIDLISTFINDBYHREF"></a>xmlSecKeyDataIdListFindByHref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataIdListFindByHref
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *href,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
-<p>Lookups data klass in the list with given <var class="PARAMETER">href</var> and <var class="PARAMETER">usage</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECKEYDATAIDLISTFINDBYHREF"></a><h3>xmlSecKeyDataIdListFindByHref ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByHref       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *href,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<p>Lookups data klass in the list with given <code class="PARAMETER">href</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8203"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7867"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8208"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7872"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data klass href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8213"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7877"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8218"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data klass is found and NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8223"></a><h3>
-<a name="XMLSECKEYDATAIDLISTFINDBYNAME"></a>xmlSecKeyDataIdListFindByName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecKeyDataIdListFindByName
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
-<p>Lookups data klass in the list with given <var class="PARAMETER">name</var> and <var class="PARAMETER">usage</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECKEYDATAIDLISTFINDBYNAME"></a><h3>xmlSecKeyDataIdListFindByName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecKeyDataIdListFindByName       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAUSAGE">xmlSecKeyDataUsage</a> usage);</pre>
+<p>Lookups data klass in the list with given <code class="PARAMETER">name</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8239"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7902"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8244"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7907"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8249"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7912"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key data usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8254"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data klass is found and NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7917"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8259"></a><h3>
-<a name="XMLSECKEYDATAIDLISTDEBUGDUMP"></a>xmlSecKeyDataIdListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataIdListDebugDump    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary key data debug information to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYDATAIDLISTDEBUGDUMP"></a><h3>xmlSecKeyDataIdListDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdListDebugDump        (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary key data debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8272"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7934"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8277"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7939"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8282"></a><h3>
-<a name="XMLSECKEYDATAIDLISTDEBUGXMLDUMP"></a>xmlSecKeyDataIdListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataIdListDebugXmlDump (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary key data debug information to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECKEYDATAIDLISTDEBUGXMLDUMP"></a><h3>xmlSecKeyDataIdListDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataIdListDebugXmlDump     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary key data debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8295"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7956"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key data ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8300"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7961"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8305"></a><h3>
-<a name="XMLSECKEYDATABINARYSIZE"></a>xmlSecKeyDataBinarySize</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataBinarySize</pre>
+<a name="XMLSECKEYDATABINARYSIZE"></a><h3>xmlSecKeyDataBinarySize</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataBinarySize</pre>
 <p>The binary key data object size.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8313"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEINITIALIZE"></a>xmlSecKeyDataBinaryValueInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueInitialize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATABINARYVALUEINITIALIZE"></a><h3>xmlSecKeyDataBinaryValueInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueInitialize  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Initializes key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8324"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN7983"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8329"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN7988"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8334"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEDUPLICATE"></a>xmlSecKeyDataBinaryValueDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueDuplicate
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
-<p>Copies binary key data from <var class="PARAMETER">src</var> to <var class="PARAMETER">dst</var>.</p>
+<a name="XMLSECKEYDATABINARYVALUEDUPLICATE"></a><h3>xmlSecKeyDataBinaryValueDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueDuplicate   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<p>Copies binary key data from <code class="PARAMETER">src</code> to <code class="PARAMETER">dst</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8348"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8006"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to destination binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8353"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8011"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to source binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8358"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8016"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8363"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEFINALIZE"></a>xmlSecKeyDataBinaryValueFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataBinaryValueFinalize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATABINARYVALUEFINALIZE"></a><h3>xmlSecKeyDataBinaryValueFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueFinalize    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Cleans up binary key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8374"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8031"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8379"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEXMLREAD"></a>xmlSecKeyDataBinaryValueXmlRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueXmlRead (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads binary key data from <var class="PARAMETER">node</var> to the key by base64 decoding the <var class="PARAMETER">node</var> content.</p>
+<a name="XMLSECKEYDATABINARYVALUEXMLREAD"></a><h3>xmlSecKeyDataBinaryValueXmlRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueXmlRead     (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads binary key data from <code class="PARAMETER">node</code> to the key by base64 decoding the <code class="PARAMETER">node</code> content.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8395"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8051"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8400"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8056"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8405"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8061"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8410"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8066"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8072"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8421"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEXMLWRITE"></a>xmlSecKeyDataBinaryValueXmlWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueXmlWrite
-                                            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Base64 encodes binary key data of klass <var class="PARAMETER">id</var> from the <var class="PARAMETER">key</var> and 
-sets to the <var class="PARAMETER">node</var> content.</p>
+<a name="XMLSECKEYDATABINARYVALUEXMLWRITE"></a><h3>xmlSecKeyDataBinaryValueXmlWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueXmlWrite    (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Base64 encodes binary key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> and 
+sets to the <code class="PARAMETER">node</code> content.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8438"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8093"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8443"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8098"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8448"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8103"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8453"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8108"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8459"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8464"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEBINREAD"></a>xmlSecKeyDataBinaryValueBinRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueBinRead (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads binary key data of the klass <var class="PARAMETER">id</var> from <var class="PARAMETER">buf</var> to the <var class="PARAMETER">key</var>.</p>
+<a name="XMLSECKEYDATABINARYVALUEBINREAD"></a><h3>xmlSecKeyDataBinaryValueBinRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueBinRead     (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads binary key data of the klass <code class="PARAMETER">id</code> from <code class="PARAMETER">buf</code> to the <code class="PARAMETER">key</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8482"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8136"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8487"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8141"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8492"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8146"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8497"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8151"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8502"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8156"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8508"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8162"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8513"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEBINWRITE"></a>xmlSecKeyDataBinaryValueBinWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueBinWrite
-                                            (<font>xmlSecKeyDataId</font> id,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Writes binary key data of klass <var class="PARAMETER">id</var> from the <var class="PARAMETER">key</var> to <var class="PARAMETER">buf</var>.</p>
+<a name="XMLSECKEYDATABINARYVALUEBINWRITE"></a><h3>xmlSecKeyDataBinaryValueBinWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueBinWrite    (<font>xmlSecKeyDataId</font> id,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> **buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *bufSize,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Writes binary key data of klass <code class="PARAMETER">id</code> from the <code class="PARAMETER">key</code> to <code class="PARAMETER">buf</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8531"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8184"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8536"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8189"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8541"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8194"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8546"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8199"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8551"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8204"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8557"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8210"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8562"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEDEBUGDUMP"></a>xmlSecKeyDataBinaryValueDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataBinaryValueDebugDump
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary key data debug information to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECKEYDATABINARYVALUEDEBUGDUMP"></a><h3>xmlSecKeyDataBinaryValueDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueDebugDump   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary key data debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8575"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8227"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8580"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8232"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8585"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP"></a>xmlSecKeyDataBinaryValueDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataBinaryValueDebugXmlDump
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary key data debug information to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECKEYDATABINARYVALUEDEBUGXMLDUMP"></a><h3>xmlSecKeyDataBinaryValueDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataBinaryValueDebugXmlDump
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary key data debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8598"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8249"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8603"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8254"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8608"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEGETSIZE"></a>xmlSecKeyDataBinaryValueGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecKeyDataBinaryValueGetSize (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATABINARYVALUEGETSIZE"></a><h3>xmlSecKeyDataBinaryValueGetSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecKeyDataBinaryValueGetSize     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the binary key data size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8619"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8269"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8624"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>binary key data size in bits.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> binary key data size in bits.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8629"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUEGETBUFFER"></a>xmlSecKeyDataBinaryValueGetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> xmlSecKeyDataBinaryValueGetBuffer
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECKEYDATABINARYVALUEGETBUFFER"></a><h3>xmlSecKeyDataBinaryValueGetBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecKeyDataBinaryValueGetBuffer   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the binary key data buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8640"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8289"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8645"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to binary key data buffer.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8294"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to binary key data buffer.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8650"></a><h3>
-<a name="XMLSECKEYDATABINARYVALUESETBUFFER"></a>xmlSecKeyDataBinaryValueSetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeyDataBinaryValueSetBuffer
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
-<p>Sets the value of <var class="PARAMETER">data</var> to <var class="PARAMETER">buf</var>.</p>
+<a name="XMLSECKEYDATABINARYVALUESETBUFFER"></a><h3>xmlSecKeyDataBinaryValueSetBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeyDataBinaryValueSetBuffer   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<p>Sets the value of <code class="PARAMETER">data</code> to <code class="PARAMETER">buf</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8665"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8313"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8670"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8318"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8675"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8323"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8680"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8328"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8685"></a><h3>
-<a name="XMLSECKEYDATASTORE"></a>struct xmlSecKeyDataStore</h3>
+<a name="XMLSECKEYDATASTORE"></a><h3>struct xmlSecKeyDataStore</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyDataStore {
-
     xmlSecKeyDataStoreId		id;
 
     /* for the future */
@@ -2044,168 +1923,155 @@ information about trusted (root) certificates.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8694"><span style="white-space: nowrap"><font>xmlSecKeyDataStoreId</font> <code class="STRUCTFIELD">id</code></span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the store id (<font><span class="TYPE">xmlSecKeyDataStoreId</span></font>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8341"><span style="white-space: nowrap"><font>xmlSecKeyDataStoreId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the store id (<gtkdoclink href="XMLSECKEYDATASTOREID"><span class="TYPE">xmlSecKeyDataStoreId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8702"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8349"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8708"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8355"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8714"></a><h3>
-<a name="XMLSECKEYDATASTORECREATE"></a>xmlSecKeyDataStoreCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> xmlSecKeyDataStoreCreate
-                                            (<font>xmlSecKeyDataStoreId</font> id);</pre>
-<p>Creates new key data store of the specified klass <var class="PARAMETER">id</var>. Caller is responsible
+<a name="XMLSECKEYDATASTORECREATE"></a><h3>xmlSecKeyDataStoreCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a>  xmlSecKeyDataStoreCreate         (<font>xmlSecKeyDataStoreId</font> id);</pre>
+<p>Creates new key data store of the specified klass <code class="PARAMETER">id</code>. Caller is responsible
 for freeng returned object with <a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREDESTROY"><span class="TYPE">xmlSecKeyDataStoreDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8728"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8374"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8733"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated key data store structure
+<td align="LEFT" valign="TOP"><a name="AEN8379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated key data store structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8738"></a><h3>
-<a name="XMLSECKEYDATASTOREDESTROY"></a>xmlSecKeyDataStoreDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyDataStoreDestroy       (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<a name="XMLSECKEYDATASTOREDESTROY"></a><h3>xmlSecKeyDataStoreDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyDataStoreDestroy           (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
 <p>Destroys the key data store created with <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORECREATE"><span class="TYPE">xmlSecKeyDataStoreCreate</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8751"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8396"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the key data store..</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8756"></a><h3>
-<a name="XMLSECKEYDATASTOREGETNAME"></a>xmlSecKeyDataStoreGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataStoreGetName(store)</pre>
+<a name="XMLSECKEYDATASTOREGETNAME"></a><h3>xmlSecKeyDataStoreGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreGetName(store)</pre>
 <p>Macro. Returns key data store name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8765"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8409"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8770"></a><h3>
-<a name="XMLSECKEYDATASTOREISVALID"></a>xmlSecKeyDataStoreIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataStoreIsValid(store)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">store</var> is not NULL and <var class="PARAMETER">store</var>-&gt;id is not NULL
+<a name="XMLSECKEYDATASTOREISVALID"></a><h3>xmlSecKeyDataStoreIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreIsValid(store)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">store</code> is not NULL and <code class="PARAMETER">store</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8781"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8424"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8786"></a><h3>
-<a name="XMLSECKEYDATASTORECHECKID"></a>xmlSecKeyDataStoreCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataStoreCheckId(store, storeId)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">store</var> is valid and <var class="PARAMETER">store</var>'s id is equal to <var class="PARAMETER">storeId</var>.</p>
+<a name="XMLSECKEYDATASTORECHECKID"></a><h3>xmlSecKeyDataStoreCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreCheckId(store, storeId)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">store</code>'s id is equal to <code class="PARAMETER">storeId</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8798"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8440"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8803"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8445"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store Id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8808"></a><h3>
-<a name="XMLSECKEYDATASTORECHECKSIZE"></a>xmlSecKeyDataStoreCheckSize()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataStoreCheckSize(store, size)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">data</var> is valid and <var class="PARAMETER">stores</var>'s object has at least <var class="PARAMETER">size</var> bytes.</p>
+<a name="XMLSECKEYDATASTORECHECKSIZE"></a><h3>xmlSecKeyDataStoreCheckSize()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreCheckSize(store, size)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">data</code> is valid and <code class="PARAMETER">stores</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8820"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8461"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8825"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8466"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8830"></a><h3>
-<a name="XMLSECKEYDATASTOREIDUNKNOWN"></a>xmlSecKeyDataStoreIdUnknown</h3>
+<a name="XMLSECKEYDATASTOREIDUNKNOWN"></a><h3>xmlSecKeyDataStoreIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataStoreIdUnknown 			NULL</pre>
 <p>The "unknown" id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8838"></a><h3>
-<a name="XMLSECKEYDATASTOREINITIALIZEMETHOD"></a>xmlSecKeyDataStoreInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyDataStoreInitializeMethod)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<a name="XMLSECKEYDATASTOREINITIALIZEMETHOD"></a><h3>xmlSecKeyDataStoreInitializeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyDataStoreInitializeMethod)
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
 <p>Key data store specific initialization method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8849"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8488"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8854"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8493"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8859"></a><h3>
-<a name="XMLSECKEYDATASTOREFINALIZEMETHOD"></a>xmlSecKeyDataStoreFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecKeyDataStoreFinalizeMethod)
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<a name="XMLSECKEYDATASTOREFINALIZEMETHOD"></a><h3>xmlSecKeyDataStoreFinalizeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyDataStoreFinalizeMethod) (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
 <p>Key data store specific finalization (destroy) method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8870"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8508"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the data store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8875"></a><h3>
-<a name="XMLSECKEYDATASTOREKLASS"></a>struct xmlSecKeyDataStoreKlass</h3>
+<a name="XMLSECKEYDATASTOREKLASS"></a><h3>struct xmlSecKeyDataStoreKlass</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyDataStoreKlass {
-
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -2225,74 +2091,70 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8884"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8521"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data store klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8890"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8527"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data store obj size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8896"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8533"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8902"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">xmlSecKeyDataStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8539"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREINITIALIZEMETHOD">xmlSecKeyDataStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8908"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">xmlSecKeyDataStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8545"><span style="white-space: nowrap"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTOREFINALIZEMETHOD">xmlSecKeyDataStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8914"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8551"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN8920"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8557"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8926"></a><h3>
-<a name="XMLSECKEYDATASTOREKLASSGETNAME"></a>xmlSecKeyDataStoreKlassGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyDataStoreKlassGetName(klass)</pre>
+<a name="XMLSECKEYDATASTOREKLASSGETNAME"></a><h3>xmlSecKeyDataStoreKlassGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyDataStoreKlassGetName(klass)</pre>
 <p>Macro. Returns store klass name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8935"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN8571"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8940"></a><h3>
-<a name="XMLSECKEYDATASTOREPTRLISTID"></a>xmlSecKeyDataStorePtrListId</h3>
+<a name="XMLSECKEYDATASTOREPTRLISTID"></a><h3>xmlSecKeyDataStorePtrListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyDataStorePtrListId	xmlSecKeyDataStorePtrListGetKlass()</pre>
 <p>The data store list id (klass).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN8948"></a><h3>
-<a name="XMLSECKEYDATASTOREPTRLISTGETKLASS"></a>xmlSecKeyDataStorePtrListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecKeyDataStorePtrListGetKlass
-                                            (void);</pre>
+<a name="XMLSECKEYDATASTOREPTRLISTGETKLASS"></a><h3>xmlSecKeyDataStorePtrListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecKeyDataStorePtrListGetKlass   (void);</pre>
 <p>Key data stores list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN8958"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>key data stores list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN8592"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> key data stores list klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keyinfo.html"><b>&lt;&lt;&lt;keyinfo</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-keys.html"><b>keys&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keyinfo.html"><b>&lt;&lt;&lt; keyinfo</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-keys.html"><b>keys &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-keysmngr.html b/docs/api/xmlsec-keysmngr.html
index 5376a8c..7c5314b 100644
--- a/docs/api/xmlsec-keysmngr.html
+++ b/docs/api/xmlsec-keysmngr.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keysmngr</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="keys" href="xmlsec-keys.html">
 <link rel="NEXT" title="list" href="xmlsec-list.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,252 +87,233 @@
 <h1>
 <a name="XMLSEC-KEYSMNGR"></a>keysmngr</h1>
 <div class="REFNAMEDIV">
-<a name="AEN10413"></a><h2>Name</h2>keysmngr--Keys manager object support.</div>
+<a name="AEN9992"></a><h2>Name</h2>keysmngr -- Keys manager object support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN10416"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE">xmlSecKeysMngrCreate</a>      (void);
-<font>void</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY">xmlSecKeysMngrDestroy</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>xmlSecKeyPtr</font> <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRFINDKEY">xmlSecKeysMngrFindKey</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-<font>int</font>         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTKEYSSTORE">xmlSecKeysMngrAdoptKeysStore</a>    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEYSSTORE">xmlSecKeysMngrGetKeysStore</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTDATASTORE">xmlSecKeysMngrAdoptDataStore</a>    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETDATASTORE">xmlSecKeysMngrGetDataStore</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>xmlSecKeyDataStoreId</font> id);
-<font>xmlSecKeyPtr</font> (<a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">*xmlSecGetKeyCallback</a>)        (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-struct      <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngr</a>;
-<font>xmlSecKeyPtr</font> <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEY">xmlSecKeysMngrGetKey</a>           (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-struct      <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStore</a>;
-<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE">xmlSecKeyStoreCreate</a>      (<font>xmlSecKeyStoreId</font> id);
-<font>void</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY">xmlSecKeyStoreDestroy</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>xmlSecKeyPtr</font> <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEY">xmlSecKeyStoreFindKey</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREGETNAME">xmlSecKeyStoreGetName</a>           (store)
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREISVALID">xmlSecKeyStoreIsValid</a>           (store)
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKID">xmlSecKeyStoreCheckId</a>           (store, storeId)
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKSIZE">xmlSecKeyStoreCheckSize</a>         (store, size)
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREIDUNKNOWN">xmlSecKeyStoreIdUnknown</a>
-<font>int</font>         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">*xmlSecKeyStoreInitializeMethod</a>)
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>void</font>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">*xmlSecKeyStoreFinalizeMethod</a>) (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
-<font>xmlSecKeyPtr</font> (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">*xmlSecKeyStoreFindKeyMethod</a>) (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
-struct      <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASS">xmlSecKeyStoreKlass</a>;
-#define     <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASSGETNAME">xmlSecKeyStoreKlassGetName</a>      (klass)
-#define     <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID">xmlSecSimpleKeysStoreId</a>
-<font>xmlSecKeyStoreId</font> <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKLASS">xmlSecSimpleKeysStoreGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREADOPTKEY">xmlSecSimpleKeysStoreAdoptKey</a>   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORELOAD">xmlSecSimpleKeysStoreLoad</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>         <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORESAVE">xmlSecSimpleKeysStoreSave</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKEYS">xmlSecSimpleKeysStoreGetKeys</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<a name="XMLSEC-KEYSMNGR.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE">xmlSecKeysMngrCreate</a>                (void);
+<font>void</font>                <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY">xmlSecKeysMngrDestroy</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRFINDKEY">xmlSecKeysMngrFindKey</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTKEYSSTORE">xmlSecKeysMngrAdoptKeysStore</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
+<font>xmlSecKeyStorePtr</font>   <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEYSSTORE">xmlSecKeysMngrGetKeysStore</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRADOPTDATASTORE">xmlSecKeysMngrAdoptDataStore</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);
+<font>xmlSecKeyDataStorePtr</font>  <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETDATASTORE">xmlSecKeysMngrGetDataStore</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>xmlSecKeyDataStoreId</font> id);
+<font>xmlSecKeyPtr</font>        (<a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">*xmlSecGetKeyCallback</a>)             (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngr</a>;
+<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRGETKEY">xmlSecKeysMngrGetKey</a>                (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStore</a>;
+<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a>   <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE">xmlSecKeyStoreCreate</a>                (<font>xmlSecKeyStoreId</font> id);
+<font>void</font>                <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY">xmlSecKeyStoreDestroy</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
+<font>xmlSecKeyPtr</font>        <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEY">xmlSecKeyStoreFindKey</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREGETNAME">xmlSecKeyStoreGetName</a>               (store)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREISVALID">xmlSecKeyStoreIsValid</a>               (store)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKID">xmlSecKeyStoreCheckId</a>               (store, storeId)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECHECKSIZE">xmlSecKeyStoreCheckSize</a>             (store, size)
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREIDUNKNOWN">xmlSecKeyStoreIdUnknown</a>
+<font>int</font>                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">*xmlSecKeyStoreInitializeMethod</a>)   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
+<font>void</font>                (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">*xmlSecKeyStoreFinalizeMethod</a>)     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);
+<font>xmlSecKeyPtr</font>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">*xmlSecKeyStoreFindKeyMethod</a>)      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);
+struct              <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASS">xmlSecKeyStoreKlass</a>;
+#define             <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREKLASSGETNAME">xmlSecKeyStoreKlassGetName</a>          (klass)
+#define             <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID">xmlSecSimpleKeysStoreId</a>
+<font>xmlSecKeyStoreId</font>    <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKLASS">xmlSecSimpleKeysStoreGetKlass</a>       (void);
+<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREADOPTKEY">xmlSecSimpleKeysStoreAdoptKey</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORELOAD">xmlSecSimpleKeysStoreLoad</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>int</font>                 <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTORESAVE">xmlSecSimpleKeysStoreSave</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>xmlSecPtrListPtr</font>    <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREGETKEYS">xmlSecSimpleKeysStoreGetKeys</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN10503"></a><h2>Description</h2>
+<a name="XMLSEC-KEYSMNGR.DESCRIPTION"></a><h2>Description</h2>
 <p>Keys manager object support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN10506"></a><h2>Details</h2>
+<a name="XMLSEC-KEYSMNGR.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN10508"></a><h3>
-<a name="XMLSECKEYSMNGRCREATE"></a>xmlSecKeysMngrCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> xmlSecKeysMngrCreate      (void);</pre>
+<a name="XMLSECKEYSMNGRCREATE"></a><h3>xmlSecKeysMngrCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a>   xmlSecKeysMngrCreate                (void);</pre>
 <p>Creates new keys manager. Caller is responsible for freeing it with 
 <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRDESTROY"><span class="TYPE">xmlSecKeysMngrDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10520"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated keys manager or NULL if 
+<td align="LEFT" valign="TOP"><a name="AEN10098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated keys manager or NULL if 
 an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10525"></a><h3>
-<a name="XMLSECKEYSMNGRDESTROY"></a>xmlSecKeysMngrDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeysMngrDestroy           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECKEYSMNGRDESTROY"></a><h3>xmlSecKeysMngrDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeysMngrDestroy               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Destroys keys manager created with <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGRCREATE"><span class="TYPE">xmlSecKeysMngrCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10538"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10115"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10543"></a><h3>
-<a name="XMLSECKEYSMNGRFINDKEY"></a>xmlSecKeysMngrFindKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> xmlSecKeysMngrFindKey          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYSMNGRFINDKEY"></a><h3>xmlSecKeysMngrFindKey ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeysMngrFindKey               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Lookups key in the keys manager keys store. The caller is responsible 
 for destroying the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10558"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10134"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10563"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10139"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10568"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10144"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to a key or NULL if key is not found or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10150"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10579"></a><h3>
-<a name="XMLSECKEYSMNGRADOPTKEYSSTORE"></a>xmlSecKeysMngrAdoptKeysStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeysMngrAdoptKeysStore    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
-<p>Adopts keys store in the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECKEYSMNGRADOPTKEYSSTORE"></a><h3>xmlSecKeysMngrAdoptKeysStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeysMngrAdoptKeysStore        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<p>Adopts keys store in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10592"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10167"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10597"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10172"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10177"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10607"></a><h3>
-<a name="XMLSECKEYSMNGRGETKEYSSTORE"></a>xmlSecKeysMngrGetKeysStore ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> xmlSecKeysMngrGetKeysStore
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECKEYSMNGRGETKEYSSTORE"></a><h3>xmlSecKeysMngrGetKeysStore ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyStorePtr</font>   xmlSecKeysMngrGetKeysStore          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Gets the keys store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10618"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10192"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10623"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the keys store in the keys manager <var class="PARAMETER">mngr</var> or NULL if 
+<td align="LEFT" valign="TOP"><a name="AEN10197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the keys store in the keys manager <code class="PARAMETER">mngr</code> or NULL if 
 there is no store or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10629"></a><h3>
-<a name="XMLSECKEYSMNGRADOPTDATASTORE"></a>xmlSecKeysMngrAdoptDataStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecKeysMngrAdoptDataStore    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
+<a name="XMLSECKEYSMNGRADOPTDATASTORE"></a><h3>xmlSecKeysMngrAdoptDataStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecKeysMngrAdoptDataStore        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store);</pre>
 <p>Adopts data store in the keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10641"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10214"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10646"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10219"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to data store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10651"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10656"></a><h3>
-<a name="XMLSECKEYSMNGRGETDATASTORE"></a>xmlSecKeysMngrGetDataStore ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> xmlSecKeysMngrGetDataStore
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>xmlSecKeyDataStoreId</font> id);</pre>
-<p>Lookups the data store of given klass <var class="PARAMETER">id</var> in the keys manager.</p>
+<a name="XMLSECKEYSMNGRGETDATASTORE"></a><h3>xmlSecKeysMngrGetDataStore ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStorePtr</font>  xmlSecKeysMngrGetDataStore       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>xmlSecKeyDataStoreId</font> id);</pre>
+<p>Lookups the data store of given klass <code class="PARAMETER">id</code> in the keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10669"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10241"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10674"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10246"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the desired data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10679"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to data store or NULL if it is not found or an error
+<td align="LEFT" valign="TOP"><a name="AEN10251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to data store or NULL if it is not found or an error
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10684"></a><h3>
-<a name="XMLSECGETKEYCALLBACK"></a>xmlSecGetKeyCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> (*xmlSecGetKeyCallback)        (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var> and extracts the key.</p>
+<a name="XMLSECGETKEYCALLBACK"></a><h3>xmlSecGetKeyCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        (*xmlSecGetKeyCallback)             (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code> and extracts the key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10698"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10269"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10704"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10275"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to key or NULL if the key is not found or 
+<td align="LEFT" valign="TOP"><a name="AEN10281"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to key or NULL if the key is not found or 
 an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10715"></a><h3>
-<a name="XMLSECKEYSMNGR"></a>struct xmlSecKeysMngr</h3>
+<a name="XMLSECKEYSMNGR"></a><h3>struct xmlSecKeysMngr</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeysMngr {
-	
     xmlSecKeyStorePtr		keysStore;	
     xmlSecPtrList		storesList;	
     xmlSecGetKeyCallback	getKey;		
@@ -343,50 +323,47 @@ an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10724"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> <code class="STRUCTFIELD">keysStore</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10294"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> <code class="STRUCTFIELD">keysStore</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the key store (list of keys known to keys manager).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10730"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">storesList</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10300"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">storesList</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list of key data stores known to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10736"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">xmlSecGetKeyCallback</a> <code class="STRUCTFIELD">getKey</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10306"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECGETKEYCALLBACK">xmlSecGetKeyCallback</a> <code class="STRUCTFIELD">getKey</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the callback used to read <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10743"></a><h3>
-<a name="XMLSECKEYSMNGRGETKEY"></a>xmlSecKeysMngrGetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> xmlSecKeysMngrGetKey           (<font>xmlNodePtr</font> keyInfoNode,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
-<p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var> and extracts the key.</p>
+<a name="XMLSECKEYSMNGRGETKEY"></a><h3>xmlSecKeysMngrGetKey ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeysMngrGetKey                (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<p>Reads the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code> and extracts the key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10757"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10326"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10763"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10332"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.	</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10769"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to key or NULL if the key is not found or 
+<td align="LEFT" valign="TOP"><a name="AEN10338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to key or NULL if the key is not found or 
 an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10774"></a><h3>
-<a name="XMLSECKEYSTORE"></a>struct xmlSecKeyStore</h3>
+<a name="XMLSECKEYSTORE"></a><h3>struct xmlSecKeyStore</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyStore {
-
     xmlSecKeyStoreId			id;
 
     /* for the future */
@@ -398,224 +375,210 @@ an error occurs.</p></td>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10783"><span style="white-space: nowrap"><font>xmlSecKeyStoreId</font> <code class="STRUCTFIELD">id</code></span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the store id (<font><span class="TYPE">xmlSecKeyStoreId</span></font>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10351"><span style="white-space: nowrap"><font>xmlSecKeyStoreId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the store id (<gtkdoclink href="XMLSECKEYSTOREID"><span class="TYPE">xmlSecKeyStoreId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10791"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10359"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10797"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10365"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10803"></a><h3>
-<a name="XMLSECKEYSTORECREATE"></a>xmlSecKeyStoreCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> xmlSecKeyStoreCreate      (<font>xmlSecKeyStoreId</font> id);</pre>
-<p>Creates new store of the specified klass <var class="PARAMETER">klass</var>. Caller is responsible
+<a name="XMLSECKEYSTORECREATE"></a><h3>xmlSecKeyStoreCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a>   xmlSecKeyStoreCreate                (<font>xmlSecKeyStoreId</font> id);</pre>
+<p>Creates new store of the specified klass <code class="PARAMETER">klass</code>. Caller is responsible
 for freeing the returned store by calling <a href="xmlsec-keysmngr.html#XMLSECKEYSTOREDESTROY"><span class="TYPE">xmlSecKeyStoreDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10817"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10384"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the key store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10822"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly allocated keys store or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10389"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly allocated keys store or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10827"></a><h3>
-<a name="XMLSECKEYSTOREDESTROY"></a>xmlSecKeyStoreDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecKeyStoreDestroy           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<a name="XMLSECKEYSTOREDESTROY"></a><h3>xmlSecKeyStoreDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecKeyStoreDestroy               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
 <p>Destroys the store created with <a href="xmlsec-keysmngr.html#XMLSECKEYSTORECREATE"><span class="TYPE">xmlSecKeyStoreCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10840"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10406"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys store. </p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10845"></a><h3>
-<a name="XMLSECKEYSTOREFINDKEY"></a>xmlSecKeyStoreFindKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> xmlSecKeyStoreFindKey          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYSTOREFINDKEY"></a><h3>xmlSecKeyStoreFindKey ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        xmlSecKeyStoreFindKey               (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Lookups key in the store. The caller is responsible for destroying 
 the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10860"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10425"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10865"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10430"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10870"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10435"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10876"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to a key or NULL if key is not found or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10441"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10881"></a><h3>
-<a name="XMLSECKEYSTOREGETNAME"></a>xmlSecKeyStoreGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyStoreGetName(store)</pre>
+<a name="XMLSECKEYSTOREGETNAME"></a><h3>xmlSecKeyStoreGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyStoreGetName(store)</pre>
 <p>Macro. Returns key store name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10890"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10454"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10895"></a><h3>
-<a name="XMLSECKEYSTOREISVALID"></a>xmlSecKeyStoreIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyStoreIsValid(store)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">store</var> is not NULL and <var class="PARAMETER">store</var>-&gt;id is not NULL
+<a name="XMLSECKEYSTOREISVALID"></a><h3>xmlSecKeyStoreIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyStoreIsValid(store)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">store</code> is not NULL and <code class="PARAMETER">store</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10906"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10469"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10911"></a><h3>
-<a name="XMLSECKEYSTORECHECKID"></a>xmlSecKeyStoreCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyStoreCheckId(store, storeId)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">store</var> is valid and <var class="PARAMETER">store</var>'s id is equal to <var class="PARAMETER">storeId</var>.</p>
+<a name="XMLSECKEYSTORECHECKID"></a><h3>xmlSecKeyStoreCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyStoreCheckId(store, storeId)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">store</code>'s id is equal to <code class="PARAMETER">storeId</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10923"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10485"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10928"><span style="white-space: nowrap"><var class="PARAMETER">storeId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10490"><span style="white-space: nowrap"><code class="PARAMETER">storeId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store Id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10933"></a><h3>
-<a name="XMLSECKEYSTORECHECKSIZE"></a>xmlSecKeyStoreCheckSize()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyStoreCheckSize(store, size)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">store</var> is valid and <var class="PARAMETER">stores</var>'s object has at least <var class="PARAMETER">size</var> bytes.</p>
+<a name="XMLSECKEYSTORECHECKSIZE"></a><h3>xmlSecKeyStoreCheckSize()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyStoreCheckSize(store, size)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">store</code> is valid and <code class="PARAMETER">stores</code>'s object has at least <code class="PARAMETER">size</code> bytes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10945"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10506"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10950"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10511"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the expected size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10955"></a><h3>
-<a name="XMLSECKEYSTOREIDUNKNOWN"></a>xmlSecKeyStoreIdUnknown</h3>
+<a name="XMLSECKEYSTOREIDUNKNOWN"></a><h3>xmlSecKeyStoreIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecKeyStoreIdUnknown 			((xmlSecKeyDataStoreId)NULL)</pre>
 <p>The "unknown" id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10963"></a><h3>
-<a name="XMLSECKEYSTOREINITIALIZEMETHOD"></a>xmlSecKeyStoreInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecKeyStoreInitializeMethod)
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<a name="XMLSECKEYSTOREINITIALIZEMETHOD"></a><h3>xmlSecKeyStoreInitializeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecKeyStoreInitializeMethod)   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
 <p>Keys store specific initialization method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10974"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10533"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN10979"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10538"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN10984"></a><h3>
-<a name="XMLSECKEYSTOREFINALIZEMETHOD"></a>xmlSecKeyStoreFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecKeyStoreFinalizeMethod) (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<a name="XMLSECKEYSTOREFINALIZEMETHOD"></a><h3>xmlSecKeyStoreFinalizeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecKeyStoreFinalizeMethod)     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
 <p>Keys store specific finalization (destroy) method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN10995"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10553"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11000"></a><h3>
-<a name="XMLSECKEYSTOREFINDKEYMETHOD"></a>xmlSecKeyStoreFindKeyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font> (*xmlSecKeyStoreFindKeyMethod) (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECKEYSTOREFINDKEYMETHOD"></a><h3>xmlSecKeyStoreFindKeyMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyPtr</font>        (*xmlSecKeyStoreFindKeyMethod)      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Keys store specific find method. The caller is responsible for destroying 
 the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="TYPE">xmlSecKeyDestroy</span></a> method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11015"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10572"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11020"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10577"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired key name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11025"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10582"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to key info context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11030"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to a key or NULL if key is not found or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to a key or NULL if key is not found or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11035"></a><h3>
-<a name="XMLSECKEYSTOREKLASS"></a>struct xmlSecKeyStoreKlass</h3>
+<a name="XMLSECKEYSTOREKLASS"></a><h3>struct xmlSecKeyStoreKlass</h3>
 <pre class="PROGRAMLISTING">struct xmlSecKeyStoreKlass {
-
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
 
@@ -636,181 +599,172 @@ the returned key using <a href="xmlsec-keys.html#XMLSECKEYDESTROY"><span class="
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11044"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10600"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store klass size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11050"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10606"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store obj size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11056"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10612"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11062"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">xmlSecKeyStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10618"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREINITIALIZEMETHOD">xmlSecKeyStoreInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11068"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">xmlSecKeyStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10624"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINALIZEMETHOD">xmlSecKeyStoreFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's finalization (destroy) method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11074"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">xmlSecKeyStoreFindKeyMethod</a> <code class="STRUCTFIELD">findKey</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10630"><span style="white-space: nowrap"><a href="xmlsec-keysmngr.html#XMLSECKEYSTOREFINDKEYMETHOD">xmlSecKeyStoreFindKeyMethod</a> <code class="STRUCTFIELD">findKey</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the store's find method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11080"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10636"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11086"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10642"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11092"></a><h3>
-<a name="XMLSECKEYSTOREKLASSGETNAME"></a>xmlSecKeyStoreKlassGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecKeyStoreKlassGetName(klass)</pre>
+<a name="XMLSECKEYSTOREKLASSGETNAME"></a><h3>xmlSecKeyStoreKlassGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecKeyStoreKlassGetName(klass)</pre>
 <p>Macro. Returns store klass name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11101"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10656"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11106"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTOREID"></a>xmlSecSimpleKeysStoreId</h3>
+<a name="XMLSECSIMPLEKEYSSTOREID"></a><h3>xmlSecSimpleKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecSimpleKeysStoreId		xmlSecSimpleKeysStoreGetKlass()</pre>
 <p>A simple keys store klass id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11114"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTOREGETKLASS"></a>xmlSecSimpleKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font> xmlSecSimpleKeysStoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECSIMPLEKEYSSTOREGETKLASS"></a><h3>xmlSecSimpleKeysStoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecSimpleKeysStoreGetKlass       (void);</pre>
 <p>The simple list based keys store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11124"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>simple list based keys store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> simple list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11129"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTOREADOPTKEY"></a>xmlSecSimpleKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecSimpleKeysStoreAdoptKey   (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECSIMPLEKEYSSTOREADOPTKEY"></a><h3>xmlSecSimpleKeysStoreAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreAdoptKey       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11143"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10695"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11148"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10700"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11153"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10705"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11158"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTORELOAD"></a>xmlSecSimpleKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecSimpleKeysStoreLoad       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECSIMPLEKEYSSTORELOAD"></a><h3>xmlSecSimpleKeysStoreLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreLoad           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11171"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10722"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11176"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10727"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11181"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10732"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11186"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10737"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11191"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTORESAVE"></a>xmlSecSimpleKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecSimpleKeysStoreSave       (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Writes keys from <var class="PARAMETER">store</var> to an XML file.</p>
+<a name="XMLSECSIMPLEKEYSSTORESAVE"></a><h3>xmlSecSimpleKeysStoreSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecSimpleKeysStoreSave           (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11205"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10755"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11210"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10760"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11215"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10765"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11220"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11225"></a><h3>
-<a name="XMLSECSIMPLEKEYSSTOREGETKEYS"></a>xmlSecSimpleKeysStoreGetKeys ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> xmlSecSimpleKeysStoreGetKeys
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
+<a name="XMLSECSIMPLEKEYSSTOREGETKEYS"></a><h3>xmlSecSimpleKeysStoreGetKeys ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListPtr</font>    xmlSecSimpleKeysStoreGetKeys        (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store);</pre>
 <p>Gets list of keys from simple keys store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11236"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10785"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to simple keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11241"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the list of keys stored in the keys store or NULL
+<td align="LEFT" valign="TOP"><a name="AEN10790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the list of keys stored in the keys store or NULL
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keys.html"><b>&lt;&lt;&lt;keys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-list.html"><b>list&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keys.html"><b>&lt;&lt;&lt; keys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-list.html"><b>list &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-list.html b/docs/api/xmlsec-list.html
index 78f12b7..f070e9d 100644
--- a/docs/api/xmlsec-list.html
+++ b/docs/api/xmlsec-list.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>list</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="keysmngr" href="xmlsec-keysmngr.html">
 <link rel="NEXT" title="membuf" href="xmlsec-membuf.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,62 +87,57 @@
 <h1>
 <a name="XMLSEC-LIST"></a>list</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11251"></a><h2>Name</h2>list--Generic list structure implementation.</div>
+<a name="AEN10800"></a><h2>Name</h2>list -- Generic list structure implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN11254"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-struct      <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a>;
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a>
-                                            (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
-<font>int</font>         <a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE">xmlSecPtrListInitialize</a>         (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtrListId</font> id);
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE">xmlSecPtrListFinalize</a>           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <a href="xmlsec-list.html#XMLSECPTRLISTCREATE">xmlSecPtrListCreate</a>        (<font>xmlSecPtrListId</font> id);
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY">xmlSecPtrListDestroy</a>            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTEMPTY">xmlSecPtrListEmpty</a>              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<font>int</font>         <a href="xmlsec-list.html#XMLSECPTRLISTCOPY">xmlSecPtrListCopy</a>               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
-                                             <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);
-<font>xmlSecPtrListPtr</font> <a href="xmlsec-list.html#XMLSECPTRLISTDUPLICATE">xmlSecPtrListDuplicate</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-list.html#XMLSECPTRLISTGETSIZE">xmlSecPtrListGetSize</a>            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
-<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>   <a href="xmlsec-list.html#XMLSECPTRLISTGETITEM">xmlSecPtrListGetItem</a>            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>int</font>         <a href="xmlsec-list.html#XMLSECPTRLISTADD">xmlSecPtrListAdd</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtr</font> item);
-<font>int</font>         <a href="xmlsec-list.html#XMLSECPTRLISTSET">xmlSecPtrListSet</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtr</font> item,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>int</font>         <a href="xmlsec-list.html#XMLSECPTRLISTREMOVE">xmlSecPtrListRemove</a>             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGDUMP">xmlSecPtrListDebugDump</a>          (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGXMLDUMP">xmlSecPtrListDebugXmlDump</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-list.html#XMLSECPTRLISTGETNAME">xmlSecPtrListGetName</a>            (list)
-#define     <a href="xmlsec-list.html#XMLSECPTRLISTISVALID">xmlSecPtrListIsValid</a>            (list)
-#define     <a href="xmlsec-list.html#XMLSECPTRLISTCHECKID">xmlSecPtrListCheckId</a>            (list, dataId)
-#define     <a href="xmlsec-list.html#XMLSECPTRLISTIDUNKNOWN">xmlSecPtrListIdUnknown</a>
-<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>   (<a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">*xmlSecPtrDuplicateItemMethod</a>) (<font>xmlSecPtr</font> ptr);
-<font>void</font>        (<a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">*xmlSecPtrDestroyItemMethod</a>)   (<font>xmlSecPtr</font> ptr);
-<font>void</font>        (<a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">*xmlSecPtrDebugDumpItemMethod</a>) (<font>xmlSecPtr</font> ptr,
-                                             <font>FILE</font> *output);
-struct      <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListKlass</a>;
-#define     <a href="xmlsec-list.html#XMLSECPTRLISTKLASSGETNAME">xmlSecPtrListKlassGetName</a>       (klass)
-#define     <a href="xmlsec-list.html#XMLSECSTRINGLISTID">xmlSecStringListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">xmlSecStringListGetKlass</a>    (void);</pre>
+<a name="XMLSEC-LIST.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">struct              <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a>;
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTSETDEFAULTALLOCMODE">xmlSecPtrListSetDefaultAllocMode</a>    (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);
+<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE">xmlSecPtrListInitialize</a>             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtrListId</font> id);
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE">xmlSecPtrListFinalize</a>               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
+<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-list.html#XMLSECPTRLISTCREATE">xmlSecPtrListCreate</a>                 (<font>xmlSecPtrListId</font> id);
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY">xmlSecPtrListDestroy</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTEMPTY">xmlSecPtrListEmpty</a>                  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
+<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTCOPY">xmlSecPtrListCopy</a>                   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
+                                                         <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);
+<font>xmlSecPtrListPtr</font>    <a href="xmlsec-list.html#XMLSECPTRLISTDUPLICATE">xmlSecPtrListDuplicate</a>              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-list.html#XMLSECPTRLISTGETSIZE">xmlSecPtrListGetSize</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);
+<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           <a href="xmlsec-list.html#XMLSECPTRLISTGETITEM">xmlSecPtrListGetItem</a>                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTADD">xmlSecPtrListAdd</a>                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtr</font> item);
+<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTSET">xmlSecPtrListSet</a>                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtr</font> item,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<font>int</font>                 <a href="xmlsec-list.html#XMLSECPTRLISTREMOVE">xmlSecPtrListRemove</a>                 (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGDUMP">xmlSecPtrListDebugDump</a>              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-list.html#XMLSECPTRLISTDEBUGXMLDUMP">xmlSecPtrListDebugXmlDump</a>           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTGETNAME">xmlSecPtrListGetName</a>                (list)
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTISVALID">xmlSecPtrListIsValid</a>                (list)
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTCHECKID">xmlSecPtrListCheckId</a>                (list, dataId)
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTIDUNKNOWN">xmlSecPtrListIdUnknown</a>
+<a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           (<a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">*xmlSecPtrDuplicateItemMethod</a>)     (<font>xmlSecPtr</font> ptr);
+<font>void</font>                (<a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">*xmlSecPtrDestroyItemMethod</a>)       (<font>xmlSecPtr</font> ptr);
+<font>void</font>                (<a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">*xmlSecPtrDebugDumpItemMethod</a>)     (<font>xmlSecPtr</font> ptr,
+                                                         <font>FILE</font> *output);
+struct              <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListKlass</a>;
+#define             <a href="xmlsec-list.html#XMLSECPTRLISTKLASSGETNAME">xmlSecPtrListKlassGetName</a>           (klass)
+#define             <a href="xmlsec-list.html#XMLSECSTRINGLISTID">xmlSecStringListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-list.html#XMLSECSTRINGLISTGETKLASS">xmlSecStringListGetKlass</a>            (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN11332"></a><h2>Description</h2>
+<a name="XMLSEC-LIST.DESCRIPTION"></a><h2>Description</h2>
 <p>Generic list structure implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN11335"></a><h2>Details</h2>
+<a name="XMLSEC-LIST.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN11337"></a><h3>
-<a name="XMLSECPTRLIST"></a>struct xmlSecPtrList</h3>
+<a name="XMLSECPTRLIST"></a><h3>struct xmlSecPtrList</h3>
 <pre class="PROGRAMLISTING">struct xmlSecPtrList {
-
     xmlSecPtrListId		id;        
 
     xmlSecPtr*			data;
@@ -156,452 +150,427 @@ struct      <a href="xmlsec-list.html#XMLSECPTRLISTKLASS">xmlSecPtrListKlass</a>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11346"><span style="white-space: nowrap"><font>xmlSecPtrListId</font> <code class="STRUCTFIELD">id</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10894"><span style="white-space: nowrap"><font>xmlSecPtrListId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>				the list items description.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11352"><span style="white-space: nowrap"><font>xmlSecPtr</font> *<code class="STRUCTFIELD">data</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10900"><span style="white-space: nowrap"><font>xmlSecPtr</font> *<code class="STRUCTFIELD">data</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11358"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">use</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10906"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">use</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the current list size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11364"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">max</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10912"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">max</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the max (allocated) list size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11370"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10918"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> <code class="STRUCTFIELD">allocMode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the memory allocation mode.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11376"></a><h3>
-<a name="XMLSECPTRLISTSETDEFAULTALLOCMODE"></a>xmlSecPtrListSetDefaultAllocMode ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListSetDefaultAllocMode
-                                            (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
+<a name="XMLSECPTRLISTSETDEFAULTALLOCMODE"></a><h3>xmlSecPtrListSetDefaultAllocMode ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListSetDefaultAllocMode    (<a href="xmlsec-buffer.html#XMLSECALLOCMODE">xmlSecAllocMode</a> defAllocMode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> defInitialSize);</pre>
 <p>Sets new default allocation mode and minimal initial list size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11388"><span style="white-space: nowrap"><var class="PARAMETER">defAllocMode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10935"><span style="white-space: nowrap"><code class="PARAMETER">defAllocMode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default memory allocation mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11393"><span style="white-space: nowrap"><var class="PARAMETER">defInitialSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10940"><span style="white-space: nowrap"><code class="PARAMETER">defInitialSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the new default minimal initial size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11398"></a><h3>
-<a name="XMLSECPTRLISTINITIALIZE"></a>xmlSecPtrListInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecPtrListInitialize         (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtrListId</font> id);</pre>
+<a name="XMLSECPTRLISTINITIALIZE"></a><h3>xmlSecPtrListInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListInitialize             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtrListId</font> id);</pre>
 <p>Initializes the list of given klass. Caller is responsible 
 for cleaning up by calling <a href="xmlsec-list.html#XMLSECPTRLISTFINALIZE"><span class="TYPE">xmlSecPtrListFinalize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11412"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10958"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11417"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10963"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11422"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN10968"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11427"></a><h3>
-<a name="XMLSECPTRLISTFINALIZE"></a>xmlSecPtrListFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListFinalize           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<a name="XMLSECPTRLISTFINALIZE"></a><h3>xmlSecPtrListFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListFinalize               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
 <p>Cleans up the list initialized with <a href="xmlsec-list.html#XMLSECPTRLISTINITIALIZE"><span class="TYPE">xmlSecPtrListInitialize</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11440"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN10985"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11445"></a><h3>
-<a name="XMLSECPTRLISTCREATE"></a>xmlSecPtrListCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> xmlSecPtrListCreate        (<font>xmlSecPtrListId</font> id);</pre>
+<a name="XMLSECPTRLISTCREATE"></a><h3>xmlSecPtrListCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecPtrListCreate                 (<font>xmlSecPtrListId</font> id);</pre>
 <p>Creates new list object. Caller is responsible for freeing returned list
 by calling <a href="xmlsec-list.html#XMLSECPTRLISTDESTROY"><span class="TYPE">xmlSecPtrListDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11458"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11002"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the list klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11463"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated list or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11007"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated list or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11468"></a><h3>
-<a name="XMLSECPTRLISTDESTROY"></a>xmlSecPtrListDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListDestroy            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
-<p>Destroys <var class="PARAMETER">list</var> created with <a href="xmlsec-list.html#XMLSECPTRLISTCREATE"><span class="TYPE">xmlSecPtrListCreate</span></a> function.</p>
+<a name="XMLSECPTRLISTDESTROY"></a><h3>xmlSecPtrListDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDestroy                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<p>Destroys <code class="PARAMETER">list</code> created with <a href="xmlsec-list.html#XMLSECPTRLISTCREATE"><span class="TYPE">xmlSecPtrListCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11482"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11025"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11487"></a><h3>
-<a name="XMLSECPTRLISTEMPTY"></a>xmlSecPtrListEmpty ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListEmpty              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
-<p>Remove all items from <var class="PARAMETER">list</var> (if any).</p>
+<a name="XMLSECPTRLISTEMPTY"></a><h3>xmlSecPtrListEmpty ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListEmpty                  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<p>Remove all items from <code class="PARAMETER">list</code> (if any).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11499"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11041"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11504"></a><h3>
-<a name="XMLSECPTRLISTCOPY"></a>xmlSecPtrListCopy ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecPtrListCopy               (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
-                                             <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);</pre>
-<p>Copies <var class="PARAMETER">src</var> list items to <var class="PARAMETER">dst</var> list using <font><span class="TYPE">duplicateItem</span></font> method
-of the list klass. If <font><span class="TYPE">duplicateItem</span></font> method is NULL then 
+<a name="XMLSECPTRLISTCOPY"></a><h3>xmlSecPtrListCopy ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListCopy                   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> dst,
+                                                         <a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> src);</pre>
+<p>Copies <code class="PARAMETER">src</code> list items to <code class="PARAMETER">dst</code> list using <gtkdoclink href="DUPLICATEITEM"><span class="TYPE">duplicateItem</span></gtkdoclink> method
+of the list klass. If <gtkdoclink href="DUPLICATEITEM"><span class="TYPE">duplicateItem</span></gtkdoclink> method is NULL then 
 we jsut copy pointers to items.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11522"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11063"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11527"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11068"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11532"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11073"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11537"></a><h3>
-<a name="XMLSECPTRLISTDUPLICATE"></a>xmlSecPtrListDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListPtr</font> xmlSecPtrListDuplicate     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
-<p>Creates a new copy of <var class="PARAMETER">list</var> and all its items.</p>
+<a name="XMLSECPTRLISTDUPLICATE"></a><h3>xmlSecPtrListDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListPtr</font>    xmlSecPtrListDuplicate              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<p>Creates a new copy of <code class="PARAMETER">list</code> and all its items.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11549"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11089"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11554"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated list or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11094"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated list or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11559"></a><h3>
-<a name="XMLSECPTRLISTGETSIZE"></a>xmlSecPtrListGetSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecPtrListGetSize            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
+<a name="XMLSECPTRLISTGETSIZE"></a><h3>xmlSecPtrListGetSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecPtrListGetSize                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list);</pre>
 <p>Gets list size.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11570"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11109"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11575"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the number of itmes in <var class="PARAMETER">list</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the number of itmes in <code class="PARAMETER">list</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11581"></a><h3>
-<a name="XMLSECPTRLISTGETITEM"></a>xmlSecPtrListGetItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>   xmlSecPtrListGetItem            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECPTRLISTGETITEM"></a><h3>xmlSecPtrListGetItem ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           xmlSecPtrListGetItem                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets item from the list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11593"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11131"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11598"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11136"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11603"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the list item at position <var class="PARAMETER">pos</var> or NULL if <var class="PARAMETER">pos</var> is greater
+<td align="LEFT" valign="TOP"><a name="AEN11141"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the list item at position <code class="PARAMETER">pos</code> or NULL if <code class="PARAMETER">pos</code> is greater
 than the number of items in the list or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11610"></a><h3>
-<a name="XMLSECPTRLISTADD"></a>xmlSecPtrListAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecPtrListAdd                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtr</font> item);</pre>
-<p>Adds <var class="PARAMETER">item</var> to the end of the <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECPTRLISTADD"></a><h3>xmlSecPtrListAdd ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListAdd                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtr</font> item);</pre>
+<p>Adds <code class="PARAMETER">item</code> to the end of the <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11624"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11161"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11629"><span style="white-space: nowrap"><var class="PARAMETER">item</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11166"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11634"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11639"></a><h3>
-<a name="XMLSECPTRLISTSET"></a>xmlSecPtrListSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecPtrListSet                (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecPtr</font> item,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
-<p>Sets the value of list item at position <var class="PARAMETER">pos</var>. The old value
+<a name="XMLSECPTRLISTSET"></a><h3>xmlSecPtrListSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListSet                    (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecPtr</font> item,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<p>Sets the value of list item at position <code class="PARAMETER">pos</code>. The old value
 is destroyed.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11653"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11189"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11658"><span style="white-space: nowrap"><var class="PARAMETER">item</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11194"><span style="white-space: nowrap"><code class="PARAMETER">item</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11663"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11199"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pos.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11668"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11204"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11673"></a><h3>
-<a name="XMLSECPTRLISTREMOVE"></a>xmlSecPtrListRemove ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecPtrListRemove             (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
-<p>Destroys list item at the position <var class="PARAMETER">pos</var> and sets it value to NULL.</p>
+<a name="XMLSECPTRLISTREMOVE"></a><h3>xmlSecPtrListRemove ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPtrListRemove                 (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<p>Destroys list item at the position <code class="PARAMETER">pos</code> and sets it value to NULL.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11686"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11221"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11691"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11226"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11696"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11231"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11701"></a><h3>
-<a name="XMLSECPTRLISTDEBUGDUMP"></a>xmlSecPtrListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListDebugDump          (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">list</var> to the <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECPTRLISTDEBUGDUMP"></a><h3>xmlSecPtrListDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDebugDump              (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">list</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11715"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11249"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11720"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11254"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11725"></a><h3>
-<a name="XMLSECPTRLISTDEBUGXMLDUMP"></a>xmlSecPtrListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecPtrListDebugXmlDump       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">list</var> to the <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECPTRLISTDEBUGXMLDUMP"></a><h3>xmlSecPtrListDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecPtrListDebugXmlDump           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">list</code> to the <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11739"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11272"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11744"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11277"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11749"></a><h3>
-<a name="XMLSECPTRLISTGETNAME"></a>xmlSecPtrListGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecPtrListGetName(list)</pre>
+<a name="XMLSECPTRLISTGETNAME"></a><h3>xmlSecPtrListGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecPtrListGetName(list)</pre>
 <p>Macro. Returns lists's name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11758"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11290"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the ponter to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11763"></a><h3>
-<a name="XMLSECPTRLISTISVALID"></a>xmlSecPtrListIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecPtrListIsValid(list)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">list</var> is not NULL and <var class="PARAMETER">list</var>-&gt;id is not NULL
+<a name="XMLSECPTRLISTISVALID"></a><h3>xmlSecPtrListIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecPtrListIsValid(list)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">list</code> is not NULL and <code class="PARAMETER">list</code>-&gt;id is not NULL
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11774"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11305"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to list.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11779"></a><h3>
-<a name="XMLSECPTRLISTCHECKID"></a>xmlSecPtrListCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecPtrListCheckId(list, dataId)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">list</var> is valid and <var class="PARAMETER">list</var>'s id is equal to <var class="PARAMETER">dataId</var>.</p>
+<a name="XMLSECPTRLISTCHECKID"></a><h3>xmlSecPtrListCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecPtrListCheckId(list, dataId)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">list</code> is valid and <code class="PARAMETER">list</code>'s id is equal to <code class="PARAMETER">dataId</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11791"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11321"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11796"><span style="white-space: nowrap"><var class="PARAMETER">dataId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11326"><span style="white-space: nowrap"><code class="PARAMETER">dataId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the list Id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11801"></a><h3>
-<a name="XMLSECPTRLISTIDUNKNOWN"></a>xmlSecPtrListIdUnknown</h3>
+<a name="XMLSECPTRLISTIDUNKNOWN"></a><h3>xmlSecPtrListIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecPtrListIdUnknown 			NULL</pre>
 <p>The "unknown" id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11809"></a><h3>
-<a name="XMLSECPTRDUPLICATEITEMMETHOD"></a>xmlSecPtrDuplicateItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>   (*xmlSecPtrDuplicateItemMethod) (<font>xmlSecPtr</font> ptr);</pre>
-<p>Duplicates item <var class="PARAMETER">ptr</var>.</p>
+<a name="XMLSECPTRDUPLICATEITEMMETHOD"></a><h3>xmlSecPtrDuplicateItemMethod ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECPTR">xmlSecPtr</a>           (*xmlSecPtrDuplicateItemMethod)     (<font>xmlSecPtr</font> ptr);</pre>
+<p>Duplicates item <code class="PARAMETER">ptr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11821"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11349"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poinetr to list item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11826"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to new item copy or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11354"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to new item copy or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11831"></a><h3>
-<a name="XMLSECPTRDESTROYITEMMETHOD"></a>xmlSecPtrDestroyItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecPtrDestroyItemMethod)   (<font>xmlSecPtr</font> ptr);</pre>
-<p>Destroys list item <var class="PARAMETER">ptr</var>.</p>
+<a name="XMLSECPTRDESTROYITEMMETHOD"></a><h3>xmlSecPtrDestroyItemMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecPtrDestroyItemMethod)       (<font>xmlSecPtr</font> ptr);</pre>
+<p>Destroys list item <code class="PARAMETER">ptr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11843"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11370"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poinetr to list item.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11848"></a><h3>
-<a name="XMLSECPTRDEBUGDUMPITEMMETHOD"></a>xmlSecPtrDebugDumpItemMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecPtrDebugDumpItemMethod) (<font>xmlSecPtr</font> ptr,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">item</var> to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECPTRDEBUGDUMPITEMMETHOD"></a><h3>xmlSecPtrDebugDumpItemMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecPtrDebugDumpItemMethod)     (<font>xmlSecPtr</font> ptr,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">item</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11862"><span style="white-space: nowrap"><var class="PARAMETER">ptr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11388"><span style="white-space: nowrap"><code class="PARAMETER">ptr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the poinetr to list item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11867"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11393"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11872"></a><h3>
-<a name="XMLSECPTRLISTKLASS"></a>struct xmlSecPtrListKlass</h3>
+<a name="XMLSECPTRLISTKLASS"></a><h3>struct xmlSecPtrListKlass</h3>
 <pre class="PROGRAMLISTING">struct xmlSecPtrListKlass {
-
     const xmlChar*			name;
     xmlSecPtrDuplicateItemMethod	duplicateItem;
     xmlSecPtrDestroyItemMethod		destroyItem;
@@ -613,66 +582,63 @@ or 0 otherwise.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11881"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11406"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the list klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11887"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">xmlSecPtrDuplicateItemMethod</a> <code class="STRUCTFIELD">duplicateItem</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11412"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDUPLICATEITEMMETHOD">xmlSecPtrDuplicateItemMethod</a> <code class="STRUCTFIELD">duplicateItem</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the duplciate item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11893"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">xmlSecPtrDestroyItemMethod</a> <code class="STRUCTFIELD">destroyItem</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11418"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDESTROYITEMMETHOD">xmlSecPtrDestroyItemMethod</a> <code class="STRUCTFIELD">destroyItem</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the destroy item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11899"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugDumpItem</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11424"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugDumpItem</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the debug dump item method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN11905"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugXmlDumpItem</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11430"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRDEBUGDUMPITEMMETHOD">xmlSecPtrDebugDumpItemMethod</a> <code class="STRUCTFIELD">debugXmlDumpItem</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the debug dump item in xml format method.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11911"></a><h3>
-<a name="XMLSECPTRLISTKLASSGETNAME"></a>xmlSecPtrListKlassGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecPtrListKlassGetName(klass)</pre>
+<a name="XMLSECPTRLISTKLASSGETNAME"></a><h3>xmlSecPtrListKlassGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecPtrListKlassGetName(klass)</pre>
 <p>Macro. Returns the list klass name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11920"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11444"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the list klass.
 2</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11925"></a><h3>
-<a name="XMLSECSTRINGLISTID"></a>xmlSecStringListId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecStringListId</pre>
+<a name="XMLSECSTRINGLISTID"></a><h3>xmlSecStringListId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecStringListId</pre>
 <p>Strings list klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11933"></a><h3>
-<a name="XMLSECSTRINGLISTGETKLASS"></a>xmlSecStringListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecStringListGetKlass    (void);</pre>
+<a name="XMLSECSTRINGLISTGETKLASS"></a><h3>xmlSecStringListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecStringListGetKlass            (void);</pre>
 <p>The strins list class.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11943"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>strings list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> strings list klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-keysmngr.html"><b>&lt;&lt;&lt;keysmngr</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-membuf.html"><b>membuf&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-keysmngr.html"><b>&lt;&lt;&lt; keysmngr</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-membuf.html"><b>membuf &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-membuf.html b/docs/api/xmlsec-membuf.html
index 412893d..f026417 100644
--- a/docs/api/xmlsec-membuf.html
+++ b/docs/api/xmlsec-membuf.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>membuf</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="list" href="xmlsec-list.html">
 <link rel="NEXT" title="nodeset" href="xmlsec-nodeset.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,68 +87,59 @@
 <h1>
 <a name="XMLSEC-MEMBUF"></a>membuf</h1>
 <div class="REFNAMEDIV">
-<a name="AEN11953"></a><h2>Name</h2>membuf--Memory buffer transform implementation.</div>
+<a name="AEN11475"></a><h2>Name</h2>membuf -- Memory buffer transform implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN11956"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFID">xmlSecTransformMemBufId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">xmlSecTransformMemBufGetKlass</a>
-                                            (void);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETBUFFER">xmlSecTransformMemBufGetBuffer</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<a name="XMLSEC-MEMBUF.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFID">xmlSecTransformMemBufId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETKLASS">xmlSecTransformMemBufGetKlass</a>       (void);
+<font>xmlSecBufferPtr</font>     <a href="xmlsec-membuf.html#XMLSECTRANSFORMMEMBUFGETBUFFER">xmlSecTransformMemBufGetBuffer</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN11965"></a><h2>Description</h2>
+<a name="XMLSEC-MEMBUF.DESCRIPTION"></a><h2>Description</h2>
 <p>Memory buffer transform implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN11968"></a><h2>Details</h2>
+<a name="XMLSEC-MEMBUF.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN11970"></a><h3>
-<a name="XMLSECTRANSFORMMEMBUFID"></a>xmlSecTransformMemBufId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformMemBufId</pre>
+<a name="XMLSECTRANSFORMMEMBUFID"></a><h3>xmlSecTransformMemBufId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformMemBufId</pre>
 <p>The Memory Buffer transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11978"></a><h3>
-<a name="XMLSECTRANSFORMMEMBUFGETKLASS"></a>xmlSecTransformMemBufGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformMemBufGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMMEMBUFGETKLASS"></a><h3>xmlSecTransformMemBufGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformMemBufGetKlass       (void);</pre>
 <p>The memory buffer transorm (used to store the data that go through it).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN11988"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>memory buffer transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11508"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> memory buffer transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN11993"></a><h3>
-<a name="XMLSECTRANSFORMMEMBUFGETBUFFER"></a>xmlSecTransformMemBufGetBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> xmlSecTransformMemBufGetBuffer
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<a name="XMLSECTRANSFORMMEMBUFGETBUFFER"></a><h3>xmlSecTransformMemBufGetBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecTransformMemBufGetBuffer      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
 <p>Gets the pointer to memory buffer transform buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12004"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11523"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to memory buffer transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the transform's <a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a>. </p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11528"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the transform's <a href="xmlsec-buffer.html#XMLSECBUFFER"><span class="TYPE">xmlSecBuffer</span></a>. </p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-list.html"><b>&lt;&lt;&lt;list</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nodeset.html"><b>nodeset&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-list.html"><b>&lt;&lt;&lt; list</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nodeset.html"><b>nodeset &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-app.html b/docs/api/xmlsec-mscrypto-app.html
index e32e954..3cbc875 100644
--- a/docs/api/xmlsec-mscrypto-app.html
+++ b/docs/api/xmlsec-mscrypto-app.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>app</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="PREVIOUS" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="NEXT" title="certkeys" href="xmlsec-mscrypto-certkeys.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,709 +87,682 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28987"></a><h2>Name</h2>app--Application functions implementation for MS Crypto.</div>
+<a name="AEN27937"></a><h2>Name</h2>app -- Application functions implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN28990"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPINIT">xmlSecMSCryptoAppInit</a>           (const <font>char</font> *config);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPSHUTDOWN">xmlSecMSCryptoAppShutdown</a>       (void);
-const <font>char</font>* <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETCERTSTORENAME">xmlSecMSCryptoAppGetCertStoreName</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecMSCryptoAppDefaultKeysMngrInit</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecMSCryptoAppDefaultKeysMngrLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecMSCryptoAppDefaultKeysMngrSave</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> keyStore);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> trustedStore);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> untrustedStore);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecMSCryptoAppKeysMngrCertLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecMSCryptoAppKeysMngrCertLoadMemory</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOAD">xmlSecMSCryptoAppKeyLoad</a>       (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOADMEMORY">xmlSecMSCryptoAppKeyLoadMemory</a> (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOAD">xmlSecMSCryptoAppPkcs12Load</a>    (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOADMEMORY">xmlSecMSCryptoAppPkcs12LoadMemory</a>
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOAD">xmlSecMSCryptoAppKeyCertLoad</a>    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY">xmlSecMSCryptoAppKeyCertLoadMemory</a>
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*       <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecMSCryptoAppGetDefaultPwdCallback</a>
-                                            (void);</pre>
+<a name="XMLSEC-MSCRYPTO-APP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPINIT">xmlSecMSCryptoAppInit</a>               (const <font>char</font> *config);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPSHUTDOWN">xmlSecMSCryptoAppShutdown</a>           (void);
+const <font>char</font>*         <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETCERTSTORENAME">xmlSecMSCryptoAppGetCertStoreName</a>   (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT">xmlSecMSCryptoAppDefaultKeysMngrInit</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecMSCryptoAppDefaultKeysMngrAdoptKey</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD">xmlSecMSCryptoAppDefaultKeysMngrLoad</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE">xmlSecMSCryptoAppDefaultKeysMngrSave</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD">xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> keyStore);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> trustedStore);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE">xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> untrustedStore);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD">xmlSecMSCryptoAppKeysMngrCertLoad</a>   (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY">xmlSecMSCryptoAppKeysMngrCertLoadMemory</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOAD">xmlSecMSCryptoAppKeyLoad</a>            (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYLOADMEMORY">xmlSecMSCryptoAppKeyLoadMemory</a>      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOAD">xmlSecMSCryptoAppPkcs12Load</a>         (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPPKCS12LOADMEMORY">xmlSecMSCryptoAppPkcs12LoadMemory</a>   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOAD">xmlSecMSCryptoAppKeyCertLoad</a>        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY">xmlSecMSCryptoAppKeyCertLoadMemory</a>  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>void</font>*               <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK">xmlSecMSCryptoAppGetDefaultPwdCallback</a>
+                                                        (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN29094"></a><h2>Description</h2>
+<a name="XMLSEC-MSCRYPTO-APP.DESCRIPTION"></a><h2>Description</h2>
 <p>Application functions implementation for MS Crypto.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN29097"></a><h2>Details</h2>
+<a name="XMLSEC-MSCRYPTO-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN29099"></a><h3>
-<a name="XMLSECMSCRYPTOAPPINIT"></a>xmlSecMSCryptoAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppInit           (const <font>char</font> *config);</pre>
+<a name="XMLSECMSCRYPTOAPPINIT"></a><h3>xmlSecMSCryptoAppInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppInit               (const <font>char</font> *config);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
-<var class="PARAMETER">xmlSecInit</var> function.</p>
+<code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29111"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28060"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the name of another then the default ms certificate store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28065"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29121"></a><h3>
-<a name="XMLSECMSCRYPTOAPPSHUTDOWN"></a>xmlSecMSCryptoAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppShutdown       (void);</pre>
+<a name="XMLSECMSCRYPTOAPPSHUTDOWN"></a><h3>xmlSecMSCryptoAppShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppShutdown           (void);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
-<var class="PARAMETER">xmlSecShutdown</var> function.</p>
+<code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29132"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28080"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29137"></a><h3>
-<a name="XMLSECMSCRYPTOAPPGETCERTSTORENAME"></a>xmlSecMSCryptoAppGetCertStoreName ()</h3>
-<pre class="PROGRAMLISTING">const <font>char</font>* xmlSecMSCryptoAppGetCertStoreName
-                                            (void);</pre>
-<p>Gets the MS Crypto certs store name set by <var class="PARAMETER">xmlSecMSCryptoAppInit</var> function.</p>
+<a name="XMLSECMSCRYPTOAPPGETCERTSTORENAME"></a><h3>xmlSecMSCryptoAppGetCertStoreName ()</h3>
+<pre class="PROGRAMLISTING">const <font>char</font>*         xmlSecMSCryptoAppGetCertStoreName   (void);</pre>
+<p>Gets the MS Crypto certs store name set by <code class="PARAMETER">xmlSecMSCryptoAppInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN29148"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the MS Crypto certs name used by xmlsec-mscrypto.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28095"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the MS Crypto certs name used by xmlsec-mscrypto.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29153"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"></a>xmlSecMSCryptoAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrInit
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
-<p>Initializes <var class="PARAMETER">mngr</var> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrInit
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default MSCrypto crypto key data stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29167"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28113"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28118"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29177"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the keys manager <var class="PARAMETER">mngr</var> created with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecMSCryptoAppDefaultKeysMngrInit</span></a>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKey
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecMSCryptoAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29193"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28138"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29198"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28143"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28148"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29208"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a>xmlSecMSCryptoAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);</pre>
-<p>Loads XML keys file from <var class="PARAMETER">uri</var> to the keys manager <var class="PARAMETER">mngr</var> created 
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrLoad
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);</pre>
+<p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created 
 with <a href="xmlsec-mscrypto-app.html#XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecMSCryptoAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29224"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28168"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29229"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28173"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29234"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28178"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29239"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a>xmlSecMSCryptoAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrSave
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Saves keys from <var class="PARAMETER">mngr</var> to  XML keys file.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrSave
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29253"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28196"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29258"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28201"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>   the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29263"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28206"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29268"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28211"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29273"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD"></a>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);</pre>
-<p>Adds private key <var class="PARAMETER">hKey</var> to the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPRIVATEKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrPrivateKeyLoad
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<p>Adds private key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29287"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28229"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29292"><span style="white-space: nowrap"><var class="PARAMETER">hKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28234"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29297"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28239"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29302"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD"></a>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);</pre>
-<p>Adds public key <var class="PARAMETER">hKey</var> to the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRPUBLICKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrPublicKeyLoad
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<p>Adds public key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29316"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28257"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29321"><span style="white-space: nowrap"><var class="PARAMETER">hKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28262"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29326"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28267"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29331"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD"></a>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCRYPTKEY</font> hKey);</pre>
-<p>Adds symmetric key <var class="PARAMETER">hKey</var> to the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRSYMKEYLOAD"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrSymKeyLoad
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCRYPTKEY</font> hKey);</pre>
+<p>Adds symmetric key <code class="PARAMETER">hKey</code> to the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29345"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28285"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29350"><span style="white-space: nowrap"><var class="PARAMETER">hKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28290"><span style="white-space: nowrap"><code class="PARAMETER">hKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>       the key handle.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29355"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28295"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29360"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE"></a>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> keyStore);</pre>
-<p>Adds <var class="PARAMETER">keyStore</var> to the list of key stores in the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTKEYSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptKeyStore
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> keyStore);</pre>
+<p>Adds <code class="PARAMETER">keyStore</code> to the list of key stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29374"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28313"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		        the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29379"><span style="white-space: nowrap"><var class="PARAMETER">keyStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28318"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29384"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28323"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29389"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE"></a>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> trustedStore);</pre>
-<p>Adds <var class="PARAMETER">trustedStore</var> to the list of trusted cert stores in the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTTRUSTEDSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptTrustedStore
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> trustedStore);</pre>
+<p>Adds <code class="PARAMETER">trustedStore</code> to the list of trusted cert stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29403"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28341"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		        the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29408"><span style="white-space: nowrap"><var class="PARAMETER">trustedStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28346"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>       the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29413"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28351"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29418"></a><h3>
-<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE"></a>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>HCERTSTORE</font> untrustedStore);</pre>
-<p>Adds <var class="PARAMETER">trustedStore</var> to the list of un-trusted cert stores in the keys manager <var class="PARAMETER">mngr</var>.</p>
+<a name="XMLSECMSCRYPTOAPPDEFAULTKEYSMNGRADOPTUNTRUSTEDSTORE"></a><h3>xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppDefaultKeysMngrAdoptUntrustedStore
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>HCERTSTORE</font> untrustedStore);</pre>
+<p>Adds <code class="PARAMETER">trustedStore</code> to the list of un-trusted cert stores in the keys manager <code class="PARAMETER">mngr</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29432"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28369"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		        the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29437"><span style="white-space: nowrap"><var class="PARAMETER">untrustedStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28374"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29447"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD"></a>xmlSecMSCryptoAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppKeysMngrCertLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">filename</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var> (not implemented yet).</p>
+<a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecMSCryptoAppKeysMngrCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeysMngrCertLoad   (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code> (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29463"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28399"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29468"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28404"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29473"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28409"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29478"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
+<td align="LEFT" valign="TOP"><a name="AEN28414"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
    			trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29484"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28420"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29489"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a>xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppKeysMngrCertLoadMemory
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">data</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECMSCRYPTOAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeysMngrCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeysMngrCertLoadMemory
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">data</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29506"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28441"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29511"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28446"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29516"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28451"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           size of binary certificate (data)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29521"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28456"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29526"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
+<td align="LEFT" valign="TOP"><a name="AEN28461"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
    			trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29532"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29537"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYLOAD"></a>xmlSecMSCryptoAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecMSCryptoAppKeyLoad       (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECMSCRYPTOAPPKEYLOAD"></a><h3>xmlSecMSCryptoAppKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppKeyLoad            (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29552"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28486"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29557"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28491"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29562"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28496"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29567"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28501"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29572"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28506"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29577"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28511"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29582"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYLOADMEMORY"></a>xmlSecMSCryptoAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecMSCryptoAppKeyLoadMemory (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECMSCRYPTOAPPKEYLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeyLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppKeyLoadMemory      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29598"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28531"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29603"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28536"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29608"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28541"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29613"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28546"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29618"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28551"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29623"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28556"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28561"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29633"></a><h3>
-<a name="XMLSECMSCRYPTOAPPPKCS12LOAD"></a>xmlSecMSCryptoAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecMSCryptoAppPkcs12Load    (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECMSCRYPTOAPPPKCS12LOAD"></a><h3>xmlSecMSCryptoAppPkcs12Load ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppPkcs12Load         (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29647"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28579"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29652"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28584"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29657"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28589"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29662"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28594"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29667"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28599"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29672"></a><h3>
-<a name="XMLSECMSCRYPTOAPPPKCS12LOADMEMORY"></a>xmlSecMSCryptoAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecMSCryptoAppPkcs12LoadMemory
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECMSCRYPTOAPPPKCS12LOADMEMORY"></a><h3>xmlSecMSCryptoAppPkcs12LoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecMSCryptoAppPkcs12LoadMemory   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 binary</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29687"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28618"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary PKCS12 key in data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29692"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28623"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           size of binary pkcs12 data</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29697"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28628"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29702"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28633"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29707"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28638"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29712"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28643"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29717"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYCERTLOAD"></a>xmlSecMSCryptoAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppKeyCertLoad    (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">filename</var> and adds it to key.</p>
+<a name="XMLSECMSCRYPTOAPPKEYCERTLOAD"></a><h3>xmlSecMSCryptoAppKeyCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeyCertLoad        (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29731"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28661"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29736"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28666"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29741"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28671"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29746"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28676"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29751"></a><h3>
-<a name="XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY"></a>xmlSecMSCryptoAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoAppKeyCertLoadMemory
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">data</var> and adds it to key.</p>
+<a name="XMLSECMSCRYPTOAPPKEYCERTLOADMEMORY"></a><h3>xmlSecMSCryptoAppKeyCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoAppKeyCertLoadMemory  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">data</code> and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29766"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28695"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29771"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28700"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29776"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28705"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           size of certificate binary (data)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29781"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28710"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29786"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28715"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29791"></a><h3>
-<a name="XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK"></a>xmlSecMSCryptoAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*       xmlSecMSCryptoAppGetDefaultPwdCallback
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecMSCryptoAppGetDefaultPwdCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecMSCryptoAppGetDefaultPwdCallback
+                                                        (void);</pre>
 <p>Gets default password callback.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN28729"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> default password callback.</p></td>
+</tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-ref.html"><b>&lt;&lt;&lt;XML Security Library for MSCrypto API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-certkeys.html"><b>certkeys&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-ref.html"><b>&lt;&lt;&lt; XML Security Library for MSCrypto API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-certkeys.html"><b>certkeys &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-certkeys.html b/docs/api/xmlsec-mscrypto-certkeys.html
index cdf013d..24c0cad 100644
--- a/docs/api/xmlsec-mscrypto-certkeys.html
+++ b/docs/api/xmlsec-mscrypto-certkeys.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>certkeys</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-mscrypto-app.html">
 <link rel="NEXT" title="crypto" href="xmlsec-mscrypto-crypto.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,139 +87,130 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CERTKEYS"></a>certkeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN29805"></a><h2>Name</h2>certkeys--MS Crypto certificates helper functions.</div>
+<a name="AEN28739"></a><h2>Name</h2>certkeys -- MS Crypto certificates helper functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN29808"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETCERT">xmlSecMSCryptoKeyDataGetCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>HCRYPTKEY</font>   <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETKEY">xmlSecMSCryptoKeyDataGetKey</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>HCRYPTKEY</font>   <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY">xmlSecMSCryptoKeyDataGetDecryptKey</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTDUP">xmlSecMSCryptoCertDup</a>        (<font>PCCERT_CONTEXT</font> pCert);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTADOPT">xmlSecMSCryptoCertAdopt</a>    (<font>PCCERT_CONTEXT</font> pCert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSEC-MSCRYPTO-CERTKEYS.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETCERT">xmlSecMSCryptoKeyDataGetCert</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>HCRYPTKEY</font>           <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETKEY">xmlSecMSCryptoKeyDataGetKey</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>HCRYPTKEY</font>           <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY">xmlSecMSCryptoKeyDataGetDecryptKey</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTDUP">xmlSecMSCryptoCertDup</a>               (<font>PCCERT_CONTEXT</font> pCert);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-mscrypto-certkeys.html#XMLSECMSCRYPTOCERTADOPT">xmlSecMSCryptoCertAdopt</a>             (<font>PCCERT_CONTEXT</font> pCert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN29828"></a><h2>Description</h2>
+<a name="XMLSEC-MSCRYPTO-CERTKEYS.DESCRIPTION"></a><h2>Description</h2>
 <p>MS Crypto certificates helper functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN29831"></a><h2>Details</h2>
+<a name="XMLSEC-MSCRYPTO-CERTKEYS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN29833"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAGETCERT"></a>xmlSecMSCryptoKeyDataGetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoKeyDataGetCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAGETCERT"></a><h3>xmlSecMSCryptoKeyDataGetCert ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataGetCert        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Native MSCrypto certificate retrieval from xmlsec keydata. The 
 returned PCCERT_CONTEXT must not be released by the caller.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29844"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28777"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data to retrieve certificate from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29849"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>PCCERT_CONTEXT on success or NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28782"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> PCCERT_CONTEXT on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29854"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAGETKEY"></a>xmlSecMSCryptoKeyDataGetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>   xmlSecMSCryptoKeyDataGetKey     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAGETKEY"></a><h3>xmlSecMSCryptoKeyDataGetKey ()</h3>
+<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>           xmlSecMSCryptoKeyDataGetKey         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Native MSCrypto key retrieval from xmlsec keydata. The 
 returned HKEY must not be destroyed by the caller.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29866"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28798"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data to retrieve certificate from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29871"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28803"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              type of key requested (public/private)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29876"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HKEY on success or NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28808"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HKEY on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29881"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY"></a>xmlSecMSCryptoKeyDataGetDecryptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>   xmlSecMSCryptoKeyDataGetDecryptKey
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAGETDECRYPTKEY"></a><h3>xmlSecMSCryptoKeyDataGetDecryptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>HCRYPTKEY</font>           xmlSecMSCryptoKeyDataGetDecryptKey  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Native MSCrypto decrypt key retrieval from xmlsec keydata. The
 returned HKEY must not be destroyed by the caller.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29892"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28823"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the key data pointer</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29897"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HKEY on success or NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28828"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HKEY on success or NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29902"></a><h3>
-<a name="XMLSECMSCRYPTOCERTDUP"></a>xmlSecMSCryptoCertDup ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoCertDup        (<font>PCCERT_CONTEXT</font> pCert);</pre>
-<p>Duplicates the <var class="PARAMETER">pCert</var>.</p>
+<a name="XMLSECMSCRYPTOCERTDUP"></a><h3>xmlSecMSCryptoCertDup ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoCertDup               (<font>PCCERT_CONTEXT</font> pCert);</pre>
+<p>Duplicates the <code class="PARAMETER">pCert</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29914"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28844"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created PCCERT_CONTEXT object or 
+<td align="LEFT" valign="TOP"><a name="AEN28849"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created PCCERT_CONTEXT object or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN29924"></a><h3>
-<a name="XMLSECMSCRYPTOCERTADOPT"></a>xmlSecMSCryptoCertAdopt ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecMSCryptoCertAdopt    (<font>PCCERT_CONTEXT</font> pCert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECMSCRYPTOCERTADOPT"></a><h3>xmlSecMSCryptoCertAdopt ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecMSCryptoCertAdopt             (<font>PCCERT_CONTEXT</font> pCert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Creates key data value from the cert.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29936"><span style="white-space: nowrap"><var class="PARAMETER">pCert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28865"><span style="white-space: nowrap"><code class="PARAMETER">pCert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to cert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29941"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN28870"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the expected key type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN29946"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28875"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-app.html"><b>&lt;&lt;&lt;app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-crypto.html"><b>crypto&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-app.html"><b>&lt;&lt;&lt; app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-crypto.html"><b>crypto &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-crypto.html b/docs/api/xmlsec-mscrypto-crypto.html
index 580cb1d..0fcc44f 100644
--- a/docs/api/xmlsec-mscrypto-crypto.html
+++ b/docs/api/xmlsec-mscrypto-crypto.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>crypto</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="PREVIOUS" title="certkeys" href="xmlsec-mscrypto-certkeys.html">
 <link rel="NEXT" title="keysstore" href="xmlsec-mscrypto-keysstore.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,611 +87,559 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN29956"></a><h2>Name</h2>crypto--Crypto transforms implementation for MS Crypto.</div>
+<a name="AEN28885"></a><h2>Name</h2>crypto -- Crypto transforms implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN29959"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">xmlSecCryptoGetFunctions_mscrypto</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOINIT">xmlSecMSCryptoInit</a>              (void);
-<font>int</font>         <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOSHUTDOWN">xmlSecMSCryptoShutdown</a>          (void);
-<font>int</font>         <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYSMNGRINIT">xmlSecMSCryptoKeysMngrInit</a>      (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOGENERATERANDOM">xmlSecMSCryptoGenerateRandom</a>    (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <font>size_t</font> size);
-<font>void</font>        <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOERRORSDEFAULTCALLBACK">xmlSecMSCryptoErrorsDefaultCallback</a>
-                                            (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);
-<font>BYTE</font>*       <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCERTSTRTONAME">xmlSecMSCryptoCertStrToName</a>     (<font>DWORD</font> dwCertEncodingType,
-                                             <font>LPCTSTR</font> pszX500,
-                                             <font>DWORD</font> dwStrType,
-                                             <font>DWORD</font> *len);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAID">xmlSecMSCryptoKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAGETKLASS">xmlSecMSCryptoKeyDataDsaGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1ID">xmlSecMSCryptoTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS">xmlSecMSCryptoTransformDsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001ID">xmlSecMSCryptoKeyDataGost2001Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS">xmlSecMSCryptoKeyDataGost2001GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID">xmlSecMSCryptoTransformGost2001GostR3411_94Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAID">xmlSecMSCryptoKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAGETKLASS">xmlSecMSCryptoKeyDataRsaGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1ID">xmlSecMSCryptoTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">xmlSecMSCryptoTransformRsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID">xmlSecMSCryptoTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">xmlSecMSCryptoTransformRsaPkcs1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1ID">xmlSecMSCryptoTransformSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS">xmlSecMSCryptoTransformSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID">xmlSecMSCryptoTransformGostR3411_94Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGostR3411_94GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESID">xmlSecMSCryptoKeyDataAesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESGETKLASS">xmlSecMSCryptoKeyDataAesGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESSET">xmlSecMSCryptoKeyDataAesSet</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCID">xmlSecMSCryptoTransformAes128CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS">xmlSecMSCryptoTransformAes128CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCID">xmlSecMSCryptoTransformAes192CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS">xmlSecMSCryptoTransformAes192CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCID">xmlSecMSCryptoTransformAes256CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS">xmlSecMSCryptoTransformAes256CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESID">xmlSecMSCryptoKeyDataDesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESGETKLASS">xmlSecMSCryptoKeyDataDesGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCID">xmlSecMSCryptoTransformDes3CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS">xmlSecMSCryptoTransformDes3CbcGetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-MSCRYPTO-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-mscrypto-crypto.html#XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO">xmlSecCryptoGetFunctions_mscrypto</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOINIT">xmlSecMSCryptoInit</a>                  (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOSHUTDOWN">xmlSecMSCryptoShutdown</a>              (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYSMNGRINIT">xmlSecMSCryptoKeysMngrInit</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOGENERATERANDOM">xmlSecMSCryptoGenerateRandom</a>        (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <font>size_t</font> size);
+<font>void</font>                <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOERRORSDEFAULTCALLBACK">xmlSecMSCryptoErrorsDefaultCallback</a> (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);
+<font>BYTE</font>*               <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOCERTSTRTONAME">xmlSecMSCryptoCertStrToName</a>         (<font>DWORD</font> dwCertEncodingType,
+                                                         <font>LPCTSTR</font> pszX500,
+                                                         <font>DWORD</font> dwStrType,
+                                                         <font>DWORD</font> *len);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAID">xmlSecMSCryptoKeyDataDsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADSAGETKLASS">xmlSecMSCryptoKeyDataDsaGetKlass</a>    (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1ID">xmlSecMSCryptoTransformDsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS">xmlSecMSCryptoTransformDsaSha1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001ID">xmlSecMSCryptoKeyDataGost2001Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS">xmlSecMSCryptoKeyDataGost2001GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID">xmlSecMSCryptoTransformGost2001GostR3411_94Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAID">xmlSecMSCryptoKeyDataRsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATARSAGETKLASS">xmlSecMSCryptoKeyDataRsaGetKlass</a>    (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1ID">xmlSecMSCryptoTransformRsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS">xmlSecMSCryptoTransformRsaSha1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID">xmlSecMSCryptoTransformRsaPkcs1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS">xmlSecMSCryptoTransformRsaPkcs1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1ID">xmlSecMSCryptoTransformSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS">xmlSecMSCryptoTransformSha1GetKlass</a> (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID">xmlSecMSCryptoTransformGostR3411_94Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS">xmlSecMSCryptoTransformGostR3411_94GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESID">xmlSecMSCryptoKeyDataAesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESGETKLASS">xmlSecMSCryptoKeyDataAesGetKlass</a>    (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATAAESSET">xmlSecMSCryptoKeyDataAesSet</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCID">xmlSecMSCryptoTransformAes128CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS">xmlSecMSCryptoTransformAes128CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCID">xmlSecMSCryptoTransformAes192CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS">xmlSecMSCryptoTransformAes192CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCID">xmlSecMSCryptoTransformAes256CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS">xmlSecMSCryptoTransformAes256CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESID">xmlSecMSCryptoKeyDataDesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOKEYDATADESGETKLASS">xmlSecMSCryptoKeyDataDesGetKlass</a>    (void);
+#define             <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCID">xmlSecMSCryptoTransformDes3CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-mscrypto-crypto.html#XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS">xmlSecMSCryptoTransformDes3CbcGetKlass</a>
+                                                        (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN30040"></a><h2>Description</h2>
+<a name="XMLSEC-MSCRYPTO-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto transforms implementation for MS Crypto.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN30043"></a><h2>Details</h2>
+<a name="XMLSEC-MSCRYPTO-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN30045"></a><h3>
-<a name="XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO"></a>xmlSecCryptoGetFunctions_mscrypto ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoGetFunctions_mscrypto
-                                            (void);</pre>
+<a name="XMLSECCRYPTOGETFUNCTIONS-MSCRYPTO"></a><h3>xmlSecCryptoGetFunctions_mscrypto ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_mscrypto
+                                                        (void);</pre>
 <p>Gets MSCrypto specific functions table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30055"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>xmlsec-mscrypto functions table.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28983"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> xmlsec-mscrypto functions table.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30060"></a><h3>
-<a name="XMLSECMSCRYPTOINIT"></a>xmlSecMSCryptoInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoInit              (void);</pre>
+<a name="XMLSECMSCRYPTOINIT"></a><h3>xmlSecMSCryptoInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoInit                  (void);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30070"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN28997"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30075"></a><h3>
-<a name="XMLSECMSCRYPTOSHUTDOWN"></a>xmlSecMSCryptoShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoShutdown          (void);</pre>
+<a name="XMLSECMSCRYPTOSHUTDOWN"></a><h3>xmlSecMSCryptoShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoShutdown              (void);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30085"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29011"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30090"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSMNGRINIT"></a>xmlSecMSCryptoKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeysMngrInit      (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECMSCRYPTOKEYSMNGRINIT"></a><h3>xmlSecMSCryptoKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysMngrInit          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Adds MSCrypto specific key data stores in keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30101"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29026"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29031"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30111"></a><h3>
-<a name="XMLSECMSCRYPTOGENERATERANDOM"></a>xmlSecMSCryptoGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoGenerateRandom    (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <font>size_t</font> size);</pre>
-<p>Generates <var class="PARAMETER">size</var> random bytes and puts result in <var class="PARAMETER">buffer</var>
+<a name="XMLSECMSCRYPTOGENERATERANDOM"></a><h3>xmlSecMSCryptoGenerateRandom ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoGenerateRandom        (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <font>size_t</font> size);</pre>
+<p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>
 (not implemented yet).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30125"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29049"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30130"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29054"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30135"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29059"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30140"></a><h3>
-<a name="XMLSECMSCRYPTOERRORSDEFAULTCALLBACK"></a>xmlSecMSCryptoErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecMSCryptoErrorsDefaultCallback
-                                            (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSECMSCRYPTOERRORSDEFAULTCALLBACK"></a><h3>xmlSecMSCryptoErrorsDefaultCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecMSCryptoErrorsDefaultCallback (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 <p>The default errors reporting callback function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30157"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29080"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30162"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29085"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30167"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29090"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30172"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29095"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30177"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29100"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30182"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29105"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30187"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29110"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30192"></a><h3>
-<a name="XMLSECMSCRYPTOCERTSTRTONAME"></a>xmlSecMSCryptoCertStrToName ()</h3>
-<pre class="PROGRAMLISTING"><font>BYTE</font>*       xmlSecMSCryptoCertStrToName     (<font>DWORD</font> dwCertEncodingType,
-                                             <font>LPCTSTR</font> pszX500,
-                                             <font>DWORD</font> dwStrType,
-                                             <font>DWORD</font> *len);</pre>
-<p>Converts input string to name by calling <var class="PARAMETER">CertStrToName</var> function.</p>
+<a name="XMLSECMSCRYPTOCERTSTRTONAME"></a><h3>xmlSecMSCryptoCertStrToName ()</h3>
+<pre class="PROGRAMLISTING"><font>BYTE</font>*               xmlSecMSCryptoCertStrToName         (<font>DWORD</font> dwCertEncodingType,
+                                                         <font>LPCTSTR</font> pszX500,
+                                                         <font>DWORD</font> dwStrType,
+                                                         <font>DWORD</font> *len);</pre>
+<p>Converts input string to name by calling <code class="PARAMETER">CertStrToName</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30207"><span style="white-space: nowrap"><var class="PARAMETER">dwCertEncodingType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29129"><span style="white-space: nowrap"><code class="PARAMETER">dwCertEncodingType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the encoding used.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30212"><span style="white-space: nowrap"><var class="PARAMETER">pszX500</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29134"><span style="white-space: nowrap"><code class="PARAMETER">pszX500</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the string to convert.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30217"><span style="white-space: nowrap"><var class="PARAMETER">dwStrType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29139"><span style="white-space: nowrap"><code class="PARAMETER">dwStrType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the string type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30222"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29144"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the result len.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30227"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>a pointer to newly allocated string or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> a pointer to newly allocated string or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30232"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATADSAID"></a>xmlSecMSCryptoKeyDataDsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataDsaId</pre>
+<a name="XMLSECMSCRYPTOKEYDATADSAID"></a><h3>xmlSecMSCryptoKeyDataDsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30240"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATADSAGETKLASS"></a>xmlSecMSCryptoKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataDsaGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATADSAGETKLASS"></a><h3>xmlSecMSCryptoKeyDataDsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataDsaGetKlass    (void);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to DSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29170"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30255"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMDSASHA1ID"></a>xmlSecMSCryptoTransformDsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformDsaSha1Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMDSASHA1ID"></a><h3>xmlSecMSCryptoTransformDsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30263"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS"></a>xmlSecMSCryptoTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformDsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformDsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformDsaSha1GetKlass
+                                                        (void);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30273"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29191"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30278"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAGOST2001ID"></a>xmlSecMSCryptoKeyDataGost2001Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataGost2001Id</pre>
+<a name="XMLSECMSCRYPTOKEYDATAGOST2001ID"></a><h3>xmlSecMSCryptoKeyDataGost2001Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataGost2001Id</pre>
 <p>The GOST2001 key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30286"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS"></a>xmlSecMSCryptoKeyDataGost2001GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataGost2001GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAGOST2001GETKLASS"></a><h3>xmlSecMSCryptoKeyDataGost2001GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataGost2001GetKlass
+                                                        (void);</pre>
 <p>The GOST2001 key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to GOST2001 key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29212"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GOST2001 key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30301"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID"></a>xmlSecMSCryptoTransformGost2001GostR3411_94Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformGost2001GostR3411_94Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94ID"></a><h3>xmlSecMSCryptoTransformGost2001GostR3411_94Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformGost2001GostR3411_94Id</pre>
 <p>The GOST2001 GOSTR3411_94 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30309"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMGOST2001GOSTR3411-94GETKLASS"></a><h3>xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformGost2001GostR3411_94GetKlass
+                                                        (void);</pre>
 <p>The GOST2001-GOSTR3411_94 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30319"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>GOST2001-GOSTR3411_94 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29233"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> GOST2001-GOSTR3411_94 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30324"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATARSAID"></a>xmlSecMSCryptoKeyDataRsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataRsaId</pre>
+<a name="XMLSECMSCRYPTOKEYDATARSAID"></a><h3>xmlSecMSCryptoKeyDataRsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30332"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATARSAGETKLASS"></a>xmlSecMSCryptoKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataRsaGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATARSAGETKLASS"></a><h3>xmlSecMSCryptoKeyDataRsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataRsaGetKlass    (void);</pre>
 <p>The MSCrypto RSA CertKey data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30342"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to MSCrypto RSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29254"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to MSCrypto RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30347"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMRSASHA1ID"></a>xmlSecMSCryptoTransformRsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformRsaSha1Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMRSASHA1ID"></a><h3>xmlSecMSCryptoTransformRsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30355"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS"></a>xmlSecMSCryptoTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformRsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaSha1GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30365"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30370"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID"></a>xmlSecMSCryptoTransformRsaPkcs1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformRsaPkcs1Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1ID"></a><h3>xmlSecMSCryptoTransformRsaPkcs1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30378"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS"></a>xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformRsaPkcs1GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecMSCryptoTransformRsaPkcs1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformRsaPkcs1GetKlass
+                                                        (void);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30388"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-PKCS1 key transport transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30393"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMSHA1ID"></a>xmlSecMSCryptoTransformSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformSha1Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMSHA1ID"></a><h3>xmlSecMSCryptoTransformSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30401"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS"></a>xmlSecMSCryptoTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMSHA1GETKLASS"></a><h3>xmlSecMSCryptoTransformSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformSha1GetKlass (void);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30411"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-1 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29317"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30416"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID"></a>xmlSecMSCryptoTransformGostR3411_94Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformGostR3411_94Id</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94ID"></a><h3>xmlSecMSCryptoTransformGostR3411_94Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformGostR3411_94Id</pre>
 <p>The GOSTR3411_94 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30424"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS"></a>xmlSecMSCryptoTransformGostR3411_94GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformGostR3411_94GetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMGOSTR3411-94GETKLASS"></a><h3>xmlSecMSCryptoTransformGostR3411_94GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformGostR3411_94GetKlass
+                                                        (void);</pre>
 <p>GOSTR3411_94 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30434"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to GOSTR3411_94 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29338"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to GOSTR3411_94 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30439"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAAESID"></a>xmlSecMSCryptoKeyDataAesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataAesId</pre>
+<a name="XMLSECMSCRYPTOKEYDATAAESID"></a><h3>xmlSecMSCryptoKeyDataAesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataAesId</pre>
 <p>The AES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30447"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAAESGETKLASS"></a>xmlSecMSCryptoKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataAesGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAAESGETKLASS"></a><h3>xmlSecMSCryptoKeyDataAesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataAesGetKlass    (void);</pre>
 <p>The AES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30457"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29359"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30462"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAAESSET"></a>xmlSecMSCryptoKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeyDataAesSet     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAAESSET"></a><h3>xmlSecMSCryptoKeyDataAesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataAesSet         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30475"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29376"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30480"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29381"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30485"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29386"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30490"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29391"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30495"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES128CBCID"></a>xmlSecMSCryptoTransformAes128CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformAes128CbcId</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES128CBCID"></a><h3>xmlSecMSCryptoTransformAes128CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30503"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS"></a>xmlSecMSCryptoTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformAes128CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes128CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes128CbcGetKlass
+                                                        (void);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30513"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 128 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29412"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30518"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES192CBCID"></a>xmlSecMSCryptoTransformAes192CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformAes192CbcId</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES192CBCID"></a><h3>xmlSecMSCryptoTransformAes192CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30526"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS"></a>xmlSecMSCryptoTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformAes192CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes192CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes192CbcGetKlass
+                                                        (void);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30536"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 192 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29433"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30541"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES256CBCID"></a>xmlSecMSCryptoTransformAes256CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformAes256CbcId</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES256CBCID"></a><h3>xmlSecMSCryptoTransformAes256CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30549"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS"></a>xmlSecMSCryptoTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformAes256CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformAes256CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformAes256CbcGetKlass
+                                                        (void);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30559"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 256 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29454"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30564"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATADESID"></a>xmlSecMSCryptoKeyDataDesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataDesId</pre>
+<a name="XMLSECMSCRYPTOKEYDATADESID"></a><h3>xmlSecMSCryptoKeyDataDesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataDesId</pre>
 <p>The DES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30572"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATADESGETKLASS"></a>xmlSecMSCryptoKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataDesGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATADESGETKLASS"></a><h3>xmlSecMSCryptoKeyDataDesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataDesGetKlass    (void);</pre>
 <p>The DES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30582"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29475"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30587"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMDES3CBCID"></a>xmlSecMSCryptoTransformDes3CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoTransformDes3CbcId</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMDES3CBCID"></a><h3>xmlSecMSCryptoTransformDes3CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30595"></a><h3>
-<a name="XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS"></a>xmlSecMSCryptoTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecMSCryptoTransformDes3CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecMSCryptoTransformDes3CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecMSCryptoTransformDes3CbcGetKlass
+                                                        (void);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30605"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to Triple DES encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29496"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-certkeys.html"><b>&lt;&lt;&lt;certkeys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-keysstore.html"><b>keysstore&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-certkeys.html"><b>&lt;&lt;&lt; certkeys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-keysstore.html"><b>keysstore &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-keysstore.html b/docs/api/xmlsec-mscrypto-keysstore.html
index 5b2b9f1..c846170 100644
--- a/docs/api/xmlsec-mscrypto-keysstore.html
+++ b/docs/api/xmlsec-mscrypto-keysstore.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keysstore</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="PREVIOUS" title="crypto" href="xmlsec-mscrypto-crypto.html">
 <link rel="NEXT" title="x509" href="xmlsec-mscrypto-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,136 +87,127 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN30615"></a><h2>Name</h2>keysstore--Keys store implementation for MS Crypto.</div>
+<a name="AEN29506"></a><h2>Name</h2>keysstore -- Keys store implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN30618"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREID">xmlSecMSCryptoKeysStoreId</a>
-<font>xmlSecKeyStoreId</font> <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREGETKLASS">xmlSecMSCryptoKeysStoreGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREADOPTKEY">xmlSecMSCryptoKeysStoreAdoptKey</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORELOAD">xmlSecMSCryptoKeysStoreLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>         <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORESAVE">xmlSecMSCryptoKeysStoreSave</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSEC-MSCRYPTO-KEYSSTORE.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREID">xmlSecMSCryptoKeysStoreId</a>
+<font>xmlSecKeyStoreId</font>    <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREGETKLASS">xmlSecMSCryptoKeysStoreGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTOREADOPTKEY">xmlSecMSCryptoKeysStoreAdoptKey</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORELOAD">xmlSecMSCryptoKeysStoreLoad</a>         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>int</font>                 <a href="xmlsec-mscrypto-keysstore.html#XMLSECMSCRYPTOKEYSSTORESAVE">xmlSecMSCryptoKeysStoreSave</a>         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN30638"></a><h2>Description</h2>
+<a name="XMLSEC-MSCRYPTO-KEYSSTORE.DESCRIPTION"></a><h2>Description</h2>
 <p>Keys store implementation for MS Crypto.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN30641"></a><h2>Details</h2>
+<a name="XMLSEC-MSCRYPTO-KEYSSTORE.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN30643"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSSTOREID"></a>xmlSecMSCryptoKeysStoreId</h3>
+<a name="XMLSECMSCRYPTOKEYSSTOREID"></a><h3>xmlSecMSCryptoKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecMSCryptoKeysStoreId	xmlSecMSCryptoKeysStoreGetKlass()</pre>
 <p>A MSCrypto keys store klass id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30651"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSSTOREGETKLASS"></a>xmlSecMSCryptoKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font> xmlSecMSCryptoKeysStoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYSSTOREGETKLASS"></a><h3>xmlSecMSCryptoKeysStoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecMSCryptoKeysStoreGetKlass     (void);</pre>
 <p>The MSCrypto list based keys store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30661"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>MSCrypto list based keys store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29550"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> MSCrypto list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30666"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSSTOREADOPTKEY"></a>xmlSecMSCryptoKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeysStoreAdoptKey (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECMSCRYPTOKEYSSTOREADOPTKEY"></a><h3>xmlSecMSCryptoKeysStoreAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreAdoptKey     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30680"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29568"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30685"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29573"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30690"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29578"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30695"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSSTORELOAD"></a>xmlSecMSCryptoKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeysStoreLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECMSCRYPTOKEYSSTORELOAD"></a><h3>xmlSecMSCryptoKeysStoreLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreLoad         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30708"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29595"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30713"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29600"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30718"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29605"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30723"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29610"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30728"></a><h3>
-<a name="XMLSECMSCRYPTOKEYSSTORESAVE"></a>xmlSecMSCryptoKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeysStoreSave     (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Writes keys from <var class="PARAMETER">store</var> to an XML file.</p>
+<a name="XMLSECMSCRYPTOKEYSSTORESAVE"></a><h3>xmlSecMSCryptoKeysStoreSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeysStoreSave         (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30742"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29628"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCrypto keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30747"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29633"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30752"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29638"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30757"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29643"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-crypto.html"><b>&lt;&lt;&lt;crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-x509.html"><b>x509&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-x509.html"><b>x509 &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-ref.html b/docs/api/xmlsec-mscrypto-ref.html
index b97033d..3400a66 100644
--- a/docs/api/xmlsec-mscrypto-ref.html
+++ b/docs/api/xmlsec-mscrypto-ref.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library for MSCrypto API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="x509" href="xmlsec-nss-x509.html">
 <link rel="NEXT" title="app" href="xmlsec-mscrypto-app.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -91,23 +90,23 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-mscrypto-app.html">app</a>--Application functions implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-app.html">app</a> -- Application functions implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-certkeys.html">certkeys</a>--MS Crypto certificates helper functions.</dt>
+<a href="xmlsec-mscrypto-certkeys.html">certkeys</a> -- MS Crypto certificates helper functions.</dt>
 <dt>
-<a href="xmlsec-mscrypto-crypto.html">crypto</a>--Crypto transforms implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-crypto.html">crypto</a> -- Crypto transforms implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-keysstore.html">keysstore</a>--Keys store implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-keysstore.html">keysstore</a> -- Keys store implementation for MS Crypto.</dt>
 <dt>
-<a href="xmlsec-mscrypto-x509.html">x509</a>--X509 certificates support implementation for MS Crypto.</dt>
+<a href="xmlsec-mscrypto-x509.html">x509</a> -- X509 certificates support implementation for MS Crypto.</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-mscrypto. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-x509.html"><b>&lt;&lt;&lt;x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-app.html"><b>app&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-x509.html"><b>&lt;&lt;&lt; x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-mscrypto-x509.html b/docs/api/xmlsec-mscrypto-x509.html
index a6e23aa..0911273 100644
--- a/docs/api/xmlsec-mscrypto-x509.html
+++ b/docs/api/xmlsec-mscrypto-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>x509</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
 <link rel="PREVIOUS" title="keysstore" href="xmlsec-mscrypto-keysstore.html">
 <link rel="NEXT" title="XML Security Library Reference Index" href="xmlsec-index.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,534 +87,491 @@
 <h1>
 <a name="XMLSEC-MSCRYPTO-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN30767"></a><h2>Name</h2>x509--X509 certificates support implementation for MS Crypto.</div>
+<a name="AEN29653"></a><h2>Name</h2>x509 -- X509 certificates support implementation for MS Crypto.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN30770"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ID">xmlSecMSCryptoKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKLASS">xmlSecMSCryptoKeyDataX509GetKlass</a>
-                                            (void);
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKEYCERT">xmlSecMSCryptoKeyDataX509GetKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT">xmlSecMSCryptoKeyDataX509AdoptKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCERT_CONTEXT</font> cert);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCERT">xmlSecMSCryptoKeyDataX509AdoptCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCERT_CONTEXT</font> cert);
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERT">xmlSecMSCryptoKeyDataX509GetCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE">xmlSecMSCryptoKeyDataX509GetCertsSize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCRL">xmlSecMSCryptoKeyDataX509AdoptCrl</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCRL_CONTEXT</font> crl);
-<font>PCCRL_CONTEXT</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRL">xmlSecMSCryptoKeyDataX509GetCrl</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE">xmlSecMSCryptoKeyDataX509GetCrlsSize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-#define     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTID">xmlSecMSCryptoKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS">xmlSecMSCryptoKeyDataRawX509CertGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREID">xmlSecMSCryptoX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">xmlSecMSCryptoX509StoreGetKlass</a>
-                                            (void);
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREFINDCERT">xmlSecMSCryptoX509StoreFindCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>PCCERT_CONTEXT</font> <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREVERIFY">xmlSecMSCryptoX509StoreVerify</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> certs,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTCERT">xmlSecMSCryptoX509StoreAdoptCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>PCCERT_CONTEXT</font> cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTKEYSTORE">xmlSecMSCryptoX509StoreAdoptKeyStore</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> keyStore);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptTrustedStore</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> trustedStore);
-<font>int</font>         <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptUntrustedStore</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> untrustedStore);
-<font>void</font>        <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>int</font> val);</pre>
+<a name="XMLSEC-MSCRYPTO-X509.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ID">xmlSecMSCryptoKeyDataX509Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKLASS">xmlSecMSCryptoKeyDataX509GetKlass</a>   (void);
+<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETKEYCERT">xmlSecMSCryptoKeyDataX509GetKeyCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT">xmlSecMSCryptoKeyDataX509AdoptKeyCert</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCERT_CONTEXT</font> cert);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCERT">xmlSecMSCryptoKeyDataX509AdoptCert</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCERT_CONTEXT</font> cert);
+<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERT">xmlSecMSCryptoKeyDataX509GetCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE">xmlSecMSCryptoKeyDataX509GetCertsSize</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509ADOPTCRL">xmlSecMSCryptoKeyDataX509AdoptCrl</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCRL_CONTEXT</font> crl);
+<font>PCCRL_CONTEXT</font>       <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRL">xmlSecMSCryptoKeyDataX509GetCrl</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE">xmlSecMSCryptoKeyDataX509GetCrlsSize</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+#define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTID">xmlSecMSCryptoKeyDataRawX509CertId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS">xmlSecMSCryptoKeyDataRawX509CertGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREID">xmlSecMSCryptoX509StoreId</a>
+<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREGETKLASS">xmlSecMSCryptoX509StoreGetKlass</a>   (void);
+<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREFINDCERT">xmlSecMSCryptoX509StoreFindCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>PCCERT_CONTEXT</font>      <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREVERIFY">xmlSecMSCryptoX509StoreVerify</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> certs,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTCERT">xmlSecMSCryptoX509StoreAdoptCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>PCCERT_CONTEXT</font> cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTKEYSTORE">xmlSecMSCryptoX509StoreAdoptKeyStore</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> keyStore);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptTrustedStore</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> trustedStore);
+<font>int</font>                 <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE">xmlSecMSCryptoX509StoreAdoptUntrustedStore</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> untrustedStore);
+<font>void</font>                <a href="xmlsec-mscrypto-x509.html#XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS">xmlSecMSCryptoX509StoreEnableSystemTrustedCerts</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>int</font> val);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN30845"></a><h2>Description</h2>
+<a name="XMLSEC-MSCRYPTO-X509.DESCRIPTION"></a><h2>Description</h2>
 <p>X509 certificates support implementation for MS Crypto.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN30848"></a><h2>Details</h2>
+<a name="XMLSEC-MSCRYPTO-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN30850"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509ID"></a>xmlSecMSCryptoKeyDataX509Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataX509Id</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509ID"></a><h3>xmlSecMSCryptoKeyDataX509Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataX509Id</pre>
 <p>The MSCrypto X509 data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30858"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETKLASS"></a>xmlSecMSCryptoKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataX509GetKlass
-                                            (void);</pre>
-<p>The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-X509Data</span></font>).</p>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETKLASS"></a><h3>xmlSecMSCryptoKeyDataX509GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataX509GetKlass   (void);</pre>
+<p>The MSCrypto X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN30870"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the X509 data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29754"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30875"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETKEYCERT"></a>xmlSecMSCryptoKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoKeyDataX509GetKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETKEYCERT"></a><h3>xmlSecMSCryptoKeyDataX509GetKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataX509GetKeyCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30886"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29769"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30891"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the key's certificate or NULL if key data was not used for key
+<td align="LEFT" valign="TOP"><a name="AEN29774"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30896"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT"></a>xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeyDataX509AdoptKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCERT_CONTEXT</font> cert);</pre>
-<p>Sets the key's certificate in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecMSCryptoKeyDataX509AdoptKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptKeyCert
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCERT_CONTEXT</font> cert);</pre>
+<p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30909"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29791"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30914"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29796"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29801"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30924"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCERT"></a>xmlSecMSCryptoKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeyDataX509AdoptCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCERT_CONTEXT</font> cert);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCERT"></a><h3>xmlSecMSCryptoKeyDataX509AdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptCert  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCERT_CONTEXT</font> cert);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30936"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29817"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30941"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29822"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCRYPTO X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30946"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29827"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30951"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETCERT"></a>xmlSecMSCryptoKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoKeyDataX509GetCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETCERT"></a><h3>xmlSecMSCryptoKeyDataX509GetCert ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoKeyDataX509GetCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30963"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29843"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30968"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29848"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30973"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to certificate or NULL if <var class="PARAMETER">pos</var> is larger than the 
-number of certificates in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29853"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the 
+number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN30980"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE"></a>xmlSecMSCryptoKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecMSCryptoKeyDataX509GetCertsSize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of certificates in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecMSCryptoKeyDataX509GetCertsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecMSCryptoKeyDataX509GetCertsSize
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30992"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29871"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN30997"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of certificates in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29876"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31003"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCRL"></a>xmlSecMSCryptoKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoKeyDataX509AdoptCrl
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>PCCRL_CONTEXT</font> crl);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509ADOPTCRL"></a><h3>xmlSecMSCryptoKeyDataX509AdoptCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoKeyDataX509AdoptCrl   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>PCCRL_CONTEXT</font> crl);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31015"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29893"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31020"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29898"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to MSCrypto X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31030"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETCRL"></a>xmlSecMSCryptoKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCRL_CONTEXT</font> xmlSecMSCryptoKeyDataX509GetCrl
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETCRL"></a><h3>xmlSecMSCryptoKeyDataX509GetCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCRL_CONTEXT</font>       xmlSecMSCryptoKeyDataX509GetCrl     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31042"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29919"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31047"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29924"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31052"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to CRL or NULL if <var class="PARAMETER">pos</var> is larger than the
-number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29929"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the
+number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31059"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE"></a>xmlSecMSCryptoKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecMSCryptoKeyDataX509GetCrlsSize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of CRLs in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECMSCRYPTOKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecMSCryptoKeyDataX509GetCrlsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecMSCryptoKeyDataX509GetCrlsSize
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31071"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN29947"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31076"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of CRLs in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29952"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31082"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATARAWX509CERTID"></a>xmlSecMSCryptoKeyDataRawX509CertId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoKeyDataRawX509CertId</pre>
+<a name="XMLSECMSCRYPTOKEYDATARAWX509CERTID"></a><h3>xmlSecMSCryptoKeyDataRawX509CertId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoKeyDataRawX509CertId</pre>
 <p>The MSCrypto raw X509 certificate klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31090"></a><h3>
-<a name="XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS"></a>xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecMSCryptoKeyDataRawX509CertGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecMSCryptoKeyDataRawX509CertGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecMSCryptoKeyDataRawX509CertGetKlass
+                                                        (void);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN31100"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>raw X509 certificates key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31105"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREID"></a>xmlSecMSCryptoX509StoreId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecMSCryptoX509StoreId</pre>
+<a name="XMLSECMSCRYPTOX509STOREID"></a><h3>xmlSecMSCryptoX509StoreId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecMSCryptoX509StoreId</pre>
 <p>The MSCrypto X509 store klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31113"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREGETKLASS"></a>xmlSecMSCryptoX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font> xmlSecMSCryptoX509StoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECMSCRYPTOX509STOREGETKLASS"></a><h3>xmlSecMSCryptoX509StoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecMSCryptoX509StoreGetKlass   (void);</pre>
 <p>The MSCrypto X509 certificates key data store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN31123"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to MSCrypto X509 certificates key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN29995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to MSCrypto X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31128"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREFINDCERT"></a>xmlSecMSCryptoX509StoreFindCert ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoX509StoreFindCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Searches <var class="PARAMETER">store</var> for a certificate that matches given criteria.</p>
+<a name="XMLSECMSCRYPTOX509STOREFINDCERT"></a><h3>xmlSecMSCryptoX509StoreFindCert ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoX509StoreFindCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Searches <code class="PARAMETER">store</code> for a certificate that matches given criteria.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31145"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30016"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>          the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31150"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30021"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>    the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31155"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30026"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the desired certificate issuer name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31160"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30031"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>   the desired certificate issuer serial number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31165"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30036"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>            the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31170"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30041"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to found certificate or NULL if certificate is not found
+<td align="LEFT" valign="TOP"><a name="AEN30047"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to found certificate or NULL if certificate is not found
 or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31181"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREVERIFY"></a>xmlSecMSCryptoX509StoreVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font> xmlSecMSCryptoX509StoreVerify
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> certs,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Verifies <var class="PARAMETER">certs</var> list.</p>
+<a name="XMLSECMSCRYPTOX509STOREVERIFY"></a><h3>xmlSecMSCryptoX509StoreVerify ()</h3>
+<pre class="PROGRAMLISTING"><font>PCCERT_CONTEXT</font>      xmlSecMSCryptoX509StoreVerify       (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> certs,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Verifies <code class="PARAMETER">certs</code> list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31195"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30065"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the pointer to X509 certificate context store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31200"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30070"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31205"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30075"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31211"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the first verified certificate from <var class="PARAMETER">certs</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30081"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the first verified certificate from <code class="PARAMETER">certs</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31217"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREADOPTCERT"></a>xmlSecMSCryptoX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoX509StoreAdoptCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>PCCERT_CONTEXT</font> cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECMSCRYPTOX509STOREADOPTCERT"></a><h3>xmlSecMSCryptoX509StoreAdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>PCCERT_CONTEXT</font> cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31230"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30099"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31235"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30104"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to PCCERT_CONTEXT X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31240"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30109"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31245"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31250"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREADOPTKEYSTORE"></a>xmlSecMSCryptoX509StoreAdoptKeyStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoX509StoreAdoptKeyStore
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> keyStore);</pre>
-<p>Adds <var class="PARAMETER">keyStore</var> to the list of key stores.</p>
+<a name="XMLSECMSCRYPTOX509STOREADOPTKEYSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptKeyStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptKeyStore
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> keyStore);</pre>
+<p>Adds <code class="PARAMETER">keyStore</code> to the list of key stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31263"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30131"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31268"><span style="white-space: nowrap"><var class="PARAMETER">keyStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30136"><span style="white-space: nowrap"><code class="PARAMETER">keyStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31273"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30141"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31278"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE"></a>xmlSecMSCryptoX509StoreAdoptTrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoX509StoreAdoptTrustedStore
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> trustedStore);</pre>
-<p>Adds <var class="PARAMETER">trustedStore</var> to the list of trusted certs stores.</p>
+<a name="XMLSECMSCRYPTOX509STOREADOPTTRUSTEDSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptTrustedStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptTrustedStore
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> trustedStore);</pre>
+<p>Adds <code class="PARAMETER">trustedStore</code> to the list of trusted certs stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31291"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30158"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31296"><span style="white-space: nowrap"><var class="PARAMETER">trustedStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30163"><span style="white-space: nowrap"><code class="PARAMETER">trustedStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>       the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31301"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30168"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31306"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE"></a>xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecMSCryptoX509StoreAdoptUntrustedStore
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>HCERTSTORE</font> untrustedStore);</pre>
-<p>Adds <var class="PARAMETER">trustedStore</var> to the list of un-trusted certs stores.</p>
+<a name="XMLSECMSCRYPTOX509STOREADOPTUNTRUSTEDSTORE"></a><h3>xmlSecMSCryptoX509StoreAdoptUntrustedStore ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecMSCryptoX509StoreAdoptUntrustedStore
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>HCERTSTORE</font> untrustedStore);</pre>
+<p>Adds <code class="PARAMETER">trustedStore</code> to the list of un-trusted certs stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31319"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30185"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31324"><span style="white-space: nowrap"><var class="PARAMETER">untrustedStore</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30190"><span style="white-space: nowrap"><code class="PARAMETER">untrustedStore</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the pointer to certs store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31329"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN30195"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN31334"></a><h3>
-<a name="XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS"></a>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>int</font> val);</pre>
+<a name="XMLSECMSCRYPTOX509STOREENABLESYSTEMTRUSTEDCERTS"></a><h3>xmlSecMSCryptoX509StoreEnableSystemTrustedCerts ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecMSCryptoX509StoreEnableSystemTrustedCerts
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>int</font> val);</pre>
 <p>Enables/disables the system trusted certs.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31346"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30211"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN31351"><span style="white-space: nowrap"><var class="PARAMETER">val</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN30216"><span style="white-space: nowrap"><code class="PARAMETER">val</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>                the enable/disable flag</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-mscrypto-keysstore.html"><b>&lt;&lt;&lt;keysstore</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-index.html"><b>XML Security Library Reference Index&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-mscrypto-keysstore.html"><b>&lt;&lt;&lt; keysstore</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-index.html"><b>XML Security Library Reference Index &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nodeset.html b/docs/api/xmlsec-nodeset.html
index 7631f72..277a6d7 100644
--- a/docs/api/xmlsec-nodeset.html
+++ b/docs/api/xmlsec-nodeset.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>nodeset</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="membuf" href="xmlsec-membuf.html">
 <link rel="NEXT" title="parser" href="xmlsec-parser.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,53 +87,50 @@
 <h1>
 <a name="XMLSEC-NODESET"></a>nodeset</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12021"></a><h2>Name</h2>nodeset--Nodeset object implementation.</div>
+<a name="AEN11540"></a><h2>Name</h2>nodeset -- Nodeset object implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN12024"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-enum        <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a>;
-enum        <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a>;
-struct      <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
-<font>int</font>         (<a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">*xmlSecNodeSetWalkCallback</a>)    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlNodePtr</font> cur,
-                                             <font>xmlNodePtr</font> parent,
-                                             <font>void</font> *data);
-<font>xmlSecNodeSetPtr</font> <a href="xmlsec-nodeset.html#XMLSECNODESETCREATE">xmlSecNodeSetCreate</a>        (<font>xmlDocPtr</font> doc,
-                                             <font>xmlNodeSetPtr</font> nodes,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);
-<font>void</font>        <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY">xmlSecNodeSetDestroy</a>            (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
-<font>void</font>        <a href="xmlsec-nodeset.html#XMLSECNODESETDOCDESTROY">xmlSecNodeSetDocDestroy</a>         (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
-<font>int</font>         <a href="xmlsec-nodeset.html#XMLSECNODESETCONTAINS">xmlSecNodeSetContains</a>           (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> parent);
-<font>xmlSecNodeSetPtr</font> <a href="xmlsec-nodeset.html#XMLSECNODESETADD">xmlSecNodeSetAdd</a>           (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
-<font>xmlSecNodeSetPtr</font> <a href="xmlsec-nodeset.html#XMLSECNODESETADDLIST">xmlSecNodeSetAddList</a>       (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
-<font>xmlSecNodeSetPtr</font> <a href="xmlsec-nodeset.html#XMLSECNODESETGETCHILDREN">xmlSecNodeSetGetChildren</a>   (<font>xmlDocPtr</font> doc,
-                                             const <font>xmlNodePtr</font> parent,
-                                             <font>int</font> withComments,
-                                             <font>int</font> invert);
-<font>int</font>         <a href="xmlsec-nodeset.html#XMLSECNODESETWALK">xmlSecNodeSetWalk</a>               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
-                                             <font>void</font> *data);
-<font>int</font>         <a href="xmlsec-nodeset.html#XMLSECNODESETDUMPTEXTNODES">xmlSecNodeSetDumpTextNodes</a>      (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlOutputBufferPtr</font> out);
-<font>void</font>        <a href="xmlsec-nodeset.html#XMLSECNODESETDEBUGDUMP">xmlSecNodeSetDebugDump</a>          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSEC-NODESET.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">enum                <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a>;
+enum                <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a>;
+struct              <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
+<font>int</font>                 (<a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">*xmlSecNodeSetWalkCallback</a>)        (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <font>xmlNodePtr</font> parent,
+                                                         <font>void</font> *data);
+<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETCREATE">xmlSecNodeSetCreate</a>                 (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlNodeSetPtr</font> nodes,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);
+<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY">xmlSecNodeSetDestroy</a>                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
+<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDOCDESTROY">xmlSecNodeSetDocDestroy</a>             (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);
+<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETCONTAINS">xmlSecNodeSetContains</a>               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> parent);
+<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETADD">xmlSecNodeSetAdd</a>                    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
+<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETADDLIST">xmlSecNodeSetAddList</a>                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);
+<font>xmlSecNodeSetPtr</font>    <a href="xmlsec-nodeset.html#XMLSECNODESETGETCHILDREN">xmlSecNodeSetGetChildren</a>            (<font>xmlDocPtr</font> doc,
+                                                         const <font>xmlNodePtr</font> parent,
+                                                         <font>int</font> withComments,
+                                                         <font>int</font> invert);
+<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETWALK">xmlSecNodeSetWalk</a>                   (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
+                                                         <font>void</font> *data);
+<font>int</font>                 <a href="xmlsec-nodeset.html#XMLSECNODESETDUMPTEXTNODES">xmlSecNodeSetDumpTextNodes</a>          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlOutputBufferPtr</font> out);
+<font>void</font>                <a href="xmlsec-nodeset.html#XMLSECNODESETDEBUGDUMP">xmlSecNodeSetDebugDump</a>              (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>FILE</font> *output);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN12081"></a><h2>Description</h2>
+<a name="XMLSEC-NODESET.DESCRIPTION"></a><h2>Description</h2>
 <p>Nodeset object implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN12084"></a><h2>Details</h2>
+<a name="XMLSEC-NODESET.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN12086"></a><h3>
-<a name="XMLSECNODESETTYPE"></a>enum xmlSecNodeSetType</h3>
+<a name="XMLSECNODESETTYPE"></a><h3>enum xmlSecNodeSetType</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecNodeSetNormal = 0,
     xmlSecNodeSetInvert,
@@ -149,43 +145,42 @@ struct      <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12095"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetNormal</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETNORMAL"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetNormal</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	nodes set = nodes in the list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12100"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetInvert</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetInvert</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>  	nodes set = all document nodes minus nodes in the list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12105"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetTree</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTree</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		nodes set = nodes in the list and all their subtress.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12110"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetTreeWithoutComments</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEWITHOUTCOMMENTS"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeWithoutComments</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		nodes set = nodes in the list and 
 			all their subtress but no comment nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12115"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetTreeInvert</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeInvert</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	nodes set = all document nodes minus nodes in the 
 				list and all their subtress.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12120"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetTreeWithoutCommentsInvert</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETTREEWITHOUTCOMMENTSINVERT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetTreeWithoutCommentsInvert</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	nodes set = all document nodes 
 				minus (nodes in the list and all their subtress 
 			plus all comment nodes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12125"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetList</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETLIST"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetList</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		nodes set = all nodes in the chidren list of nodes sets.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12130"></a><h3>
-<a name="XMLSECNODESETOP"></a>enum xmlSecNodeSetOp</h3>
+<a name="XMLSECNODESETOP"></a><h3>enum xmlSecNodeSetOp</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecNodeSetIntersection = 0,
     xmlSecNodeSetSubtraction,
@@ -196,25 +191,23 @@ struct      <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12139"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetIntersection</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETINTERSECTION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetIntersection</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	intersection.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12144"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetSubtraction</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETSUBTRACTION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetSubtraction</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	subtraction.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12149"><span style="white-space: nowrap"><var class="LITERAL">xmlSecNodeSetUnion</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECNODESETUNION"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecNodeSetUnion</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	union.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12154"></a><h3>
-<a name="XMLSECNODESET"></a>struct xmlSecNodeSet</h3>
+<a name="XMLSECNODESET"></a><h3>struct xmlSecNodeSet</h3>
 <pre class="PROGRAMLISTING">struct xmlSecNodeSet {
-
     xmlNodeSetPtr	nodes;
     xmlDocPtr		doc;
     int			destroyDoc;
@@ -229,345 +222,334 @@ struct      <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSet</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12163"><span style="white-space: nowrap"><font>xmlNodeSetPtr</font> <code class="STRUCTFIELD">nodes</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11679"><span style="white-space: nowrap"><font>xmlNodeSetPtr</font> <code class="STRUCTFIELD">nodes</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the nodes list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12169"><span style="white-space: nowrap"><font>xmlDocPtr</font> <code class="STRUCTFIELD">doc</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11685"><span style="white-space: nowrap"><font>xmlDocPtr</font> <code class="STRUCTFIELD">doc</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the parent XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12175"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">destroyDoc</code></span></a></td>
-<td align="LEFT" valign="TOP"><p>			the flag: if set to 1 then <var class="PARAMETER">doc</var> will
+<td align="LEFT" valign="TOP"><a name="AEN11691"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">destroyDoc</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>			the flag: if set to 1 then <code class="PARAMETER">doc</code> will
 			be destroyed when node set is destroyed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12182"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> <code class="STRUCTFIELD">type</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11698"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> <code class="STRUCTFIELD">type</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the nodes set type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12188"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> <code class="STRUCTFIELD">op</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11704"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> <code class="STRUCTFIELD">op</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12194"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">next</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11710"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">next</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the next nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12200"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">prev</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11716"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the previous nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12206"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">children</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11722"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">children</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the children list (valid only if type 
-			equal to <font><span class="TYPE">xmlSecNodeSetList</span></font>).</p></td>
+			equal to <a href="xmlsec-nodeset.html#XMLSECNODESETLIST"><span class="TYPE">xmlSecNodeSetList</span></a>).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12214"></a><h3>
-<a name="XMLSECNODESETWALKCALLBACK"></a>xmlSecNodeSetWalkCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecNodeSetWalkCallback)    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlNodePtr</font> cur,
-                                             <font>xmlNodePtr</font> parent,
-                                             <font>void</font> *data);</pre>
+<a name="XMLSECNODESETWALKCALLBACK"></a><h3>xmlSecNodeSetWalkCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecNodeSetWalkCallback)        (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         <font>xmlNodePtr</font> parent,
+                                                         <font>void</font> *data);</pre>
 <p>The callback function called once per each node in the nodes set.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12228"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11743"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12235"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11750"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer current XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12240"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 			the pointer to the <var class="PARAMETER">cur</var> parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11755"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 			the pointer to the <code class="PARAMETER">cur</code> parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12246"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11761"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to application specific data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12251"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs
+<td align="LEFT" valign="TOP"><a name="AEN11766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs
 an walk procedure should be interrupted.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12256"></a><h3>
-<a name="XMLSECNODESETCREATE"></a>xmlSecNodeSetCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font> xmlSecNodeSetCreate        (<font>xmlDocPtr</font> doc,
-                                             <font>xmlNodeSetPtr</font> nodes,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);</pre>
+<a name="XMLSECNODESETCREATE"></a><h3>xmlSecNodeSetCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetCreate                 (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlNodeSetPtr</font> nodes,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> type);</pre>
 <p>Creates new nodes set. Caller is responsible for freeng returend object
 by calling <a href="xmlsec-nodeset.html#XMLSECNODESETDESTROY"><span class="TYPE">xmlSecNodeSetDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12271"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11785"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to parent XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12276"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11790"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the list of nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12281"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11795"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the nodes set type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12286"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated node set or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11800"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated node set or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12291"></a><h3>
-<a name="XMLSECNODESETDESTROY"></a>xmlSecNodeSetDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecNodeSetDestroy            (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
+<a name="XMLSECNODESETDESTROY"></a><h3>xmlSecNodeSetDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDestroy                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
 <p>Destroys the nodes set created with <a href="xmlsec-nodeset.html#XMLSECNODESETCREATE"><span class="TYPE">xmlSecNodeSetCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN12304"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11817"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12309"></a><h3>
-<a name="XMLSECNODESETDOCDESTROY"></a>xmlSecNodeSetDocDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecNodeSetDocDestroy         (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
+<a name="XMLSECNODESETDOCDESTROY"></a><h3>xmlSecNodeSetDocDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDocDestroy             (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset);</pre>
 <p>Instructs node set to destroy nodes parent doc when node set is destroyed.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN12320"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11832"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12325"></a><h3>
-<a name="XMLSECNODESETCONTAINS"></a>xmlSecNodeSetContains ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNodeSetContains           (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> parent);</pre>
-<p>Checks whether the <var class="PARAMETER">node</var> is in the nodes set or not.</p>
+<a name="XMLSECNODESETCONTAINS"></a><h3>xmlSecNodeSetContains ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetContains               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> parent);</pre>
+<p>Checks whether the <code class="PARAMETER">node</code> is in the nodes set or not.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12339"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11850"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12344"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11855"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to XML node to check.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12349"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the pointer to <var class="PARAMETER">node</var> parent node.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN11860"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the pointer to <code class="PARAMETER">node</code> parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12355"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if the <var class="PARAMETER">node</var> is in the nodes set <var class="PARAMETER">nset</var>, 0 if it is not
+<td align="LEFT" valign="TOP"><a name="AEN11866"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if the <code class="PARAMETER">node</code> is in the nodes set <code class="PARAMETER">nset</code>, 0 if it is not
 and a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12362"></a><h3>
-<a name="XMLSECNODESETADD"></a>xmlSecNodeSetAdd ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font> xmlSecNodeSetAdd           (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
-<p>Adds <var class="PARAMETER">newNSet</var> to the <var class="PARAMETER">nset</var> using operation <var class="PARAMETER">op</var>.</p>
+<a name="XMLSECNODESETADD"></a><h3>xmlSecNodeSetAdd ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetAdd                    (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
+<p>Adds <code class="PARAMETER">newNSet</code> to the <code class="PARAMETER">nset</code> using operation <code class="PARAMETER">op</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12378"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11888"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to currrent nodes set (or NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12383"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11893"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to new nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12388"><span style="white-space: nowrap"><var class="PARAMETER">op</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11898"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12393"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to combined nodes set or NULL if an error 
+<td align="LEFT" valign="TOP"><a name="AEN11903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to combined nodes set or NULL if an error 
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12398"></a><h3>
-<a name="XMLSECNODESETADDLIST"></a>xmlSecNodeSetAddList ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font> xmlSecNodeSetAddList       (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
-<p>Adds <var class="PARAMETER">newNSet</var> to the <var class="PARAMETER">nset</var> as child using operation <var class="PARAMETER">op</var>.</p>
+<a name="XMLSECNODESETADDLIST"></a><h3>xmlSecNodeSetAddList ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetAddList                (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> newNSet,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETOP">xmlSecNodeSetOp</a> op);</pre>
+<p>Adds <code class="PARAMETER">newNSet</code> to the <code class="PARAMETER">nset</code> as child using operation <code class="PARAMETER">op</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12414"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11923"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to currrent nodes set (or NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12419"><span style="white-space: nowrap"><var class="PARAMETER">newNSet</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11928"><span style="white-space: nowrap"><code class="PARAMETER">newNSet</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to new nodes set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12424"><span style="white-space: nowrap"><var class="PARAMETER">op</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11933"><span style="white-space: nowrap"><code class="PARAMETER">op</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the operation type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12429"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to combined nodes set or NULL if an error 
+<td align="LEFT" valign="TOP"><a name="AEN11938"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to combined nodes set or NULL if an error 
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12434"></a><h3>
-<a name="XMLSECNODESETGETCHILDREN"></a>xmlSecNodeSetGetChildren ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font> xmlSecNodeSetGetChildren   (<font>xmlDocPtr</font> doc,
-                                             const <font>xmlNodePtr</font> parent,
-                                             <font>int</font> withComments,
-                                             <font>int</font> invert);</pre>
+<a name="XMLSECNODESETGETCHILDREN"></a><h3>xmlSecNodeSetGetChildren ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecNodeSetPtr</font>    xmlSecNodeSetGetChildren            (<font>xmlDocPtr</font> doc,
+                                                         const <font>xmlNodePtr</font> parent,
+                                                         <font>int</font> withComments,
+                                                         <font>int</font> invert);</pre>
 <p>Creates a new nodes set that contains:
- - if <var class="PARAMETER">withComments</var> is not 0 and <var class="PARAMETER">invert</var> is 0:
-   all nodes in the <var class="PARAMETER">parent</var> subtree;
- - if <var class="PARAMETER">withComments</var> is 0 and <var class="PARAMETER">invert</var> is 0:
-   all nodes in the <var class="PARAMETER">parent</var> subtree except comment nodes;
- - if <var class="PARAMETER">withComments</var> is not 0 and <var class="PARAMETER">invert</var> not is 0:
-   all nodes in the <var class="PARAMETER">doc</var> except nodes in the <var class="PARAMETER">parent</var> subtree;
- - if <var class="PARAMETER">withComments</var> is 0 and <var class="PARAMETER">invert</var> is 0:
-   all nodes in the <var class="PARAMETER">doc</var> except nodes in the <var class="PARAMETER">parent</var> subtree 
+ - if <code class="PARAMETER">withComments</code> is not 0 and <code class="PARAMETER">invert</code> is 0:
+   all nodes in the <code class="PARAMETER">parent</code> subtree;
+ - if <code class="PARAMETER">withComments</code> is 0 and <code class="PARAMETER">invert</code> is 0:
+   all nodes in the <code class="PARAMETER">parent</code> subtree except comment nodes;
+ - if <code class="PARAMETER">withComments</code> is not 0 and <code class="PARAMETER">invert</code> not is 0:
+   all nodes in the <code class="PARAMETER">doc</code> except nodes in the <code class="PARAMETER">parent</code> subtree;
+ - if <code class="PARAMETER">withComments</code> is 0 and <code class="PARAMETER">invert</code> is 0:
+   all nodes in the <code class="PARAMETER">doc</code> except nodes in the <code class="PARAMETER">parent</code> subtree 
    and comment nodes.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12462"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11970"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12467"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11975"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	 	the pointer to parent XML node or NULL if we want to include all document nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12472"><span style="white-space: nowrap"><var class="PARAMETER">withComments</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11980"><span style="white-space: nowrap"><code class="PARAMETER">withComments</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the flag include  comments or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12477"><span style="white-space: nowrap"><var class="PARAMETER">invert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN11985"><span style="white-space: nowrap"><code class="PARAMETER">invert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the "invert" flag.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12482"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the newly created <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure
+<td align="LEFT" valign="TOP"><a name="AEN11990"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the newly created <a href="xmlsec-nodeset.html#XMLSECNODESET"><span class="TYPE">xmlSecNodeSet</span></a> structure
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12489"></a><h3>
-<a name="XMLSECNODESETWALK"></a>xmlSecNodeSetWalk ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNodeSetWalk               (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
-                                             <font>void</font> *data);</pre>
-<p>Calls the function <var class="PARAMETER">walkFunc</var> once per each node in the nodes set <var class="PARAMETER">nset</var>.
-If the <var class="PARAMETER">walkFunc</var> returns a negative value, then the walk procedure 
+<a name="XMLSECNODESETWALK"></a><h3>xmlSecNodeSetWalk ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetWalk                   (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETWALKCALLBACK">xmlSecNodeSetWalkCallback</a> walkFunc,
+                                                         <font>void</font> *data);</pre>
+<p>Calls the function <code class="PARAMETER">walkFunc</code> once per each node in the nodes set <code class="PARAMETER">nset</code>.
+If the <code class="PARAMETER">walkFunc</code> returns a negative value, then the walk procedure 
 is interrupted.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12505"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12012"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12510"><span style="white-space: nowrap"><var class="PARAMETER">walkFunc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12017"><span style="white-space: nowrap"><code class="PARAMETER">walkFunc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the callback functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12515"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the application specific data passed to the <var class="PARAMETER">walkFunc</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12022"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the application specific data passed to the <code class="PARAMETER">walkFunc</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12028"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12526"></a><h3>
-<a name="XMLSECNODESETDUMPTEXTNODES"></a>xmlSecNodeSetDumpTextNodes ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNodeSetDumpTextNodes      (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>xmlOutputBufferPtr</font> out);</pre>
-<p>Dumps content of all the text nodes from <var class="PARAMETER">nset</var> to <var class="PARAMETER">out</var>.</p>
+<a name="XMLSECNODESETDUMPTEXTNODES"></a><h3>xmlSecNodeSetDumpTextNodes ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeSetDumpTextNodes          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>xmlOutputBufferPtr</font> out);</pre>
+<p>Dumps content of all the text nodes from <code class="PARAMETER">nset</code> to <code class="PARAMETER">out</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12540"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12046"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12545"><span style="white-space: nowrap"><var class="PARAMETER">out</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12051"><span style="white-space: nowrap"><code class="PARAMETER">out</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12550"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12056"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12555"></a><h3>
-<a name="XMLSECNODESETDEBUGDUMP"></a>xmlSecNodeSetDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecNodeSetDebugDump          (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints information about <var class="PARAMETER">nset</var> to the <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECNODESETDEBUGDUMP"></a><h3>xmlSecNodeSetDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNodeSetDebugDump              (<a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nset,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints information about <code class="PARAMETER">nset</code> to the <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12569"><span style="white-space: nowrap"><var class="PARAMETER">nset</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12074"><span style="white-space: nowrap"><code class="PARAMETER">nset</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12574"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12079"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-membuf.html"><b>&lt;&lt;&lt;membuf</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-parser.html"><b>parser&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-membuf.html"><b>&lt;&lt;&lt; membuf</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-parser.html"><b>parser &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-others.html b/docs/api/xmlsec-notes-compiling-others.html
index e7ecdd3..5741c75 100644
--- a/docs/api/xmlsec-notes-compiling-others.html
+++ b/docs/api/xmlsec-notes-compiling-others.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Compiling and linking on other systems.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
 <link rel="PREVIOUS" title="Compiling and linking on Windows." href="xmlsec-notes-compiling-windows.html">
 <link rel="NEXT" title="Initialization and shutdown." href="xmlsec-notes-init-shutdown.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -95,8 +94,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-windows.html"><b>&lt;&lt;&lt;Compiling and linking on Windows.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-init-shutdown.html"><b>Initialization and shutdown.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-windows.html"><b>&lt;&lt;&lt; Compiling and linking on Windows.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-init-shutdown.html"><b>Initialization and shutdown. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-unix.html b/docs/api/xmlsec-notes-compiling-unix.html
index c1e6f4b..3541dc8 100644
--- a/docs/api/xmlsec-notes-compiling-unix.html
+++ b/docs/api/xmlsec-notes-compiling-unix.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Compiling and linking on Unix.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
 <link rel="PREVIOUS" title="Include files." href="xmlsec-notes-include-files.html">
 <link rel="NEXT" title="Compiling and linking on Windows." href="xmlsec-notes-compiling-windows.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -216,8 +215,8 @@ clean:
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-include-files.html"><b>&lt;&lt;&lt;Include files.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-windows.html"><b>Compiling and linking on Windows.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-include-files.html"><b>&lt;&lt;&lt; Include files.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-windows.html"><b>Compiling and linking on Windows. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling-windows.html b/docs/api/xmlsec-notes-compiling-windows.html
index 651be27..7ba8fc6 100644
--- a/docs/api/xmlsec-notes-compiling-windows.html
+++ b/docs/api/xmlsec-notes-compiling-windows.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Compiling and linking on Windows.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
 <link rel="PREVIOUS" title="Compiling and linking on Unix." href="xmlsec-notes-compiling-unix.html">
 <link rel="NEXT" title="Compiling and linking on other systems." href="xmlsec-notes-compiling-others.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -131,8 +130,8 @@
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-unix.html"><b>&lt;&lt;&lt;Compiling and linking on Unix.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-others.html"><b>Compiling and linking on other systems.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-unix.html"><b>&lt;&lt;&lt; Compiling and linking on Unix.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-others.html"><b>Compiling and linking on other systems. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-compiling.html b/docs/api/xmlsec-notes-compiling.html
index 7e5283b..3e7d1f6 100644
--- a/docs/api/xmlsec-notes-compiling.html
+++ b/docs/api/xmlsec-notes-compiling.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Building the application with XML Security Library.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="XML Security Library Structure." href="xmlsec-notes-structure.html">
 <link rel="NEXT" title="Include files." href="xmlsec-notes-include-files.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -110,8 +109,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-structure.html"><b>&lt;&lt;&lt;XML Security Library Structure.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-include-files.html"><b>Include files.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-structure.html"><b>&lt;&lt;&lt; XML Security Library Structure.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-include-files.html"><b>Include files. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-contexts.html b/docs/api/xmlsec-notes-contexts.html
index a961517..247f83f 100644
--- a/docs/api/xmlsec-notes-contexts.html
+++ b/docs/api/xmlsec-notes-contexts.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Using context objects.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Transforms and transforms chain." href="xmlsec-notes-transforms.html">
 <link rel="NEXT" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -222,8 +221,8 @@ done:
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-transforms.html"><b>&lt;&lt;&lt;Transforms and transforms chain.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto.html"><b>Adding support for new cryptographic library.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-transforms.html"><b>&lt;&lt;&lt; Transforms and transforms chain.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto.html"><b>Adding support for new cryptographic library. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-custom-keys-store.html b/docs/api/xmlsec-notes-custom-keys-store.html
index 1c3c312..7c81c23 100644
--- a/docs/api/xmlsec-notes-custom-keys-store.html
+++ b/docs/api/xmlsec-notes-custom-keys-store.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Implementing a custom keys store.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Keys manager." href="xmlsec-notes-keysmngr.html">
 <link rel="PREVIOUS" title="Using keys manager for verification/decryption." href="xmlsec-notes-keys-mngr-verify-decrypt.html">
 <link rel="NEXT" title="Using X509 Certificates." href="xmlsec-notes-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -243,8 +242,8 @@ files_keys_store_find_key(xmlSecKeyStorePtr store, const xmlChar* name, xmlSecKe
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>&lt;&lt;&lt;Using keys manager for verification/decryption.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-x509.html"><b>Using X509 Certificates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>&lt;&lt;&lt; Using keys manager for verification/decryption.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-x509.html"><b>Using X509 Certificates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-decrypt.html b/docs/api/xmlsec-notes-decrypt.html
index 6f2c8e7..829f800 100644
--- a/docs/api/xmlsec-notes-decrypt.html
+++ b/docs/api/xmlsec-notes-decrypt.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Decrypting an encrypted document</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Verifing and decrypting documents." href="xmlsec-notes-verify-decrypt.html">
 <link rel="PREVIOUS" title="Verifying a signed document" href="xmlsec-notes-verify.html">
 <link rel="NEXT" title="Keys." href="xmlsec-notes-keys.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -198,8 +197,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify.html"><b>&lt;&lt;&lt;Verifying a signed document</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys.html"><b>Keys.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify.html"><b>&lt;&lt;&lt; Verifying a signed document</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys.html"><b>Keys. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-dynamic-encryption-templates.html b/docs/api/xmlsec-notes-dynamic-encryption-templates.html
index 8294a7b..afe4147 100644
--- a/docs/api/xmlsec-notes-dynamic-encryption-templates.html
+++ b/docs/api/xmlsec-notes-dynamic-encryption-templates.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Creating dynamic encryption templates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Creating dynamic templates." href="xmlsec-notes-templates.html">
 <link rel="PREVIOUS" title="Creating dynamic signature templates." href="xmlsec-notes-dynamic-signature-templates.html">
 <link rel="NEXT" title="Verifing and decrypting documents." href="xmlsec-notes-verify-decrypt.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -233,8 +232,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-signature-templates.html"><b>&lt;&lt;&lt;Creating dynamic signature templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify-decrypt.html"><b>Verifing and decrypting documents.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-signature-templates.html"><b>&lt;&lt;&lt; Creating dynamic signature templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify-decrypt.html"><b>Verifing and decrypting documents. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-dynamic-signature-templates.html b/docs/api/xmlsec-notes-dynamic-signature-templates.html
index 7ea0447..7e912a9 100644
--- a/docs/api/xmlsec-notes-dynamic-signature-templates.html
+++ b/docs/api/xmlsec-notes-dynamic-signature-templates.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Creating dynamic signature templates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Creating dynamic templates." href="xmlsec-notes-templates.html">
 <link rel="PREVIOUS" title="Creating dynamic templates." href="xmlsec-notes-templates.html">
 <link rel="NEXT" title="Creating dynamic encryption templates." href="xmlsec-notes-dynamic-encryption-templates.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -243,8 +242,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-templates.html"><b>&lt;&lt;&lt;Creating dynamic templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-encryption-templates.html"><b>Creating dynamic encryption templates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-templates.html"><b>&lt;&lt;&lt; Creating dynamic templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-encryption-templates.html"><b>Creating dynamic encryption templates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-encrypt.html b/docs/api/xmlsec-notes-encrypt.html
index 40cf598..656d2df 100644
--- a/docs/api/xmlsec-notes-encrypt.html
+++ b/docs/api/xmlsec-notes-encrypt.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Encrypting data.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Signing and encrypting documents." href="xmlsec-notes-sign-encrypt.html">
 <link rel="PREVIOUS" title="Signing a document." href="xmlsec-notes-sign.html">
 <link rel="NEXT" title="Creating dynamic templates." href="xmlsec-notes-templates.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -216,8 +215,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign.html"><b>&lt;&lt;&lt;Signing a document.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-templates.html"><b>Creating dynamic templates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign.html"><b>&lt;&lt;&lt; Signing a document.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-templates.html"><b>Creating dynamic templates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-include-files.html b/docs/api/xmlsec-notes-include-files.html
index 58ad642..749e66c 100644
--- a/docs/api/xmlsec-notes-include-files.html
+++ b/docs/api/xmlsec-notes-include-files.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Include files.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
 <link rel="PREVIOUS" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
 <link rel="NEXT" title="Compiling and linking on Unix." href="xmlsec-notes-compiling-unix.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -134,8 +133,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling.html"><b>&lt;&lt;&lt;Building the application with XML Security Library.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-unix.html"><b>Compiling and linking on Unix.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling.html"><b>&lt;&lt;&lt; Building the application with XML Security Library.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling-unix.html"><b>Compiling and linking on Unix. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-init-shutdown.html b/docs/api/xmlsec-notes-init-shutdown.html
index bcd0963..63bf65e 100644
--- a/docs/api/xmlsec-notes-init-shutdown.html
+++ b/docs/api/xmlsec-notes-init-shutdown.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Initialization and shutdown.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Compiling and linking on other systems." href="xmlsec-notes-compiling-others.html">
 <link rel="NEXT" title="Signing and encrypting documents." href="xmlsec-notes-sign-encrypt.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -187,8 +186,8 @@
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-others.html"><b>&lt;&lt;&lt;Compiling and linking on other systems.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign-encrypt.html"><b>Signing and encrypting documents.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-compiling-others.html"><b>&lt;&lt;&lt; Compiling and linking on other systems.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign-encrypt.html"><b>Signing and encrypting documents. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys-manager-sign-enc.html b/docs/api/xmlsec-notes-keys-manager-sign-enc.html
index 7a8db55..a94af2e 100644
--- a/docs/api/xmlsec-notes-keys-manager-sign-enc.html
+++ b/docs/api/xmlsec-notes-keys-manager-sign-enc.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Using keys manager for signatures/encryption.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Keys manager." href="xmlsec-notes-keysmngr.html">
 <link rel="PREVIOUS" title="Simple keys store." href="xmlsec-notes-simple-keys-store.html">
 <link rel="NEXT" title="Using keys manager for verification/decryption." href="xmlsec-notes-keys-mngr-verify-decrypt.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -300,8 +299,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-simple-keys-store.html"><b>&lt;&lt;&lt;Simple keys store.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>Using keys manager for verification/decryption.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-simple-keys-store.html"><b>&lt;&lt;&lt; Simple keys store.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys-mngr-verify-decrypt.html"><b>Using keys manager for verification/decryption. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
index e311d2a..bb10b75 100644
--- a/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
+++ b/docs/api/xmlsec-notes-keys-mngr-verify-decrypt.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Using keys manager for verification/decryption.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Keys manager." href="xmlsec-notes-keysmngr.html">
 <link rel="PREVIOUS" title="Using keys manager for signatures/encryption." href="xmlsec-notes-keys-manager-sign-enc.html">
 <link rel="NEXT" title="Implementing a custom keys store." href="xmlsec-notes-custom-keys-store.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -172,8 +171,8 @@ load_des_keys(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys-manager-sign-enc.html"><b>&lt;&lt;&lt;Using keys manager for signatures/encryption.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-custom-keys-store.html"><b>Implementing a custom keys store.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys-manager-sign-enc.html"><b>&lt;&lt;&lt; Using keys manager for signatures/encryption.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-custom-keys-store.html"><b>Implementing a custom keys store. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keys.html b/docs/api/xmlsec-notes-keys.html
index a8af4e3..7913bee 100644
--- a/docs/api/xmlsec-notes-keys.html
+++ b/docs/api/xmlsec-notes-keys.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Keys.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Decrypting an encrypted document" href="xmlsec-notes-decrypt.html">
 <link rel="NEXT" title="Keys manager." href="xmlsec-notes-keysmngr.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -113,8 +112,8 @@
     </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-decrypt.html"><b>&lt;&lt;&lt;Decrypting an encrypted document</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keysmngr.html"><b>Keys manager.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-decrypt.html"><b>&lt;&lt;&lt; Decrypting an encrypted document</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keysmngr.html"><b>Keys manager. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-keysmngr.html b/docs/api/xmlsec-notes-keysmngr.html
index 2b8e06d..1bf5861 100644
--- a/docs/api/xmlsec-notes-keysmngr.html
+++ b/docs/api/xmlsec-notes-keysmngr.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Keys manager.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Keys." href="xmlsec-notes-keys.html">
 <link rel="NEXT" title="Simple keys store." href="xmlsec-notes-simple-keys-store.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -133,8 +132,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keys.html"><b>&lt;&lt;&lt;Keys.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-simple-keys-store.html"><b>Simple keys store.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keys.html"><b>&lt;&lt;&lt; Keys.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-simple-keys-store.html"><b>Simple keys store. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-functions.html b/docs/api/xmlsec-notes-new-crypto-functions.html
index 7917356..baeda08 100644
--- a/docs/api/xmlsec-notes-new-crypto-functions.html
+++ b/docs/api/xmlsec-notes-new-crypto-functions.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>xmlSecCryptoApp* functions.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Creating a framework from the skeleton." href="xmlsec-notes-new-crypto-skeleton.html">
 <link rel="NEXT" title="Klasses and objects." href="xmlsec-notes-new-crypto-klasses.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -144,8 +143,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-skeleton.html"><b>&lt;&lt;&lt;Creating a framework from the skeleton.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-klasses.html"><b>Klasses and objects.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-skeleton.html"><b>&lt;&lt;&lt; Creating a framework from the skeleton.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-klasses.html"><b>Klasses and objects. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-keys.html b/docs/api/xmlsec-notes-new-crypto-keys.html
index dedbbf2..c253ee7 100644
--- a/docs/api/xmlsec-notes-new-crypto-keys.html
+++ b/docs/api/xmlsec-notes-new-crypto-keys.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Keys data and keys data stores.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Cryptographic transforms." href="xmlsec-notes-new-crypto-transforms.html">
 <link rel="NEXT" title="Default keys manager." href="xmlsec-notes-new-crypto-simple-keys-mngr.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -96,8 +95,8 @@
 <p>TODO</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-transforms.html"><b>&lt;&lt;&lt;Cryptographic transforms.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>Default keys manager.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-transforms.html"><b>&lt;&lt;&lt; Cryptographic transforms.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>Default keys manager. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-klasses.html b/docs/api/xmlsec-notes-new-crypto-klasses.html
index 6ee6eef..530832d 100644
--- a/docs/api/xmlsec-notes-new-crypto-klasses.html
+++ b/docs/api/xmlsec-notes-new-crypto-klasses.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Klasses and objects.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="xmlSecCryptoApp* functions." href="xmlsec-notes-new-crypto-functions.html">
 <link rel="NEXT" title="Cryptographic transforms." href="xmlsec-notes-new-crypto-transforms.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -210,8 +209,8 @@ xmlSecTransformXPathGetKlass(void) {
 </ul>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-functions.html"><b>&lt;&lt;&lt;xmlSecCryptoApp* functions.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-transforms.html"><b>Cryptographic transforms.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-functions.html"><b>&lt;&lt;&lt; xmlSecCryptoApp* functions.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-transforms.html"><b>Cryptographic transforms. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-sharing-results.html b/docs/api/xmlsec-notes-new-crypto-sharing-results.html
index c918ee7..872ef5a 100644
--- a/docs/api/xmlsec-notes-new-crypto-sharing-results.html
+++ b/docs/api/xmlsec-notes-new-crypto-sharing-results.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Sharing the results.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Default keys manager." href="xmlsec-notes-new-crypto-simple-keys-mngr.html">
 <link rel="NEXT" title="Examples." href="xmlsec-examples.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -118,8 +117,8 @@
 	I will try to review and check in your patch as soon as possible.
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>&lt;&lt;&lt;Default keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-examples.html"><b>Examples.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-simple-keys-mngr.html"><b>&lt;&lt;&lt; Default keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-examples.html"><b>Examples. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
index 93cd4db..ac1d469 100644
--- a/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
+++ b/docs/api/xmlsec-notes-new-crypto-simple-keys-mngr.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Default keys manager.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Keys data and keys data stores." href="xmlsec-notes-new-crypto-keys.html">
 <link rel="NEXT" title="Sharing the results." href="xmlsec-notes-new-crypto-sharing-results.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -95,8 +94,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-keys.html"><b>&lt;&lt;&lt;Keys data and keys data stores.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-sharing-results.html"><b>Sharing the results.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-keys.html"><b>&lt;&lt;&lt; Keys data and keys data stores.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-sharing-results.html"><b>Sharing the results. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-skeleton.html b/docs/api/xmlsec-notes-new-crypto-skeleton.html
index e79e994..fcdebf4 100644
--- a/docs/api/xmlsec-notes-new-crypto-skeleton.html
+++ b/docs/api/xmlsec-notes-new-crypto-skeleton.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Creating a framework from the skeleton.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="NEXT" title="xmlSecCryptoApp* functions." href="xmlsec-notes-new-crypto-functions.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -247,8 +246,8 @@ make
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto.html"><b>&lt;&lt;&lt;Adding support for new cryptographic library.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-functions.html"><b>xmlSecCryptoApp* functions.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto.html"><b>&lt;&lt;&lt; Adding support for new cryptographic library.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-functions.html"><b>xmlSecCryptoApp* functions. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto-transforms.html b/docs/api/xmlsec-notes-new-crypto-transforms.html
index 9abff81..71e935c 100644
--- a/docs/api/xmlsec-notes-new-crypto-transforms.html
+++ b/docs/api/xmlsec-notes-new-crypto-transforms.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Cryptographic transforms.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Adding support for new cryptographic library." href="xmlsec-notes-new-crypto.html">
 <link rel="PREVIOUS" title="Klasses and objects." href="xmlsec-notes-new-crypto-klasses.html">
 <link rel="NEXT" title="Keys data and keys data stores." href="xmlsec-notes-new-crypto-keys.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -148,9 +147,9 @@
 	The <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">verify</a> method is called
 	after transform execution is finished. The 
 	<a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">verify</a> method implementation 
-	must set the "status" member to <font>xmlSecTransformStatusOk</font>
+	must set the "status" member to <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSOK">xmlSecTransformStatusOk</a>
 	if signature, hmac or digest is successfuly verified or to
-	<font>xmlSecTransformStatusFail</font>
+	<a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSFAIL">xmlSecTransformStatusFail</a>
 	otherwise.
 	</p>
 <p>The transforms that require a key (signature or encryption 
@@ -163,8 +162,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-klasses.html"><b>&lt;&lt;&lt;Klasses and objects.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-keys.html"><b>Keys data and keys data stores.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-new-crypto-klasses.html"><b>&lt;&lt;&lt; Klasses and objects.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-keys.html"><b>Keys data and keys data stores. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-new-crypto.html b/docs/api/xmlsec-notes-new-crypto.html
index 37dbfa4..e6e7685 100644
--- a/docs/api/xmlsec-notes-new-crypto.html
+++ b/docs/api/xmlsec-notes-new-crypto.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Adding support for new cryptographic library.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Using context objects." href="xmlsec-notes-contexts.html">
 <link rel="NEXT" title="Creating a framework from the skeleton." href="xmlsec-notes-new-crypto-skeleton.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -129,8 +128,8 @@
     </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-contexts.html"><b>&lt;&lt;&lt;Using context objects.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-skeleton.html"><b>Creating a framework from the skeleton.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-contexts.html"><b>&lt;&lt;&lt; Using context objects.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-new-crypto-skeleton.html"><b>Creating a framework from the skeleton. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-overview.html b/docs/api/xmlsec-notes-overview.html
index 3005cd8..ba56bbe 100644
--- a/docs/api/xmlsec-notes-overview.html
+++ b/docs/api/xmlsec-notes-overview.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Overview.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="NEXT" title="XML Security Library Structure." href="xmlsec-notes-structure.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -95,8 +94,8 @@
 	</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes.html"><b>&lt;&lt;&lt;XML Security Library Tutorial</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-structure.html"><b>XML Security Library Structure.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes.html"><b>&lt;&lt;&lt; XML Security Library Tutorial</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-structure.html"><b>XML Security Library Structure. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign-encrypt.html b/docs/api/xmlsec-notes-sign-encrypt.html
index 37478dd..7599ea4 100644
--- a/docs/api/xmlsec-notes-sign-encrypt.html
+++ b/docs/api/xmlsec-notes-sign-encrypt.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing and encrypting documents.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Initialization and shutdown." href="xmlsec-notes-init-shutdown.html">
 <link rel="NEXT" title="Signing a document." href="xmlsec-notes-sign.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -113,8 +112,8 @@
 	</div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-init-shutdown.html"><b>&lt;&lt;&lt;Initialization and shutdown.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign.html"><b>Signing a document.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-init-shutdown.html"><b>&lt;&lt;&lt; Initialization and shutdown.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign.html"><b>Signing a document. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign-x509.html b/docs/api/xmlsec-notes-sign-x509.html
index 683b8e9..52fd1a6 100644
--- a/docs/api/xmlsec-notes-sign-x509.html
+++ b/docs/api/xmlsec-notes-sign-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing data with X509 certificate.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Using X509 Certificates." href="xmlsec-notes-x509.html">
 <link rel="PREVIOUS" title="Using X509 Certificates." href="xmlsec-notes-x509.html">
 <link rel="NEXT" title="Verifing document signed with X509 certificates." href="xmlsec-notes-verify-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -169,8 +168,8 @@
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-x509.html"><b>&lt;&lt;&lt;Using X509 Certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify-x509.html"><b>Verifing document signed with X509 certificates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-x509.html"><b>&lt;&lt;&lt; Using X509 Certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify-x509.html"><b>Verifing document signed with X509 certificates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-sign.html b/docs/api/xmlsec-notes-sign.html
index da43976..4e746c6 100644
--- a/docs/api/xmlsec-notes-sign.html
+++ b/docs/api/xmlsec-notes-sign.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Signing a document.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Signing and encrypting documents." href="xmlsec-notes-sign-encrypt.html">
 <link rel="PREVIOUS" title="Signing and encrypting documents." href="xmlsec-notes-sign-encrypt.html">
 <link rel="NEXT" title="Encrypting data." href="xmlsec-notes-encrypt.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -203,8 +202,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign-encrypt.html"><b>&lt;&lt;&lt;Signing and encrypting documents.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-encrypt.html"><b>Encrypting data.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign-encrypt.html"><b>&lt;&lt;&lt; Signing and encrypting documents.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-encrypt.html"><b>Encrypting data. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-simple-keys-store.html b/docs/api/xmlsec-notes-simple-keys-store.html
index cf51bcd..55cf4db 100644
--- a/docs/api/xmlsec-notes-simple-keys-store.html
+++ b/docs/api/xmlsec-notes-simple-keys-store.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Simple keys store.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Keys manager." href="xmlsec-notes-keysmngr.html">
 <link rel="PREVIOUS" title="Keys manager." href="xmlsec-notes-keysmngr.html">
 <link rel="NEXT" title="Using keys manager for signatures/encryption." href="xmlsec-notes-keys-manager-sign-enc.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -170,8 +169,8 @@ load_keys(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-keysmngr.html"><b>&lt;&lt;&lt;Keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-keys-manager-sign-enc.html"><b>Using keys manager for signatures/encryption.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-keysmngr.html"><b>&lt;&lt;&lt; Keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-keys-manager-sign-enc.html"><b>Using keys manager for signatures/encryption. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-structure.html b/docs/api/xmlsec-notes-structure.html
index af34c51..f9dd86b 100644
--- a/docs/api/xmlsec-notes-structure.html
+++ b/docs/api/xmlsec-notes-structure.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library Structure.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Overview." href="xmlsec-notes-overview.html">
 <link rel="NEXT" title="Building the application with XML Security Library." href="xmlsec-notes-compiling.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -107,8 +106,8 @@
 	a matter of changing several #include directives.</p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-overview.html"><b>&lt;&lt;&lt;Overview.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-compiling.html"><b>Building the application with XML Security Library.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-overview.html"><b>&lt;&lt;&lt; Overview.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-compiling.html"><b>Building the application with XML Security Library. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-templates.html b/docs/api/xmlsec-notes-templates.html
index a12d205..63171af 100644
--- a/docs/api/xmlsec-notes-templates.html
+++ b/docs/api/xmlsec-notes-templates.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Creating dynamic templates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Encrypting data." href="xmlsec-notes-encrypt.html">
 <link rel="NEXT" title="Creating dynamic signature templates." href="xmlsec-notes-dynamic-signature-templates.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -107,8 +106,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-encrypt.html"><b>&lt;&lt;&lt;Encrypting data.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-signature-templates.html"><b>Creating dynamic signature templates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-encrypt.html"><b>&lt;&lt;&lt; Encrypting data.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-dynamic-signature-templates.html"><b>Creating dynamic signature templates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-transforms.html b/docs/api/xmlsec-notes-transforms.html
index c433e48..3bda65e 100644
--- a/docs/api/xmlsec-notes-transforms.html
+++ b/docs/api/xmlsec-notes-transforms.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Transforms and transforms chain.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Verifing document signed with X509 certificates." href="xmlsec-notes-verify-x509.html">
 <link rel="NEXT" title="Using context objects." href="xmlsec-notes-contexts.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -147,8 +146,8 @@
 </div>
     </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify-x509.html"><b>&lt;&lt;&lt;Verifing document signed with X509 certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-contexts.html"><b>Using context objects.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify-x509.html"><b>&lt;&lt;&lt; Verifing document signed with X509 certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-contexts.html"><b>Using context objects. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify-decrypt.html b/docs/api/xmlsec-notes-verify-decrypt.html
index 9694e2f..d00a137 100644
--- a/docs/api/xmlsec-notes-verify-decrypt.html
+++ b/docs/api/xmlsec-notes-verify-decrypt.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifing and decrypting documents.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Creating dynamic encryption templates." href="xmlsec-notes-dynamic-encryption-templates.html">
 <link rel="NEXT" title="Verifying a signed document" href="xmlsec-notes-verify.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -113,8 +112,8 @@
 	</div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-encryption-templates.html"><b>&lt;&lt;&lt;Creating dynamic encryption templates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-verify.html"><b>Verifying a signed document&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-dynamic-encryption-templates.html"><b>&lt;&lt;&lt; Creating dynamic encryption templates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-verify.html"><b>Verifying a signed document &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify-x509.html b/docs/api/xmlsec-notes-verify-x509.html
index 48e9e6d..9e8c87d 100644
--- a/docs/api/xmlsec-notes-verify-x509.html
+++ b/docs/api/xmlsec-notes-verify-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifing document signed with X509 certificates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Using X509 Certificates." href="xmlsec-notes-x509.html">
 <link rel="PREVIOUS" title="Signing data with X509 certificate." href="xmlsec-notes-sign-x509.html">
 <link rel="NEXT" title="Transforms and transforms chain." href="xmlsec-notes-transforms.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -173,8 +172,8 @@ load_trusted_certs(char** files, int files_size) {
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-sign-x509.html"><b>&lt;&lt;&lt;Signing data with X509 certificate.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-transforms.html"><b>Transforms and transforms chain.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-sign-x509.html"><b>&lt;&lt;&lt; Signing data with X509 certificate.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-transforms.html"><b>Transforms and transforms chain. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-verify.html b/docs/api/xmlsec-notes-verify.html
index b01c04f..05a95fb 100644
--- a/docs/api/xmlsec-notes-verify.html
+++ b/docs/api/xmlsec-notes-verify.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifying a signed document</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Verifing and decrypting documents." href="xmlsec-notes-verify-decrypt.html">
 <link rel="PREVIOUS" title="Verifing and decrypting documents." href="xmlsec-notes-verify-decrypt.html">
 <link rel="NEXT" title="Decrypting an encrypted document" href="xmlsec-notes-decrypt.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -203,8 +202,8 @@ done:
 </div>
 	</div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-verify-decrypt.html"><b>&lt;&lt;&lt;Verifing and decrypting documents.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-decrypt.html"><b>Decrypting an encrypted document&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-verify-decrypt.html"><b>&lt;&lt;&lt; Verifing and decrypting documents.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-decrypt.html"><b>Decrypting an encrypted document &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes-x509.html b/docs/api/xmlsec-notes-x509.html
index aeb367b..8ad0e3e 100644
--- a/docs/api/xmlsec-notes-x509.html
+++ b/docs/api/xmlsec-notes-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Using X509 Certificates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Implementing a custom keys store." href="xmlsec-notes-custom-keys-store.html">
 <link rel="NEXT" title="Signing data with X509 certificate." href="xmlsec-notes-sign-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -107,8 +106,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-notes-custom-keys-store.html"><b>&lt;&lt;&lt;Implementing a custom keys store.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-sign-x509.html"><b>Signing data with X509 certificate.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-notes-custom-keys-store.html"><b>&lt;&lt;&lt; Implementing a custom keys store.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-sign-x509.html"><b>Signing data with X509 certificate. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-notes.html b/docs/api/xmlsec-notes.html
index 81f43a3..8301f51 100644
--- a/docs/api/xmlsec-notes.html
+++ b/docs/api/xmlsec-notes.html
@@ -2,11 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library Tutorial</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="PREVIOUS" title="XML Security Library Reference Manual" href="index.html">
 <link rel="NEXT" title="Overview." href="xmlsec-notes-overview.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -108,8 +107,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="index.html"><b>&lt;&lt;&lt;XML Security Library Reference Manual</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-notes-overview.html"><b>Overview.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="index.html"><b>&lt;&lt;&lt; XML Security Library Reference Manual</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-notes-overview.html"><b>Overview. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-app.html b/docs/api/xmlsec-nss-app.html
index 4b0d20a..54a49dc 100644
--- a/docs/api/xmlsec-nss-app.html
+++ b/docs/api/xmlsec-nss-app.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>app</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="NEXT" title="bignum" href="xmlsec-nss-bignum.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,465 +87,442 @@
 <h1>
 <a name="XMLSEC-NSS-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN26374"></a><h2>Name</h2>app--Application functions implementation for NSS.</div>
+<a name="AEN25422"></a><h2>Name</h2>app -- Application functions implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN26377"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPINIT">xmlSecNssAppInit</a>                (const <font>char</font> *config);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPSHUTDOWN">xmlSecNssAppShutdown</a>            (void);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">xmlSecNssAppDefaultKeysMngrInit</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecNssAppDefaultKeysMngrAdoptKey</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">xmlSecNssAppDefaultKeysMngrLoad</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRSAVE">xmlSecNssAppDefaultKeysMngrSave</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOAD">xmlSecNssAppKeysMngrCertLoad</a>    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY">xmlSecNssAppKeysMngrCertLoadMemory</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM">xmlSecNssAppKeysMngrCertLoadSECItem</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOAD">xmlSecNssAppKeyLoad</a>            (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADMEMORY">xmlSecNssAppKeyLoadMemory</a>      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADSECITEM">xmlSecNssAppKeyLoadSECItem</a>     (<font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOAD">xmlSecNssAppPkcs12Load</a>         (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADMEMORY">xmlSecNssAppPkcs12LoadMemory</a>   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADSECITEM">xmlSecNssAppPkcs12LoadSECItem</a>  (<font>SECItem</font> *secItem,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOAD">xmlSecNssAppKeyCertLoad</a>         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADMEMORY">xmlSecNssAppKeyCertLoadMemory</a>   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADSECITEM">xmlSecNssAppKeyCertLoadSECItem</a>  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYFROMCERTLOADSECITEM">xmlSecNssAppKeyFromCertLoadSECItem</a>
-                                            (<font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*       <a href="xmlsec-nss-app.html#XMLSECNSSAPPGETDEFAULTPWDCALLBACK">xmlSecNssAppGetDefaultPwdCallback</a>
-                                            (void);</pre>
+<a name="XMLSEC-NSS-APP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPINIT">xmlSecNssAppInit</a>                    (const <font>char</font> *config);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPSHUTDOWN">xmlSecNssAppShutdown</a>                (void);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT">xmlSecNssAppDefaultKeysMngrInit</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecNssAppDefaultKeysMngrAdoptKey</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRLOAD">xmlSecNssAppDefaultKeysMngrLoad</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRSAVE">xmlSecNssAppDefaultKeysMngrSave</a>     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOAD">xmlSecNssAppKeysMngrCertLoad</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY">xmlSecNssAppKeysMngrCertLoadMemory</a>  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM">xmlSecNssAppKeysMngrCertLoadSECItem</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOAD">xmlSecNssAppKeyLoad</a>                 (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADMEMORY">xmlSecNssAppKeyLoadMemory</a>           (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYLOADSECITEM">xmlSecNssAppKeyLoadSECItem</a>          (<font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOAD">xmlSecNssAppPkcs12Load</a>              (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADMEMORY">xmlSecNssAppPkcs12LoadMemory</a>        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPPKCS12LOADSECITEM">xmlSecNssAppPkcs12LoadSECItem</a>       (<font>SECItem</font> *secItem,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOAD">xmlSecNssAppKeyCertLoad</a>             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADMEMORY">xmlSecNssAppKeyCertLoadMemory</a>       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYCERTLOADSECITEM">xmlSecNssAppKeyCertLoadSECItem</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-nss-app.html#XMLSECNSSAPPKEYFROMCERTLOADSECITEM">xmlSecNssAppKeyFromCertLoadSECItem</a>  (<font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>void</font>*               <a href="xmlsec-nss-app.html#XMLSECNSSAPPGETDEFAULTPWDCALLBACK">xmlSecNssAppGetDefaultPwdCallback</a>   (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN26483"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-APP.DESCRIPTION"></a><h2>Description</h2>
 <p>Application functions implementation for NSS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN26486"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN26488"></a><h3>
-<a name="XMLSECNSSAPPINIT"></a>xmlSecNssAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppInit                (const <font>char</font> *config);</pre>
+<a name="XMLSECNSSAPPINIT"></a><h3>xmlSecNssAppInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppInit                    (const <font>char</font> *config);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
-<var class="PARAMETER">xmlSecInit</var> function.</p>
+<code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26500"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25547"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to NSS database files.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26505"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25552"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26510"></a><h3>
-<a name="XMLSECNSSAPPSHUTDOWN"></a>xmlSecNssAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppShutdown            (void);</pre>
+<a name="XMLSECNSSAPPSHUTDOWN"></a><h3>xmlSecNssAppShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppShutdown                (void);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
-<var class="PARAMETER">xmlSecShutdown</var> function.</p>
+<code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN26521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25567"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26526"></a><h3>
-<a name="XMLSECNSSAPPDEFAULTKEYSMNGRINIT"></a>xmlSecNssAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppDefaultKeysMngrInit (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
-<p>Initializes <var class="PARAMETER">mngr</var> with NSS keys store <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID"><span class="TYPE">xmlSecNssKeysStoreId</span></a>
+<a name="XMLSECNSSAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecNssAppDefaultKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrInit     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<p>Initializes <code class="PARAMETER">mngr</code> with NSS keys store <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID"><span class="TYPE">xmlSecNssKeysStoreId</span></a>
 and a default NSS crypto key data stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26540"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25585"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26545"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25590"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26550"></a><h3>
-<a name="XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY"></a>xmlSecNssAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppDefaultKeysMngrAdoptKey
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the keys manager <var class="PARAMETER">mngr</var> created with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecNssAppDefaultKeysMngrInit</span></a>
+<a name="XMLSECNSSAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecNssAppDefaultKeysMngrAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrAdoptKey (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecNssAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26566"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25610"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26571"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25615"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26576"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25620"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26581"></a><h3>
-<a name="XMLSECNSSAPPDEFAULTKEYSMNGRLOAD"></a>xmlSecNssAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppDefaultKeysMngrLoad (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);</pre>
-<p>Loads XML keys file from <var class="PARAMETER">uri</var> to the keys manager <var class="PARAMETER">mngr</var> created 
+<a name="XMLSECNSSAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecNssAppDefaultKeysMngrLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrLoad     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);</pre>
+<p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created 
 with <a href="xmlsec-nss-app.html#XMLSECNSSAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecNssAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26597"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25640"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26602"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25645"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26607"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25650"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26612"></a><h3>
-<a name="XMLSECNSSAPPDEFAULTKEYSMNGRSAVE"></a>xmlSecNssAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppDefaultKeysMngrSave (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Saves keys from <var class="PARAMETER">mngr</var> to  XML keys file.</p>
+<a name="XMLSECNSSAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecNssAppDefaultKeysMngrSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppDefaultKeysMngrSave     (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26626"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25668"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26631"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25673"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26636"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25678"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26641"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25683"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26646"></a><h3>
-<a name="XMLSECNSSAPPKEYSMNGRCERTLOAD"></a>xmlSecNssAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeysMngrCertLoad    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">filename</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var></p>
+<a name="XMLSECNSSAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecNssAppKeysMngrCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoad        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26662"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25703"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26667"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25708"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26672"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25713"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26677"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25718"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26682"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25723"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26687"></a><h3>
-<a name="XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY"></a>xmlSecNssAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeysMngrCertLoadMemory
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">data</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var></p>
+<a name="XMLSECNSSAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecNssAppKeysMngrCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoadMemory  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">data</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26704"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25744"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26709"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25749"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26714"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25754"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26719"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25759"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26724"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25764"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26729"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25769"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26734"></a><h3>
-<a name="XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM"></a>xmlSecNssAppKeysMngrCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeysMngrCertLoadSECItem
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">secItem</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var></p>
+<a name="XMLSECNSSAPPKEYSMNGRCERTLOADSECITEM"></a><h3>xmlSecNssAppKeysMngrCertLoadSECItem ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeysMngrCertLoadSECItem (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">secItem</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code></p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26750"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25789"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26755"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25794"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26760"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25799"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format (PEM or DER).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26765"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25804"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26770"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25809"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26775"></a><h3>
-<a name="XMLSECNSSAPPKEYLOAD"></a>xmlSecNssAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppKeyLoad            (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECNSSAPPKEYLOAD"></a><h3>xmlSecNssAppKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoad                 (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from a file</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26790"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25828"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26795"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25833"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26800"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25838"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26805"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25843"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26810"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25848"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26815"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25853"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26820"></a><h3>
-<a name="XMLSECNSSAPPKEYLOADMEMORY"></a>xmlSecNssAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppKeyLoadMemory      (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
-<p>Reads key from a binary <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECNSSAPPKEYLOADMEMORY"></a><h3>xmlSecNssAppKeyLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoadMemory           (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
+<p>Reads key from a binary <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26837"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25874"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26842"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25879"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26847"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25884"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26852"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25889"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key data2 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26857"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25894"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26862"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25899"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26867"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25904"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26872"></a><h3>
-<a name="XMLSECNSSAPPKEYLOADSECITEM"></a>xmlSecNssAppKeyLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppKeyLoadSECItem     (<font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECNSSAPPKEYLOADSECITEM"></a><h3>xmlSecNssAppKeyLoadSECItem ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyLoadSECItem          (<font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from a file</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26887"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25923"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to sec item.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26892"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25928"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26897"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25933"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26902"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25938"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26907"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25943"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26912"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25948"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26917"></a><h3>
-<a name="XMLSECNSSAPPPKCS12LOAD"></a>xmlSecNssAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppPkcs12Load         (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECNSSAPPPKCS12LOAD"></a><h3>xmlSecNssAppPkcs12Load ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12Load              (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -554,36 +530,35 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26931"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25966"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26936"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25971"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26941"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25976"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26946"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN25981"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26951"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN25986"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN26956"></a><h3>
-<a name="XMLSECNSSAPPPKCS12LOADMEMORY"></a>xmlSecNssAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppPkcs12LoadMemory   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECNSSAPPPKCS12LOADMEMORY"></a><h3>xmlSecNssAppPkcs12LoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12LoadMemory        (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 binary data.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -591,39 +566,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26971"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26005"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26976"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26010"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26981"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26015"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26986"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26020"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26991"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26025"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN26996"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26030"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27001"></a><h3>
-<a name="XMLSECNSSAPPPKCS12LOADSECITEM"></a>xmlSecNssAppPkcs12LoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppPkcs12LoadSECItem  (<font>SECItem</font> *secItem,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECNSSAPPPKCS12LOADSECITEM"></a><h3>xmlSecNssAppPkcs12LoadSECItem ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppPkcs12LoadSECItem       (<font>SECItem</font> *secItem,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 SECItem.
 For uniformity, call xmlSecNssAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -631,157 +605,155 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27015"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">SECItem</var> object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26048"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the <code class="PARAMETER">SECItem</code> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27021"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26054"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27026"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26059"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27031"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26064"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27036"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26069"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27041"></a><h3>
-<a name="XMLSECNSSAPPKEYCERTLOAD"></a>xmlSecNssAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeyCertLoad         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">filename</var> and adds it to key</p>
+<a name="XMLSECNSSAPPKEYCERTLOAD"></a><h3>xmlSecNssAppKeyCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoad             (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27055"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26087"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27060"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26092"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27065"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26097"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27070"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26102"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27075"></a><h3>
-<a name="XMLSECNSSAPPKEYCERTLOADMEMORY"></a>xmlSecNssAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeyCertLoadMemory   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from <var class="PARAMETER">data</var> and adds it to key</p>
+<a name="XMLSECNSSAPPKEYCERTLOADMEMORY"></a><h3>xmlSecNssAppKeyCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoadMemory       (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from <code class="PARAMETER">data</code> and adds it to key</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27090"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26121"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27095"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26126"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27100"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26131"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27105"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26136"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27110"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26141"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27115"></a><h3>
-<a name="XMLSECNSSAPPKEYCERTLOADSECITEM"></a>xmlSecNssAppKeyCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssAppKeyCertLoadSECItem  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from <var class="PARAMETER">secItem</var> and adds it to key</p>
+<a name="XMLSECNSSAPPKEYCERTLOADSECITEM"></a><h3>xmlSecNssAppKeyCertLoadSECItem ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssAppKeyCertLoadSECItem      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from <code class="PARAMETER">secItem</code> and adds it to key</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27129"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26159"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27134"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26164"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to SECItem.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27139"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26169"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27144"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26174"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27149"></a><h3>
-<a name="XMLSECNSSAPPKEYFROMCERTLOADSECITEM"></a>xmlSecNssAppKeyFromCertLoadSECItem ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecNssAppKeyFromCertLoadSECItem
-                                            (<font>SECItem</font> *secItem,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECNSSAPPKEYFROMCERTLOADSECITEM"></a><h3>xmlSecNssAppKeyFromCertLoadSECItem ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecNssAppKeyFromCertLoadSECItem  (<font>SECItem</font> *secItem,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Loads public key from cert.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27161"><span style="white-space: nowrap"><var class="PARAMETER">secItem</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">SECItem</var> object.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26190"><span style="white-space: nowrap"><code class="PARAMETER">secItem</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the <code class="PARAMETER">SECItem</code> object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27167"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26196"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the cert format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27172"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26201"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27177"></a><h3>
-<a name="XMLSECNSSAPPGETDEFAULTPWDCALLBACK"></a>xmlSecNssAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*       xmlSecNssAppGetDefaultPwdCallback
-                                            (void);</pre>
+<a name="XMLSECNSSAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecNssAppGetDefaultPwdCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecNssAppGetDefaultPwdCallback   (void);</pre>
 <p>Gets default password callback.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN26215"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> default password callback.</p></td>
+</tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-ref.html"><b>&lt;&lt;&lt;XML Security Library for NSS API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-bignum.html"><b>bignum&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-ref.html"><b>&lt;&lt;&lt; XML Security Library for NSS API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-bignum.html"><b>bignum &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-bignum.html b/docs/api/xmlsec-nss-bignum.html
index 068c9c7..e4919f8 100644
--- a/docs/api/xmlsec-nss-bignum.html
+++ b/docs/api/xmlsec-nss-bignum.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>bignum</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-nss-app.html">
 <link rel="NEXT" title="crypto" href="xmlsec-nss-crypto.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,65 +87,61 @@
 <h1>
 <a name="XMLSEC-NSS-BIGNUM"></a>bignum</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27191"></a><h2>Name</h2>bignum--Big numbers helper functions.</div>
+<a name="AEN26225"></a><h2>Name</h2>bignum -- Big numbers helper functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN27194"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>SECItem</font>*    <a href="xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">xmlSecNssNodeGetBigNumValue</a>     (<font>PRArenaPool</font> *arena,
-                                             const <font>xmlNodePtr</font> cur,
-                                             <font>SECItem</font> *a);
-<font>int</font>         <a href="xmlsec-nss-bignum.html#XMLSECNSSNODESETBIGNUMVALUE">xmlSecNssNodeSetBigNumValue</a>     (<font>xmlNodePtr</font> cur,
-                                             const <font>SECItem</font> *a,
-                                             <font>int</font> addLineBreaks);</pre>
+<a name="XMLSEC-NSS-BIGNUM.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>SECItem</font>*            <a href="xmlsec-nss-bignum.html#XMLSECNSSNODEGETBIGNUMVALUE">xmlSecNssNodeGetBigNumValue</a>         (<font>PRArenaPool</font> *arena,
+                                                         const <font>xmlNodePtr</font> cur,
+                                                         <font>SECItem</font> *a);
+<font>int</font>                 <a href="xmlsec-nss-bignum.html#XMLSECNSSNODESETBIGNUMVALUE">xmlSecNssNodeSetBigNumValue</a>         (<font>xmlNodePtr</font> cur,
+                                                         const <font>SECItem</font> *a,
+                                                         <font>int</font> addLineBreaks);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN27207"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-BIGNUM.DESCRIPTION"></a><h2>Description</h2>
 <p>Big numbers helper functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN27210"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-BIGNUM.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN27212"></a><h3>
-<a name="XMLSECNSSNODEGETBIGNUMVALUE"></a>xmlSecNssNodeGetBigNumValue ()</h3>
-<pre class="PROGRAMLISTING"><font>SECItem</font>*    xmlSecNssNodeGetBigNumValue     (<font>PRArenaPool</font> *arena,
-                                             const <font>xmlNodePtr</font> cur,
-                                             <font>SECItem</font> *a);</pre>
+<a name="XMLSECNSSNODEGETBIGNUMVALUE"></a><h3>xmlSecNssNodeGetBigNumValue ()</h3>
+<pre class="PROGRAMLISTING"><font>SECItem</font>*            xmlSecNssNodeGetBigNumValue         (<font>PRArenaPool</font> *arena,
+                                                         const <font>xmlNodePtr</font> cur,
+                                                         <font>SECItem</font> *a);</pre>
 <p>Converts the node content from CryptoBinary format 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-CryptoBinary</span></font>) 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>) 
 to a SECItem. If no SECItem object provided then a new
 one is created (caller is responsible for freeing it).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27227"><span style="white-space: nowrap"><var class="PARAMETER">arena</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26260"><span style="white-space: nowrap"><code class="PARAMETER">arena</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the arena from which to allocate memory</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27232"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26265"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27237"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26270"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a SECItem object to hold the BigNum value</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>a pointer to SECItem produced from CryptoBinary string
+<td align="LEFT" valign="TOP"><a name="AEN26275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> a pointer to SECItem produced from CryptoBinary string
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27247"></a><h3>
-<a name="XMLSECNSSNODESETBIGNUMVALUE"></a>xmlSecNssNodeSetBigNumValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssNodeSetBigNumValue     (<font>xmlNodePtr</font> cur,
-                                             const <font>SECItem</font> *a,
-                                             <font>int</font> addLineBreaks);</pre>
+<a name="XMLSECNSSNODESETBIGNUMVALUE"></a><h3>xmlSecNssNodeSetBigNumValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssNodeSetBigNumValue         (<font>xmlNodePtr</font> cur,
+                                                         const <font>SECItem</font> *a,
+                                                         <font>int</font> addLineBreaks);</pre>
 <p>Converts SECItem to CryptoBinary string
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-CryptoBinary</span></font>) 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>) 
 and sets it as the content of the given node. If the 
 addLineBreaks is set then line breaks are added 
 before and after the CryptoBinary string.</p>
@@ -154,29 +149,29 @@ before and after the CryptoBinary string.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27262"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26294"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27267"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26299"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> a SECItem containing the BigNum value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27272"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26304"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27277"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or -1 otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26309"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or -1 otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-app.html"><b>&lt;&lt;&lt;app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-crypto.html"><b>crypto&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-app.html"><b>&lt;&lt;&lt; app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-crypto.html"><b>crypto &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-crypto.html b/docs/api/xmlsec-nss-crypto.html
index 2cccd50..aea8710 100644
--- a/docs/api/xmlsec-nss-crypto.html
+++ b/docs/api/xmlsec-nss-crypto.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>crypto</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="bignum" href="xmlsec-nss-bignum.html">
 <link rel="NEXT" title="keysstore" href="xmlsec-nss-keysstore.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,818 +87,730 @@
 <h1>
 <a name="XMLSEC-NSS-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN27287"></a><h2>Name</h2>crypto--Crypto transforms implementation for NSS.</div>
+<a name="AEN26319"></a><h2>Name</h2>crypto -- Crypto transforms implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN27290"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">xmlSecCryptoGetFunctions_nss</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSINIT">xmlSecNssInit</a>                   (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSSHUTDOWN">xmlSecNssShutdown</a>               (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYSMNGRINIT">xmlSecNssKeysMngrInit</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSGENERATERANDOM">xmlSecNssGenerateRandom</a>         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>void</font>        <a href="xmlsec-nss-crypto.html#XMLSECNSSERRORSDEFAULTCALLBACK">xmlSecNssErrorsDefaultCallback</a>  (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);
-<font>PK11SlotInfo</font>* <a href="xmlsec-nss-crypto.html#XMLSECNSSGETINTERNALKEYSLOT">xmlSecNssGetInternalKeySlot</a>   (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESID">xmlSecNssKeyDataAesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESGETKLASS">xmlSecNssKeyDataAesGetKlass</a> (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESSET">xmlSecNssKeyDataAesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCID">xmlSecNssTransformAes128CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCGETKLASS">xmlSecNssTransformAes128CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCID">xmlSecNssTransformAes192CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCGETKLASS">xmlSecNssTransformAes192CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCID">xmlSecNssTransformAes256CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCGETKLASS">xmlSecNssTransformAes256CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128ID">xmlSecNssTransformKWAes128Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128GETKLASS">xmlSecNssTransformKWAes128GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192ID">xmlSecNssTransformKWAes192Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192GETKLASS">xmlSecNssTransformKWAes192GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256ID">xmlSecNssTransformKWAes256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256GETKLASS">xmlSecNssTransformKWAes256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESID">xmlSecNssKeyDataDesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESGETKLASS">xmlSecNssKeyDataDesGetKlass</a> (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESSET">xmlSecNssKeyDataDesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCID">xmlSecNssTransformDes3CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCGETKLASS">xmlSecNssTransformDes3CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3ID">xmlSecNssTransformKWDes3Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3GETKLASS">xmlSecNssTransformKWDes3GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAID">xmlSecNssKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAGETKLASS">xmlSecNssKeyDataDsaGetKlass</a> (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1ID">xmlSecNssTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1GETKLASS">xmlSecNssTransformDsaSha1GetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACGETMINOUTPUTLENGTH">xmlSecNssHmacGetMinOutputLength</a> (void);
-<font>void</font>        <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACSETMINOUTPUTLENGTH">xmlSecNssHmacSetMinOutputLength</a> (<font>int</font> min_length);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACID">xmlSecNssKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACGETKLASS">xmlSecNssKeyDataHmacGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACSET">xmlSecNssKeyDataHmacSet</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5ID">xmlSecNssTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5GETKLASS">xmlSecNssTransformHmacMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160ID">xmlSecNssTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecNssTransformHmacRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1ID">xmlSecNssTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">xmlSecNssTransformHmacSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAID">xmlSecNssKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAGETKLASS">xmlSecNssKeyDataRsaGetKlass</a> (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1ID">xmlSecNssTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1GETKLASS">xmlSecNssTransformRsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1ID">xmlSecNssTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1GETKLASS">xmlSecNssTransformRsaPkcs1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPID">xmlSecNssTransformRsaOaepId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPGETKLASS">xmlSecNssTransformRsaOaepGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1ID">xmlSecNssTransformSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1GETKLASS">xmlSecNssTransformSha1GetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-NSS-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-nss-crypto.html#XMLSECCRYPTOGETFUNCTIONS-NSS">xmlSecCryptoGetFunctions_nss</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSINIT">xmlSecNssInit</a>                       (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSSHUTDOWN">xmlSecNssShutdown</a>                   (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYSMNGRINIT">xmlSecNssKeysMngrInit</a>               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSGENERATERANDOM">xmlSecNssGenerateRandom</a>             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>void</font>                <a href="xmlsec-nss-crypto.html#XMLSECNSSERRORSDEFAULTCALLBACK">xmlSecNssErrorsDefaultCallback</a>      (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);
+<font>PK11SlotInfo</font> *      <a href="xmlsec-nss-crypto.html#XMLSECNSSGETINTERNALKEYSLOT">xmlSecNssGetInternalKeySlot</a>         (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESID">xmlSecNssKeyDataAesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESGETKLASS">xmlSecNssKeyDataAesGetKlass</a>         (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAAESSET">xmlSecNssKeyDataAesSet</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCID">xmlSecNssTransformAes128CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES128CBCGETKLASS">xmlSecNssTransformAes128CbcGetKlass</a> (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCID">xmlSecNssTransformAes192CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES192CBCGETKLASS">xmlSecNssTransformAes192CbcGetKlass</a> (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCID">xmlSecNssTransformAes256CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMAES256CBCGETKLASS">xmlSecNssTransformAes256CbcGetKlass</a> (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128ID">xmlSecNssTransformKWAes128Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES128GETKLASS">xmlSecNssTransformKWAes128GetKlass</a>  (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192ID">xmlSecNssTransformKWAes192Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES192GETKLASS">xmlSecNssTransformKWAes192GetKlass</a>  (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256ID">xmlSecNssTransformKWAes256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWAES256GETKLASS">xmlSecNssTransformKWAes256GetKlass</a>  (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESID">xmlSecNssKeyDataDesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESGETKLASS">xmlSecNssKeyDataDesGetKlass</a>         (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADESSET">xmlSecNssKeyDataDesSet</a>              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCID">xmlSecNssTransformDes3CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDES3CBCGETKLASS">xmlSecNssTransformDes3CbcGetKlass</a>   (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3ID">xmlSecNssTransformKWDes3Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMKWDES3GETKLASS">xmlSecNssTransformKWDes3GetKlass</a>    (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAID">xmlSecNssKeyDataDsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATADSAGETKLASS">xmlSecNssKeyDataDsaGetKlass</a>         (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1ID">xmlSecNssTransformDsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMDSASHA1GETKLASS">xmlSecNssTransformDsaSha1GetKlass</a>   (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACGETMINOUTPUTLENGTH">xmlSecNssHmacGetMinOutputLength</a>     (void);
+<font>void</font>                <a href="xmlsec-nss-crypto.html#XMLSECNSSHMACSETMINOUTPUTLENGTH">xmlSecNssHmacSetMinOutputLength</a>     (<font>int</font> min_length);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACID">xmlSecNssKeyDataHmacId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACGETKLASS">xmlSecNssKeyDataHmacGetKlass</a>        (void);
+<font>int</font>                 <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATAHMACSET">xmlSecNssKeyDataHmacSet</a>             (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5ID">xmlSecNssTransformHmacMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACMD5GETKLASS">xmlSecNssTransformHmacMd5GetKlass</a>   (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160ID">xmlSecNssTransformHmacRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS">xmlSecNssTransformHmacRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1ID">xmlSecNssTransformHmacSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMHMACSHA1GETKLASS">xmlSecNssTransformHmacSha1GetKlass</a>  (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAID">xmlSecNssKeyDataRsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-crypto.html#XMLSECNSSKEYDATARSAGETKLASS">xmlSecNssKeyDataRsaGetKlass</a>         (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1ID">xmlSecNssTransformRsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSASHA1GETKLASS">xmlSecNssTransformRsaSha1GetKlass</a>   (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1ID">xmlSecNssTransformRsaPkcs1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAPKCS1GETKLASS">xmlSecNssTransformRsaPkcs1GetKlass</a>  (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPID">xmlSecNssTransformRsaOaepId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMRSAOAEPGETKLASS">xmlSecNssTransformRsaOaepGetKlass</a>   (void);
+#define             <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1ID">xmlSecNssTransformSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-nss-crypto.html#XMLSECNSSTRANSFORMSHA1GETKLASS">xmlSecNssTransformSha1GetKlass</a>      (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN27400"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto transforms implementation for NSS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN27403"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN27405"></a><h3>
-<a name="XMLSECCRYPTOGETFUNCTIONS-NSS"></a>xmlSecCryptoGetFunctions_nss ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoGetFunctions_nss
-                                            (void);</pre>
+<a name="XMLSECCRYPTOGETFUNCTIONS-NSS"></a><h3>xmlSecCryptoGetFunctions_nss ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_nss
+                                                        (void);</pre>
 <p>Gets the pointer to xmlsec-nss functions table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27415"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the xmlsec-nss functions table or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26446"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the xmlsec-nss functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27420"></a><h3>
-<a name="XMLSECNSSINIT"></a>xmlSecNssInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssInit                   (void);</pre>
+<a name="XMLSECNSSINIT"></a><h3>xmlSecNssInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssInit                       (void);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27430"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26460"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27435"></a><h3>
-<a name="XMLSECNSSSHUTDOWN"></a>xmlSecNssShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssShutdown               (void);</pre>
+<a name="XMLSECNSSSHUTDOWN"></a><h3>xmlSecNssShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssShutdown                   (void);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27445"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26474"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27450"></a><h3>
-<a name="XMLSECNSSKEYSMNGRINIT"></a>xmlSecNssKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeysMngrInit           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECNSSKEYSMNGRINIT"></a><h3>xmlSecNssKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysMngrInit               (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Adds NSS specific key data stores in keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27461"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26489"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27466"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26494"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27471"></a><h3>
-<a name="XMLSECNSSGENERATERANDOM"></a>xmlSecNssGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssGenerateRandom         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Generates <var class="PARAMETER">size</var> random bytes and puts result in <var class="PARAMETER">buffer</var>.</p>
+<a name="XMLSECNSSGENERATERANDOM"></a><h3>xmlSecNssGenerateRandom ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssGenerateRandom             (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27485"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26512"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27490"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26517"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27495"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26522"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27500"></a><h3>
-<a name="XMLSECNSSERRORSDEFAULTCALLBACK"></a>xmlSecNssErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecNssErrorsDefaultCallback  (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSECNSSERRORSDEFAULTCALLBACK"></a><h3>xmlSecNssErrorsDefaultCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNssErrorsDefaultCallback      (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 <p>The default errors reporting callback function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27517"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26543"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27522"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26548"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27527"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26553"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27532"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26558"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27537"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26563"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27542"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26568"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27547"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26573"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27552"></a><h3>
-<a name="XMLSECNSSGETINTERNALKEYSLOT"></a>xmlSecNssGetInternalKeySlot ()</h3>
-<pre class="PROGRAMLISTING"><font>PK11SlotInfo</font>* xmlSecNssGetInternalKeySlot   (void);</pre>
+<a name="XMLSECNSSGETINTERNALKEYSLOT"></a><h3>xmlSecNssGetInternalKeySlot ()</h3>
+<pre class="PROGRAMLISTING"><font>PK11SlotInfo</font> *      xmlSecNssGetInternalKeySlot         (void);</pre>
 <p>Gets internal NSS key slot.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>internal key slot and initializes it if needed.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26587"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> internal key slot and initializes it if needed.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27567"></a><h3>
-<a name="XMLSECNSSKEYDATAAESID"></a>xmlSecNssKeyDataAesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataAesId</pre>
+<a name="XMLSECNSSKEYDATAAESID"></a><h3>xmlSecNssKeyDataAesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataAesId</pre>
 <p>The AES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27575"></a><h3>
-<a name="XMLSECNSSKEYDATAAESGETKLASS"></a>xmlSecNssKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataAesGetKlass (void);</pre>
+<a name="XMLSECNSSKEYDATAAESGETKLASS"></a><h3>xmlSecNssKeyDataAesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataAesGetKlass         (void);</pre>
 <p>The AES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27585"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26608"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27590"></a><h3>
-<a name="XMLSECNSSKEYDATAAESSET"></a>xmlSecNssKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataAesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECNSSKEYDATAAESSET"></a><h3>xmlSecNssKeyDataAesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataAesSet              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27603"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26625"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27608"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26630"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27613"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26635"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27618"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26640"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27623"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES128CBCID"></a>xmlSecNssTransformAes128CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformAes128CbcId</pre>
+<a name="XMLSECNSSTRANSFORMAES128CBCID"></a><h3>xmlSecNssTransformAes128CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27631"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES128CBCGETKLASS"></a>xmlSecNssTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformAes128CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecNssTransformAes128CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes128CbcGetKlass (void);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27641"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 128 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26661"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27646"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES192CBCID"></a>xmlSecNssTransformAes192CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformAes192CbcId</pre>
+<a name="XMLSECNSSTRANSFORMAES192CBCID"></a><h3>xmlSecNssTransformAes192CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27654"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES192CBCGETKLASS"></a>xmlSecNssTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformAes192CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecNssTransformAes192CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes192CbcGetKlass (void);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27664"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 192 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26682"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27669"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES256CBCID"></a>xmlSecNssTransformAes256CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformAes256CbcId</pre>
+<a name="XMLSECNSSTRANSFORMAES256CBCID"></a><h3>xmlSecNssTransformAes256CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27677"></a><h3>
-<a name="XMLSECNSSTRANSFORMAES256CBCGETKLASS"></a>xmlSecNssTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformAes256CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecNssTransformAes256CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformAes256CbcGetKlass (void);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27687"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 256 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27692"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES128ID"></a>xmlSecNssTransformKWAes128Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformKWAes128Id</pre>
+<a name="XMLSECNSSTRANSFORMKWAES128ID"></a><h3>xmlSecNssTransformKWAes128Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes128Id</pre>
 <p>The AES 128 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27700"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES128GETKLASS"></a>xmlSecNssTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformKWAes128GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecNssTransformKWAes128GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes128GetKlass  (void);</pre>
 <p>The AES-128 key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-128 key wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26724"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-128 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27715"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES192ID"></a>xmlSecNssTransformKWAes192Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformKWAes192Id</pre>
+<a name="XMLSECNSSTRANSFORMKWAES192ID"></a><h3>xmlSecNssTransformKWAes192Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes192Id</pre>
 <p>The AES 192 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27723"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES192GETKLASS"></a>xmlSecNssTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformKWAes192GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecNssTransformKWAes192GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes192GetKlass  (void);</pre>
 <p>The AES-192 key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27733"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-192 key wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26745"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-192 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27738"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES256ID"></a>xmlSecNssTransformKWAes256Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformKWAes256Id</pre>
+<a name="XMLSECNSSTRANSFORMKWAES256ID"></a><h3>xmlSecNssTransformKWAes256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWAes256Id</pre>
 <p>The AES 256 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27746"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWAES256GETKLASS"></a>xmlSecNssTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformKWAes256GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecNssTransformKWAes256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWAes256GetKlass  (void);</pre>
 <p>The AES-256 key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27756"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-256 key wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26766"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-256 key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27761"></a><h3>
-<a name="XMLSECNSSKEYDATADESID"></a>xmlSecNssKeyDataDesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataDesId</pre>
+<a name="XMLSECNSSKEYDATADESID"></a><h3>xmlSecNssKeyDataDesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataDesId</pre>
 <p>The DES key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27769"></a><h3>
-<a name="XMLSECNSSKEYDATADESGETKLASS"></a>xmlSecNssKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataDesGetKlass (void);</pre>
+<a name="XMLSECNSSKEYDATADESGETKLASS"></a><h3>xmlSecNssKeyDataDesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataDesGetKlass         (void);</pre>
 <p>The DES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27779"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27784"></a><h3>
-<a name="XMLSECNSSKEYDATADESSET"></a>xmlSecNssKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataDesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECNSSKEYDATADESSET"></a><h3>xmlSecNssKeyDataDesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataDesSet              (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27797"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26804"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27802"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26809"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27807"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26814"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26819"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27817"></a><h3>
-<a name="XMLSECNSSTRANSFORMDES3CBCID"></a>xmlSecNssTransformDes3CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformDes3CbcId</pre>
+<a name="XMLSECNSSTRANSFORMDES3CBCID"></a><h3>xmlSecNssTransformDes3CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformDes3CbcId</pre>
 <p>The Triple DES CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27825"></a><h3>
-<a name="XMLSECNSSTRANSFORMDES3CBCGETKLASS"></a>xmlSecNssTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformDes3CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecNssTransformDes3CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformDes3CbcGetKlass   (void);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27835"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to Triple DES encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26840"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27840"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWDES3ID"></a>xmlSecNssTransformKWDes3Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformKWDes3Id</pre>
+<a name="XMLSECNSSTRANSFORMKWDES3ID"></a><h3>xmlSecNssTransformKWDes3Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformKWDes3Id</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27848"></a><h3>
-<a name="XMLSECNSSTRANSFORMKWDES3GETKLASS"></a>xmlSecNssTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformKWDes3GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecNssTransformKWDes3GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformKWDes3GetKlass    (void);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27858"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Triple DES key wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26861"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27863"></a><h3>
-<a name="XMLSECNSSKEYDATADSAID"></a>xmlSecNssKeyDataDsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataDsaId</pre>
+<a name="XMLSECNSSKEYDATADSAID"></a><h3>xmlSecNssKeyDataDsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27871"></a><h3>
-<a name="XMLSECNSSKEYDATADSAGETKLASS"></a>xmlSecNssKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataDsaGetKlass (void);</pre>
+<a name="XMLSECNSSKEYDATADSAGETKLASS"></a><h3>xmlSecNssKeyDataDsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataDsaGetKlass         (void);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27881"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to DSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26882"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27886"></a><h3>
-<a name="XMLSECNSSTRANSFORMDSASHA1ID"></a>xmlSecNssTransformDsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformDsaSha1Id</pre>
+<a name="XMLSECNSSTRANSFORMDSASHA1ID"></a><h3>xmlSecNssTransformDsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27894"></a><h3>
-<a name="XMLSECNSSTRANSFORMDSASHA1GETKLASS"></a>xmlSecNssTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformDsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecNssTransformDsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformDsaSha1GetKlass   (void);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27904"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27909"></a><h3>
-<a name="XMLSECNSSHMACGETMINOUTPUTLENGTH"></a>xmlSecNssHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssHmacGetMinOutputLength (void);</pre>
+<a name="XMLSECNSSHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecNssHmacGetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssHmacGetMinOutputLength     (void);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the min HMAC output length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26917"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27924"></a><h3>
-<a name="XMLSECNSSHMACSETMINOUTPUTLENGTH"></a>xmlSecNssHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecNssHmacSetMinOutputLength (<font>int</font> min_length);</pre>
+<a name="XMLSECNSSHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecNssHmacSetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecNssHmacSetMinOutputLength     (<font>int</font> min_length);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27935"><span style="white-space: nowrap"><var class="PARAMETER">min_length</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26932"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the new min length </p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27940"></a><h3>
-<a name="XMLSECNSSKEYDATAHMACID"></a>xmlSecNssKeyDataHmacId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataHmacId</pre>
+<a name="XMLSECNSSKEYDATAHMACID"></a><h3>xmlSecNssKeyDataHmacId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataHmacId</pre>
 <p>The DHMAC key data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27948"></a><h3>
-<a name="XMLSECNSSKEYDATAHMACGETKLASS"></a>xmlSecNssKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataHmacGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSKEYDATAHMACGETKLASS"></a><h3>xmlSecNssKeyDataHmacGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataHmacGetKlass        (void);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN27958"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HMAC key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26953"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27963"></a><h3>
-<a name="XMLSECNSSKEYDATAHMACSET"></a>xmlSecNssKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataHmacSet         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECNSSKEYDATAHMACSET"></a><h3>xmlSecNssKeyDataHmacSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataHmacSet             (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27976"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26970"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27981"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26975"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27986"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN26980"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN27991"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN26985"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN27996"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACMD5ID"></a>xmlSecNssTransformHmacMd5Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformHmacMd5Id</pre>
+<a name="XMLSECNSSTRANSFORMHMACMD5ID"></a><h3>xmlSecNssTransformHmacMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28004"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACMD5GETKLASS"></a>xmlSecNssTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformHmacMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecNssTransformHmacMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacMd5GetKlass   (void);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28014"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-MD5 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27006"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28019"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACRIPEMD160ID"></a>xmlSecNssTransformHmacRipemd160Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformHmacRipemd160Id</pre>
+<a name="XMLSECNSSTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecNssTransformHmacRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28027"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS"></a>xmlSecNssTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformHmacRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecNssTransformHmacRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacRipemd160GetKlass
+                                                        (void);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28037"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-RIPEMD160 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27027"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28042"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACSHA1ID"></a>xmlSecNssTransformHmacSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformHmacSha1Id</pre>
+<a name="XMLSECNSSTRANSFORMHMACSHA1ID"></a><h3>xmlSecNssTransformHmacSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28050"></a><h3>
-<a name="XMLSECNSSTRANSFORMHMACSHA1GETKLASS"></a>xmlSecNssTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformHmacSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecNssTransformHmacSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformHmacSha1GetKlass  (void);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28060"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA1 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27048"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28065"></a><h3>
-<a name="XMLSECNSSKEYDATARSAID"></a>xmlSecNssKeyDataRsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataRsaId</pre>
+<a name="XMLSECNSSKEYDATARSAID"></a><h3>xmlSecNssKeyDataRsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28073"></a><h3>
-<a name="XMLSECNSSKEYDATARSAGETKLASS"></a>xmlSecNssKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataRsaGetKlass (void);</pre>
+<a name="XMLSECNSSKEYDATARSAGETKLASS"></a><h3>xmlSecNssKeyDataRsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataRsaGetKlass         (void);</pre>
 <p>The RSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28083"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to RSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27069"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28088"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSASHA1ID"></a>xmlSecNssTransformRsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformRsaSha1Id</pre>
+<a name="XMLSECNSSTRANSFORMRSASHA1ID"></a><h3>xmlSecNssTransformRsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28096"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSASHA1GETKLASS"></a>xmlSecNssTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformRsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecNssTransformRsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaSha1GetKlass   (void);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28106"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27090"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28111"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSAPKCS1ID"></a>xmlSecNssTransformRsaPkcs1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformRsaPkcs1Id</pre>
+<a name="XMLSECNSSTRANSFORMRSAPKCS1ID"></a><h3>xmlSecNssTransformRsaPkcs1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28119"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSAPKCS1GETKLASS"></a>xmlSecNssTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformRsaPkcs1GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecNssTransformRsaPkcs1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaPkcs1GetKlass  (void);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28129"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-PKCS1 key transport transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27111"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28134"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSAOAEPID"></a>xmlSecNssTransformRsaOaepId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformRsaOaepId</pre>
+<a name="XMLSECNSSTRANSFORMRSAOAEPID"></a><h3>xmlSecNssTransformRsaOaepId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformRsaOaepId</pre>
 <p>The RSA OAEP key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28142"></a><h3>
-<a name="XMLSECNSSTRANSFORMRSAOAEPGETKLASS"></a>xmlSecNssTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformRsaOaepGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecNssTransformRsaOaepGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformRsaOaepGetKlass   (void);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28152"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-PKCS1 key transport transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27132"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28157"></a><h3>
-<a name="XMLSECNSSTRANSFORMSHA1ID"></a>xmlSecNssTransformSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssTransformSha1Id</pre>
+<a name="XMLSECNSSTRANSFORMSHA1ID"></a><h3>xmlSecNssTransformSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28165"></a><h3>
-<a name="XMLSECNSSTRANSFORMSHA1GETKLASS"></a>xmlSecNssTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecNssTransformSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSTRANSFORMSHA1GETKLASS"></a><h3>xmlSecNssTransformSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecNssTransformSha1GetKlass      (void);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28175"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-1 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27153"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-bignum.html"><b>&lt;&lt;&lt;bignum</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-keysstore.html"><b>keysstore&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-bignum.html"><b>&lt;&lt;&lt; bignum</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-keysstore.html"><b>keysstore &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-keysstore.html b/docs/api/xmlsec-nss-keysstore.html
index 86ed174..7b9631f 100644
--- a/docs/api/xmlsec-nss-keysstore.html
+++ b/docs/api/xmlsec-nss-keysstore.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>keysstore</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="crypto" href="xmlsec-nss-crypto.html">
 <link rel="NEXT" title="pkikeys" href="xmlsec-nss-pkikeys.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,134 +87,127 @@
 <h1>
 <a name="XMLSEC-NSS-KEYSSTORE"></a>keysstore</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28185"></a><h2>Name</h2>keysstore--Keys store implementation for NSS.</div>
+<a name="AEN27163"></a><h2>Name</h2>keysstore -- Keys store implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN28188"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID">xmlSecNssKeysStoreId</a>
-<font>xmlSecKeyStoreId</font> <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREGETKLASS">xmlSecNssKeysStoreGetKlass</a> (void);
-<font>int</font>         <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREADOPTKEY">xmlSecNssKeysStoreAdoptKey</a>      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORELOAD">xmlSecNssKeysStoreLoad</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>int</font>         <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORESAVE">xmlSecNssKeysStoreSave</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSEC-NSS-KEYSSTORE.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREID">xmlSecNssKeysStoreId</a>
+<font>xmlSecKeyStoreId</font>    <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREGETKLASS">xmlSecNssKeysStoreGetKlass</a>          (void);
+<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTOREADOPTKEY">xmlSecNssKeysStoreAdoptKey</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORELOAD">xmlSecNssKeysStoreLoad</a>              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>int</font>                 <a href="xmlsec-nss-keysstore.html#XMLSECNSSKEYSSTORESAVE">xmlSecNssKeysStoreSave</a>              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN28208"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-KEYSSTORE.DESCRIPTION"></a><h2>Description</h2>
 <p>Keys store implementation for NSS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN28211"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-KEYSSTORE.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN28213"></a><h3>
-<a name="XMLSECNSSKEYSSTOREID"></a>xmlSecNssKeysStoreId</h3>
+<a name="XMLSECNSSKEYSSTOREID"></a><h3>xmlSecNssKeysStoreId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecNssKeysStoreId		xmlSecNssKeysStoreGetKlass()</pre>
 <p>A Nss keys store klass id.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28221"></a><h3>
-<a name="XMLSECNSSKEYSSTOREGETKLASS"></a>xmlSecNssKeysStoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font> xmlSecNssKeysStoreGetKlass (void);</pre>
+<a name="XMLSECNSSKEYSSTOREGETKLASS"></a><h3>xmlSecNssKeysStoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyStoreId</font>    xmlSecNssKeysStoreGetKlass          (void);</pre>
 <p>The Nss list based keys store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28231"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Nss list based keys store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27207"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Nss list based keys store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28236"></a><h3>
-<a name="XMLSECNSSKEYSSTOREADOPTKEY"></a>xmlSecNssKeysStoreAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeysStoreAdoptKey      (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECNSSKEYSSTOREADOPTKEY"></a><h3>xmlSecNssKeysStoreAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreAdoptKey          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28250"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27225"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28255"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27230"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27235"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28265"></a><h3>
-<a name="XMLSECNSSKEYSSTORELOAD"></a>xmlSecNssKeysStoreLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeysStoreLoad          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *uri,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECNSSKEYSSTORELOAD"></a><h3>xmlSecNssKeysStoreLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreLoad              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *uri,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Reads keys from an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28278"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27252"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28283"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27257"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28288"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27262"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to associated keys manager. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27267"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28298"></a><h3>
-<a name="XMLSECNSSKEYSSTORESAVE"></a>xmlSecNssKeysStoreSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeysStoreSave          (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Writes keys from <var class="PARAMETER">store</var> to an XML file.</p>
+<a name="XMLSECNSSKEYSSTORESAVE"></a><h3>xmlSecNssKeysStoreSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeysStoreSave              (<a href="xmlsec-keysmngr.html#XMLSECKEYSTORE">xmlSecKeyStorePtr</a> store,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Writes keys from <code class="PARAMETER">store</code> to an XML file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28312"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27285"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to Nss keys store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28317"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27290"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28322"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27295"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the saved keys type (public, private, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27300"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-crypto.html"><b>&lt;&lt;&lt;crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-pkikeys.html"><b>pkikeys&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-pkikeys.html"><b>pkikeys &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-pkikeys.html b/docs/api/xmlsec-nss-pkikeys.html
index 487c0f6..b40dd16 100644
--- a/docs/api/xmlsec-nss-pkikeys.html
+++ b/docs/api/xmlsec-nss-pkikeys.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>pkikeys</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="keysstore" href="xmlsec-nss-keysstore.html">
 <link rel="NEXT" title="x509" href="xmlsec-nss-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,140 +87,129 @@
 <h1>
 <a name="XMLSEC-NSS-PKIKEYS"></a>pkikeys</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28337"></a><h2>Name</h2>pkikeys--PKI keys data implementation.</div>
+<a name="AEN27310"></a><h2>Name</h2>pkikeys -- PKI keys data implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN28340"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIADOPTKEY">xmlSecNssPKIAdoptKey</a>       (<font>SECKEYPrivateKey</font> *privkey,
-                                             <font>SECKEYPublicKey</font> *pubkey);
-<font>SECKEYPublicKey</font>* <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPUBKEY">xmlSecNssPKIKeyDataGetPubKey</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>SECKEYPrivateKey</font>* <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPRIVKEY">xmlSecNssPKIKeyDataGetPrivKey</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>KeyType</font>     <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETKEYTYPE">xmlSecNssPKIKeyDataGetKeyType</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATADUPLICATE">xmlSecNssPKIKeyDataDuplicate</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<a name="XMLSEC-NSS-PKIKEYS.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIADOPTKEY">xmlSecNssPKIAdoptKey</a>                (<font>SECKEYPrivateKey</font> *privkey,
+                                                         <font>SECKEYPublicKey</font> *pubkey);
+<font>SECKEYPublicKey</font>*    <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPUBKEY">xmlSecNssPKIKeyDataGetPubKey</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>SECKEYPrivateKey</font>*   <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETPRIVKEY">xmlSecNssPKIKeyDataGetPrivKey</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>KeyType</font>             <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATAGETKEYTYPE">xmlSecNssPKIKeyDataGetKeyType</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-nss-pkikeys.html#XMLSECNSSPKIKEYDATADUPLICATE">xmlSecNssPKIKeyDataDuplicate</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN28360"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-PKIKEYS.DESCRIPTION"></a><h2>Description</h2>
 <p>PKI keys data implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN28363"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-PKIKEYS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN28365"></a><h3>
-<a name="XMLSECNSSPKIADOPTKEY"></a>xmlSecNssPKIAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecNssPKIAdoptKey       (<font>SECKEYPrivateKey</font> *privkey,
-                                             <font>SECKEYPublicKey</font> *pubkey);</pre>
+<a name="XMLSECNSSPKIADOPTKEY"></a><h3>xmlSecNssPKIAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecNssPKIAdoptKey                (<font>SECKEYPrivateKey</font> *privkey,
+                                                         <font>SECKEYPublicKey</font> *pubkey);</pre>
 <p>Build a KeyData object from the given Private Key and Public
 Key handles.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28377"><span style="white-space: nowrap"><var class="PARAMETER">privkey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27349"><span style="white-space: nowrap"><code class="PARAMETER">privkey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>        the NSS Private Key handle</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28382"><span style="white-space: nowrap"><var class="PARAMETER">pubkey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27354"><span style="white-space: nowrap"><code class="PARAMETER">pubkey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>         the NSS Public Key handle</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28387"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to KeyData object or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27359"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to KeyData object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28392"></a><h3>
-<a name="XMLSECNSSPKIKEYDATAGETPUBKEY"></a>xmlSecNssPKIKeyDataGetPubKey ()</h3>
-<pre class="PROGRAMLISTING"><font>SECKEYPublicKey</font>* xmlSecNssPKIKeyDataGetPubKey
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECNSSPKIKEYDATAGETPUBKEY"></a><h3>xmlSecNssPKIKeyDataGetPubKey ()</h3>
+<pre class="PROGRAMLISTING"><font>SECKEYPublicKey</font>*    xmlSecNssPKIKeyDataGetPubKey        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the Public Key from the key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28403"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27374"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28408"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SECKEYPublicKey or NULL if an error occurs.
+<td align="LEFT" valign="TOP"><a name="AEN27379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SECKEYPublicKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28413"></a><h3>
-<a name="XMLSECNSSPKIKEYDATAGETPRIVKEY"></a>xmlSecNssPKIKeyDataGetPrivKey ()</h3>
-<pre class="PROGRAMLISTING"><font>SECKEYPrivateKey</font>* xmlSecNssPKIKeyDataGetPrivKey
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECNSSPKIKEYDATAGETPRIVKEY"></a><h3>xmlSecNssPKIKeyDataGetPrivKey ()</h3>
+<pre class="PROGRAMLISTING"><font>SECKEYPrivateKey</font>*   xmlSecNssPKIKeyDataGetPrivKey       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the Private Key from the key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28424"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27394"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28429"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SECKEYPrivateKey or NULL if an error occurs.
+<td align="LEFT" valign="TOP"><a name="AEN27399"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SECKEYPrivateKey or NULL if an error occurs.
 Caller is responsible for freeing the key when done</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28434"></a><h3>
-<a name="XMLSECNSSPKIKEYDATAGETKEYTYPE"></a>xmlSecNssPKIKeyDataGetKeyType ()</h3>
-<pre class="PROGRAMLISTING"><font>KeyType</font>     xmlSecNssPKIKeyDataGetKeyType   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECNSSPKIKEYDATAGETKEYTYPE"></a><h3>xmlSecNssPKIKeyDataGetKeyType ()</h3>
+<pre class="PROGRAMLISTING"><font>KeyType</font>             xmlSecNssPKIKeyDataGetKeyType       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the Key Type from the key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28445"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27414"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28450"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Key Type </p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27419"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Key Type </p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28455"></a><h3>
-<a name="XMLSECNSSPKIKEYDATADUPLICATE"></a>xmlSecNssPKIKeyDataDuplicate ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssPKIKeyDataDuplicate    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
+<a name="XMLSECNSSPKIKEYDATADUPLICATE"></a><h3>xmlSecNssPKIKeyDataDuplicate ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssPKIKeyDataDuplicate        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> dst,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> src);</pre>
 <p>Duplicates the keydata from src to dst</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28467"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27435"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data to copy to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28472"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27440"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS Key data to copy from.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28477"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>-1 on error, 0 on success</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27445"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> -1 on error, 0 on success</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-keysstore.html"><b>&lt;&lt;&lt;keysstore</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-x509.html"><b>x509&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-keysstore.html"><b>&lt;&lt;&lt; keysstore</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-x509.html"><b>x509 &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-ref.html b/docs/api/xmlsec-nss-ref.html
index 26f038a..be7f092 100644
--- a/docs/api/xmlsec-nss-ref.html
+++ b/docs/api/xmlsec-nss-ref.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library for NSS API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="crypto" href="xmlsec-gnutls-crypto.html">
 <link rel="NEXT" title="app" href="xmlsec-nss-app.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -91,25 +90,25 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-nss-app.html">app</a>--Application functions implementation for NSS.</dt>
+<a href="xmlsec-nss-app.html">app</a> -- Application functions implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-bignum.html">bignum</a>--Big numbers helper functions.</dt>
+<a href="xmlsec-nss-bignum.html">bignum</a> -- Big numbers helper functions.</dt>
 <dt>
-<a href="xmlsec-nss-crypto.html">crypto</a>--Crypto transforms implementation for NSS.</dt>
+<a href="xmlsec-nss-crypto.html">crypto</a> -- Crypto transforms implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-keysstore.html">keysstore</a>--Keys store implementation for NSS.</dt>
+<a href="xmlsec-nss-keysstore.html">keysstore</a> -- Keys store implementation for NSS.</dt>
 <dt>
-<a href="xmlsec-nss-pkikeys.html">pkikeys</a>--PKI keys data implementation.</dt>
+<a href="xmlsec-nss-pkikeys.html">pkikeys</a> -- PKI keys data implementation.</dt>
 <dt>
-<a href="xmlsec-nss-x509.html">x509</a>--X509 certificates support implementation for NSS.</dt>
+<a href="xmlsec-nss-x509.html">x509</a> -- X509 certificates support implementation for NSS.</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-nss. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-gnutls-crypto.html"><b>&lt;&lt;&lt;crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-nss-app.html"><b>app&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-gnutls-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-nss-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-nss-x509.html b/docs/api/xmlsec-nss-x509.html
index f10c868..b5b413c 100644
--- a/docs/api/xmlsec-nss-x509.html
+++ b/docs/api/xmlsec-nss-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>x509</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for NSS API Reference." href="xmlsec-nss-ref.html">
 <link rel="PREVIOUS" title="pkikeys" href="xmlsec-nss-pkikeys.html">
 <link rel="NEXT" title="XML Security Library for MSCrypto API Reference." href="xmlsec-mscrypto-ref.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,432 +87,398 @@
 <h1>
 <a name="XMLSEC-NSS-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN28487"></a><h2>Name</h2>x509--X509 certificates support implementation for NSS.</div>
+<a name="AEN27455"></a><h2>Name</h2>x509 -- X509 certificates support implementation for NSS.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN28490"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ID">xmlSecNssKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKLASS">xmlSecNssKeyDataX509GetKlass</a>
-                                            (void);
-<font>CERTCertificate</font>* <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKEYCERT">xmlSecNssKeyDataX509GetKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTKEYCERT">xmlSecNssKeyDataX509AdoptKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTCertificate</font> *cert);
-<font>int</font>         <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCERT">xmlSecNssKeyDataX509AdoptCert</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTCertificate</font> *cert);
-<font>CERTCertificate</font>* <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERT">xmlSecNssKeyDataX509GetCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERTSSIZE">xmlSecNssKeyDataX509GetCertsSize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCRL">xmlSecNssKeyDataX509AdoptCrl</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTSignedCrl</font> *crl);
-<font>CERTSignedCrl</font>* <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRL">xmlSecNssKeyDataX509GetCrl</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRLSSIZE">xmlSecNssKeyDataX509GetCrlsSize</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-nss-x509.html#XMLSECNSSX509CERTGETKEY">xmlSecNssX509CertGetKey</a>    (<font>CERTCertificate</font> *cert);
-#define     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTID">xmlSecNssKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTGETKLASS">xmlSecNssKeyDataRawX509CertGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREID">xmlSecNssX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font> <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREGETKLASS">xmlSecNssX509StoreGetKlass</a>
-                                            (void);
-<font>CERTCertificate</font>* <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREFINDCERT">xmlSecNssX509StoreFindCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>CERTCertificate</font>* <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREVERIFY">xmlSecNssX509StoreVerify</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>CERTCertList</font> *certs,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>int</font>         <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREADOPTCERT">xmlSecNssX509StoreAdoptCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>CERTCertificate</font> *cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSEC-NSS-X509.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ID">xmlSecNssKeyDataX509Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKLASS">xmlSecNssKeyDataX509GetKlass</a>        (void);
+<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETKEYCERT">xmlSecNssKeyDataX509GetKeyCert</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTKEYCERT">xmlSecNssKeyDataX509AdoptKeyCert</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTCertificate</font> *cert);
+<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCERT">xmlSecNssKeyDataX509AdoptCert</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTCertificate</font> *cert);
+<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERT">xmlSecNssKeyDataX509GetCert</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCERTSSIZE">xmlSecNssKeyDataX509GetCertsSize</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509ADOPTCRL">xmlSecNssKeyDataX509AdoptCrl</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTSignedCrl</font> *crl);
+<font>CERTSignedCrl</font>*      <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRL">xmlSecNssKeyDataX509GetCrl</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATAX509GETCRLSSIZE">xmlSecNssKeyDataX509GetCrlsSize</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-nss-x509.html#XMLSECNSSX509CERTGETKEY">xmlSecNssX509CertGetKey</a>             (<font>CERTCertificate</font> *cert);
+#define             <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTID">xmlSecNssKeyDataRawX509CertId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-nss-x509.html#XMLSECNSSKEYDATARAWX509CERTGETKLASS">xmlSecNssKeyDataRawX509CertGetKlass</a> (void);
+#define             <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREID">xmlSecNssX509StoreId</a>
+<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREGETKLASS">xmlSecNssX509StoreGetKlass</a>        (void);
+<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREFINDCERT">xmlSecNssX509StoreFindCert</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>CERTCertificate</font>*    <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREVERIFY">xmlSecNssX509StoreVerify</a>            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>CERTCertList</font> *certs,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-nss-x509.html#XMLSECNSSX509STOREADOPTCERT">xmlSecNssX509StoreAdoptCert</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>CERTCertificate</font> *cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN28552"></a><h2>Description</h2>
+<a name="XMLSEC-NSS-X509.DESCRIPTION"></a><h2>Description</h2>
 <p>X509 certificates support implementation for NSS.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN28555"></a><h2>Details</h2>
+<a name="XMLSEC-NSS-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN28557"></a><h3>
-<a name="XMLSECNSSKEYDATAX509ID"></a>xmlSecNssKeyDataX509Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataX509Id</pre>
+<a name="XMLSECNSSKEYDATAX509ID"></a><h3>xmlSecNssKeyDataX509Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataX509Id</pre>
 <p>The NSS X509 data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28565"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETKLASS"></a>xmlSecNssKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataX509GetKlass
-                                            (void);</pre>
-<p>The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-X509Data</span></font>).</p>
+<a name="XMLSECNSSKEYDATAX509GETKLASS"></a><h3>xmlSecNssKeyDataX509GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataX509GetKlass        (void);</pre>
+<p>The NSS X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28577"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the X509 data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27543"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28582"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETKEYCERT"></a>xmlSecNssKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>* xmlSecNssKeyDataX509GetKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECNSSKEYDATAX509GETKEYCERT"></a><h3>xmlSecNssKeyDataX509GetKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssKeyDataX509GetKeyCert      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28593"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27558"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28598"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the key's certificate or NULL if key data was not used for key
+<td align="LEFT" valign="TOP"><a name="AEN27563"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28603"></a><h3>
-<a name="XMLSECNSSKEYDATAX509ADOPTKEYCERT"></a>xmlSecNssKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataX509AdoptKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTCertificate</font> *cert);</pre>
-<p>Sets the key's certificate in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECNSSKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecNssKeyDataX509AdoptKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptKeyCert    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTCertificate</font> *cert);</pre>
+<p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28616"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27580"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28621"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27585"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28626"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27590"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28631"></a><h3>
-<a name="XMLSECNSSKEYDATAX509ADOPTCERT"></a>xmlSecNssKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataX509AdoptCert   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTCertificate</font> *cert);</pre>
+<a name="XMLSECNSSKEYDATAX509ADOPTCERT"></a><h3>xmlSecNssKeyDataX509AdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptCert       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTCertificate</font> *cert);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28643"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27606"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28648"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27611"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28653"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27616"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28658"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETCERT"></a>xmlSecNssKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>* xmlSecNssKeyDataX509GetCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECNSSKEYDATAX509GETCERT"></a><h3>xmlSecNssKeyDataX509GetCert ()</h3>
+<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssKeyDataX509GetCert         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28670"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27632"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28675"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27637"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28680"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to certificate or NULL if <var class="PARAMETER">pos</var> is larger than the 
-number of certificates in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27642"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the 
+number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28687"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETCERTSSIZE"></a>xmlSecNssKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecNssKeyDataX509GetCertsSize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of certificates in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECNSSKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecNssKeyDataX509GetCertsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecNssKeyDataX509GetCertsSize    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28699"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27660"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28704"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of certificates in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27665"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28710"></a><h3>
-<a name="XMLSECNSSKEYDATAX509ADOPTCRL"></a>xmlSecNssKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssKeyDataX509AdoptCrl    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>CERTSignedCrl</font> *crl);</pre>
+<a name="XMLSECNSSKEYDATAX509ADOPTCRL"></a><h3>xmlSecNssKeyDataX509AdoptCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssKeyDataX509AdoptCrl        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>CERTSignedCrl</font> *crl);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28722"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27682"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28727"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27687"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to NSS X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28732"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27692"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28737"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETCRL"></a>xmlSecNssKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTSignedCrl</font>* xmlSecNssKeyDataX509GetCrl   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECNSSKEYDATAX509GETCRL"></a><h3>xmlSecNssKeyDataX509GetCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>CERTSignedCrl</font>*      xmlSecNssKeyDataX509GetCrl          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28749"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27708"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28754"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27713"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>                the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28759"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to CRL or NULL if <var class="PARAMETER">pos</var> is larger than the
-number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27718"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the
+number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28766"></a><h3>
-<a name="XMLSECNSSKEYDATAX509GETCRLSSIZE"></a>xmlSecNssKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecNssKeyDataX509GetCrlsSize (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of CRLs in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECNSSKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecNssKeyDataX509GetCrlsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecNssKeyDataX509GetCrlsSize     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28778"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27736"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28783"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of CRLs in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27741"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28789"></a><h3>
-<a name="XMLSECNSSX509CERTGETKEY"></a>xmlSecNssX509CertGetKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecNssX509CertGetKey    (<font>CERTCertificate</font> *cert);</pre>
-<p>Extracts public key from the <var class="PARAMETER">cert</var>.</p>
+<a name="XMLSECNSSX509CERTGETKEY"></a><h3>xmlSecNssX509CertGetKey ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecNssX509CertGetKey             (<font>CERTCertificate</font> *cert);</pre>
+<p>Extracts public key from the <code class="PARAMETER">cert</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28801"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27758"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28806"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>public key value or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27763"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> public key value or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28811"></a><h3>
-<a name="XMLSECNSSKEYDATARAWX509CERTID"></a>xmlSecNssKeyDataRawX509CertId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssKeyDataRawX509CertId</pre>
+<a name="XMLSECNSSKEYDATARAWX509CERTID"></a><h3>xmlSecNssKeyDataRawX509CertId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssKeyDataRawX509CertId</pre>
 <p>The NSS raw X509 certificate klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28819"></a><h3>
-<a name="XMLSECNSSKEYDATARAWX509CERTGETKLASS"></a>xmlSecNssKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecNssKeyDataRawX509CertGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecNssKeyDataRawX509CertGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecNssKeyDataRawX509CertGetKlass (void);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28829"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>raw X509 certificates key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27784"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28834"></a><h3>
-<a name="XMLSECNSSX509STOREID"></a>xmlSecNssX509StoreId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNssX509StoreId</pre>
+<a name="XMLSECNSSX509STOREID"></a><h3>xmlSecNssX509StoreId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNssX509StoreId</pre>
 <p>The NSS X509 store klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28842"></a><h3>
-<a name="XMLSECNSSX509STOREGETKLASS"></a>xmlSecNssX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font> xmlSecNssX509StoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECNSSX509STOREGETKLASS"></a><h3>xmlSecNssX509StoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecNssX509StoreGetKlass        (void);</pre>
 <p>The NSS X509 certificates key data store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN28852"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to NSS X509 certificates key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27805"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to NSS X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28857"></a><h3>
-<a name="XMLSECNSSX509STOREFINDCERT"></a>xmlSecNssX509StoreFindCert ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>* xmlSecNssX509StoreFindCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Searches <var class="PARAMETER">store</var> for a certificate that matches given criteria.</p>
+<a name="XMLSECNSSX509STOREFINDCERT"></a><h3>xmlSecNssX509StoreFindCert ()</h3>
+<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssX509StoreFindCert          (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Searches <code class="PARAMETER">store</code> for a certificate that matches given criteria.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28874"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27826"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28879"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27831"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28884"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27836"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate issuer name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28889"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27841"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate issuer serial number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28894"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27846"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28899"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27851"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28905"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to found certificate or NULL if certificate is not found
+<td align="LEFT" valign="TOP"><a name="AEN27857"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to found certificate or NULL if certificate is not found
 or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28910"></a><h3>
-<a name="XMLSECNSSX509STOREVERIFY"></a>xmlSecNssX509StoreVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>CERTCertificate</font>* xmlSecNssX509StoreVerify   (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>CERTCertList</font> *certs,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Verifies <var class="PARAMETER">certs</var> list.</p>
+<a name="XMLSECNSSX509STOREVERIFY"></a><h3>xmlSecNssX509StoreVerify ()</h3>
+<pre class="PROGRAMLISTING"><font>CERTCertificate</font>*    xmlSecNssX509StoreVerify            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>CERTCertList</font> *certs,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Verifies <code class="PARAMETER">certs</code> list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28924"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27875"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28929"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27880"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28934"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27885"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28940"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the first verified certificate from <var class="PARAMETER">certs</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27891"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the first verified certificate from <code class="PARAMETER">certs</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN28946"></a><h3>
-<a name="XMLSECNSSX509STOREADOPTCERT"></a>xmlSecNssX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNssX509StoreAdoptCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>CERTCertificate</font> *cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECNSSX509STOREADOPTCERT"></a><h3>xmlSecNssX509StoreAdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNssX509StoreAdoptCert         (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>CERTCertificate</font> *cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28959"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27909"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28964"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27914"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to NSS X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28969"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN27919"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN28974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN27924"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nss-pkikeys.html"><b>&lt;&lt;&lt;pkikeys</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-mscrypto-ref.html"><b>XML Security Library for MSCrypto API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nss-pkikeys.html"><b>&lt;&lt;&lt; pkikeys</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-mscrypto-ref.html"><b>XML Security Library for MSCrypto API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-app.html b/docs/api/xmlsec-openssl-app.html
index ae51138..1572b60 100644
--- a/docs/api/xmlsec-openssl-app.html
+++ b/docs/api/xmlsec-openssl-app.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>app</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="PREVIOUS" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="NEXT" title="bn" href="xmlsec-openssl-bn.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,533 +87,503 @@
 <h1>
 <a name="XMLSEC-OPENSSL-APP"></a>app</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21886"></a><h2>Name</h2>app--Application functions implementation for OpenSSL.</div>
+<a name="AEN21122"></a><h2>Name</h2>app -- Application functions implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN21889"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">xmlSecOpenSSLAppInit</a>            (const <font>char</font> *config);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a>        (void);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT">xmlSecOpenSSLAppDefaultKeysMngrInit</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">xmlSecOpenSSLAppDefaultKeysMngrLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">xmlSecOpenSSLAppDefaultKeysMngrSave</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">xmlSecOpenSSLAppKeysMngrCertLoad</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY">xmlSecOpenSSLAppKeysMngrCertLoadMemory</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">xmlSecOpenSSLAppKeysMngrAddCertsPath</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *path);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE">xmlSecOpenSSLAppKeysMngrAddCertsFile</a>
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *file);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">xmlSecOpenSSLAppKeyLoad</a>        (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADMEMORY">xmlSecOpenSSLAppKeyLoadMemory</a>  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADBIO">xmlSecOpenSSLAppKeyLoadBIO</a>     (<font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a>     (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADMEMORY">xmlSecOpenSSLAppPkcs12LoadMemory</a>
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADBIO">xmlSecOpenSSLAppPkcs12LoadBIO</a>  (<font>BIO</font> *bio,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">xmlSecOpenSSLAppKeyCertLoad</a>     (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADMEMORY">xmlSecOpenSSLAppKeyCertLoadMemory</a>
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>int</font>         <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADBIO">xmlSecOpenSSLAppKeyCertLoadBIO</a>  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYFROMCERTLOADBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</a>
-                                            (<font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
-<font>void</font>*       <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK">xmlSecOpenSSLAppGetDefaultPwdCallback</a>
-                                            (void);</pre>
+<a name="XMLSEC-OPENSSL-APP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPINIT">xmlSecOpenSSLAppInit</a>                (const <font>char</font> *config);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPSHUTDOWN">xmlSecOpenSSLAppShutdown</a>            (void);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT">xmlSecOpenSSLAppDefaultKeysMngrInit</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY">xmlSecOpenSSLAppDefaultKeysMngrAdoptKey</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD">xmlSecOpenSSLAppDefaultKeysMngrLoad</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE">xmlSecOpenSSLAppDefaultKeysMngrSave</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOAD">xmlSecOpenSSLAppKeysMngrCertLoad</a>    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY">xmlSecOpenSSLAppKeysMngrCertLoadMemory</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO">xmlSecOpenSSLAppKeysMngrCertLoadBIO</a> (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH">xmlSecOpenSSLAppKeysMngrAddCertsPath</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *path);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE">xmlSecOpenSSLAppKeysMngrAddCertsFile</a>
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *file);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOAD">xmlSecOpenSSLAppKeyLoad</a>             (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADMEMORY">xmlSecOpenSSLAppKeyLoadMemory</a>       (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYLOADBIO">xmlSecOpenSSLAppKeyLoadBIO</a>          (<font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOAD">xmlSecOpenSSLAppPkcs12Load</a>          (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADMEMORY">xmlSecOpenSSLAppPkcs12LoadMemory</a>    (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPPKCS12LOADBIO">xmlSecOpenSSLAppPkcs12LoadBIO</a>       (<font>BIO</font> *bio,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOAD">xmlSecOpenSSLAppKeyCertLoad</a>         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADMEMORY">xmlSecOpenSSLAppKeyCertLoadMemory</a>   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>int</font>                 <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYCERTLOADBIO">xmlSecOpenSSLAppKeyCertLoadBIO</a>      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPKEYFROMCERTLOADBIO">xmlSecOpenSSLAppKeyFromCertLoadBIO</a>  (<font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);
+<font>void</font>*               <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK">xmlSecOpenSSLAppGetDefaultPwdCallback</a>
+                                                        (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN22003"></a><h2>Description</h2>
+<a name="XMLSEC-OPENSSL-APP.DESCRIPTION"></a><h2>Description</h2>
 <p>Application functions implementation for OpenSSL.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN22006"></a><h2>Details</h2>
+<a name="XMLSEC-OPENSSL-APP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN22008"></a><h3>
-<a name="XMLSECOPENSSLAPPINIT"></a>xmlSecOpenSSLAppInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppInit            (const <font>char</font> *config);</pre>
+<a name="XMLSECOPENSSLAPPINIT"></a><h3>xmlSecOpenSSLAppInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppInit                (const <font>char</font> *config);</pre>
 <p>General crypto engine initialization. This function is used
 by XMLSec command line utility and called before 
-<var class="PARAMETER">xmlSecInit</var> function.</p>
+<code class="PARAMETER">xmlSecInit</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22020"><span style="white-space: nowrap"><var class="PARAMETER">config</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21255"><span style="white-space: nowrap"><code class="PARAMETER">config</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to certs.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22025"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21260"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22030"></a><h3>
-<a name="XMLSECOPENSSLAPPSHUTDOWN"></a>xmlSecOpenSSLAppShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppShutdown        (void);</pre>
+<a name="XMLSECOPENSSLAPPSHUTDOWN"></a><h3>xmlSecOpenSSLAppShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppShutdown            (void);</pre>
 <p>General crypto engine shutdown. This function is used
 by XMLSec command line utility and called after 
-<var class="PARAMETER">xmlSecShutdown</var> function.</p>
+<code class="PARAMETER">xmlSecShutdown</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN22041"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22046"></a><h3>
-<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"></a>xmlSecOpenSSLAppDefaultKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppDefaultKeysMngrInit
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
-<p>Initializes <var class="PARAMETER">mngr</var> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
+<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrInit (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<p>Initializes <code class="PARAMETER">mngr</code> with simple keys store <a href="xmlsec-keysmngr.html#XMLSECSIMPLEKEYSSTOREID"><span class="TYPE">xmlSecSimpleKeysStoreId</span></a>
 and a default OpenSSL crypto key data stores.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22060"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21293"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22065"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21298"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22070"></a><h3>
-<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY"></a>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
-<p>Adds <var class="PARAMETER">key</var> to the keys manager <var class="PARAMETER">mngr</var> created with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecOpenSSLAppDefaultKeysMngrInit</span></a>
+<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRADOPTKEY"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrAdoptKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrAdoptKey
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<p>Adds <code class="PARAMETER">key</code> to the keys manager <code class="PARAMETER">mngr</code> created with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecOpenSSLAppDefaultKeysMngrInit</span></a>
 function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22086"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21318"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22091"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21323"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22096"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21328"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22101"></a><h3>
-<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD"></a>xmlSecOpenSSLAppDefaultKeysMngrLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppDefaultKeysMngrLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *uri);</pre>
-<p>Loads XML keys file from <var class="PARAMETER">uri</var> to the keys manager <var class="PARAMETER">mngr</var> created 
+<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRLOAD"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrLoad (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *uri);</pre>
+<p>Loads XML keys file from <code class="PARAMETER">uri</code> to the keys manager <code class="PARAMETER">mngr</code> created 
 with <a href="xmlsec-openssl-app.html#XMLSECOPENSSLAPPDEFAULTKEYSMNGRINIT"><span class="TYPE">xmlSecOpenSSLAppDefaultKeysMngrInit</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22117"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21348"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22122"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21353"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22127"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21358"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22132"></a><h3>
-<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE"></a>xmlSecOpenSSLAppDefaultKeysMngrSave ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppDefaultKeysMngrSave
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Saves keys from <var class="PARAMETER">mngr</var> to  XML keys file.</p>
+<a name="XMLSECOPENSSLAPPDEFAULTKEYSMNGRSAVE"></a><h3>xmlSecOpenSSLAppDefaultKeysMngrSave ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppDefaultKeysMngrSave (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Saves keys from <code class="PARAMETER">mngr</code> to  XML keys file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22146"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21376"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22151"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21381"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22156"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21386"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the type of keys to save (public/private/symmetric).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22161"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21391"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22166"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOAD"></a>xmlSecOpenSSLAppKeysMngrCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeysMngrCertLoad
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from <var class="PARAMETER">filename</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOAD"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoad    (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from <code class="PARAMETER">filename</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22182"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21411"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22187"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21416"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22192"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21421"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22197"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <var class="PARAMETER">filename</var>
+<td align="LEFT" valign="TOP"><a name="AEN21426"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate in <code class="PARAMETER">filename</code>
    			trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21432"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22208"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY"></a>xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeysMngrCertLoadMemory
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
-<p>Reads cert from binary buffer <var class="PARAMETER">data</var> and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoadMemory
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<p>Reads cert from binary buffer <code class="PARAMETER">data</code> and adds to the list of trusted or known
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22225"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21453"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22230"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21458"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22235"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21463"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22240"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21468"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22245"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21473"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21478"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22255"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO"></a>xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeysMngrCertLoadBIO
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             <font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECOPENSSLAPPKEYSMNGRCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeysMngrCertLoadBIO ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrCertLoadBIO (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         <font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Reads cert from an OpenSSL BIO object and adds to the list of trusted or known
-untrusted certs in <var class="PARAMETER">store</var>.</p>
+untrusted certs in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22270"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21497"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22275"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21502"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the certificate BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22280"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21507"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22285"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21512"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag that indicates is the certificate trusted or not.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22290"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21517"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22295"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH"></a>xmlSecOpenSSLAppKeysMngrAddCertsPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeysMngrAddCertsPath
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *path);</pre>
-<p>Reads cert from <var class="PARAMETER">path</var> and adds to the list of trusted certificates.</p>
+<a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSPATH"></a><h3>xmlSecOpenSSLAppKeysMngrAddCertsPath ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrAddCertsPath
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *path);</pre>
+<p>Reads cert from <code class="PARAMETER">path</code> and adds to the list of trusted certificates.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22308"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21534"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22313"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21539"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the path to trusted certificates.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22318"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21544"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22323"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE"></a>xmlSecOpenSSLAppKeysMngrAddCertsFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeysMngrAddCertsFile
-                                            (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
-                                             const <font>char</font> *file);</pre>
-<p>Reads certs from <var class="PARAMETER">file</var> and adds to the list of trusted certificates.
-It is possible for <var class="PARAMETER">file</var> to contain multiple certs.</p>
+<a name="XMLSECOPENSSLAPPKEYSMNGRADDCERTSFILE"></a><h3>xmlSecOpenSSLAppKeysMngrAddCertsFile ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeysMngrAddCertsFile
+                                                        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr,
+                                                         const <font>char</font> *file);</pre>
+<p>Reads certs from <code class="PARAMETER">file</code> and adds to the list of trusted certificates.
+It is possible for <code class="PARAMETER">file</code> to contain multiple certs.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22337"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21562"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22342"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21567"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the file containing trusted certificates.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22347"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21572"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22352"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYLOAD"></a>xmlSecOpenSSLAppKeyLoad ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppKeyLoad        (const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPKEYLOAD"></a><h3>xmlSecOpenSSLAppKeyLoad ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoad             (const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the a file.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22367"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21591"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22372"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21596"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22377"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21601"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22382"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21606"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22387"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21611"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21616"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22397"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYLOADMEMORY"></a>xmlSecOpenSSLAppKeyLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppKeyLoadMemory  (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPKEYLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeyLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoadMemory       (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the memory buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22413"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21636"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22418"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21641"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the size of binary key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22423"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21646"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22428"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21651"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22433"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21656"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22438"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21661"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22443"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21666"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22448"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYLOADBIO"></a>xmlSecOpenSSLAppKeyLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppKeyLoadBIO     (<font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPKEYLOADBIO"></a><h3>xmlSecOpenSSLAppKeyLoadBIO ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyLoadBIO          (<font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key from the an OpenSSL BIO object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22463"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21685"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22468"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21690"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22473"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21695"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22478"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21700"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the key password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22483"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21705"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22488"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21710"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22493"></a><h3>
-<a name="XMLSECOPENSSLAPPPKCS12LOAD"></a>xmlSecOpenSSLAppPkcs12Load ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppPkcs12Load     (const <font>char</font> *filename,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPPKCS12LOAD"></a><h3>xmlSecOpenSSLAppPkcs12Load ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12Load          (const <font>char</font> *filename,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 file.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -622,37 +591,35 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22507"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21728"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22512"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21733"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22517"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21738"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22522"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21743"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22527"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21748"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22532"></a><h3>
-<a name="XMLSECOPENSSLAPPPKCS12LOADMEMORY"></a>xmlSecOpenSSLAppPkcs12LoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppPkcs12LoadMemory
-                                            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPPKCS12LOADMEMORY"></a><h3>xmlSecOpenSSLAppPkcs12LoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12LoadMemory    (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in memory buffer.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -660,39 +627,38 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22547"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21767"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22552"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21772"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22557"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21777"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22562"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21782"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22567"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21787"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22572"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21792"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22577"></a><h3>
-<a name="XMLSECOPENSSLAPPPKCS12LOADBIO"></a>xmlSecOpenSSLAppPkcs12LoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppPkcs12LoadBIO  (<font>BIO</font> *bio,
-                                             const <font>char</font> *pwd,
-                                             <font>void</font> *pwdCallback,
-                                             <font>void</font> *pwdCallbackCtx);</pre>
+<a name="XMLSECOPENSSLAPPPKCS12LOADBIO"></a><h3>xmlSecOpenSSLAppPkcs12LoadBIO ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppPkcs12LoadBIO       (<font>BIO</font> *bio,
+                                                         const <font>char</font> *pwd,
+                                                         <font>void</font> *pwdCallback,
+                                                         <font>void</font> *pwdCallbackCtx);</pre>
 <p>Reads key and all associated certificates from the PKCS12 data in an OpenSSL BIO object.
 For uniformity, call xmlSecOpenSSLAppKeyLoad instead of this function. Pass
 in format=xmlSecKeyDataFormatPkcs12.</p>
@@ -700,158 +666,156 @@ in format=xmlSecKeyDataFormatPkcs12.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22591"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21810"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 key bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22596"><span style="white-space: nowrap"><var class="PARAMETER">pwd</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21815"><span style="white-space: nowrap"><code class="PARAMETER">pwd</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the PKCS12 file password.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22601"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallback</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21820"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallback</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22606"><span style="white-space: nowrap"><var class="PARAMETER">pwdCallbackCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21825"><span style="white-space: nowrap"><code class="PARAMETER">pwdCallbackCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the user context for password callback.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21830"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22616"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYCERTLOAD"></a>xmlSecOpenSSLAppKeyCertLoad ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeyCertLoad     (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <font>char</font> *filename,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
-<p>Reads the certificate from $<var class="PARAMETER">filename</var> and adds it to key.</p>
+<a name="XMLSECOPENSSLAPPKEYCERTLOAD"></a><h3>xmlSecOpenSSLAppKeyCertLoad ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoad         (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <font>char</font> *filename,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<p>Reads the certificate from $<code class="PARAMETER">filename</code> and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22630"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21848"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22635"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21853"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22640"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21858"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22645"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21863"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22650"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYCERTLOADMEMORY"></a>xmlSecOpenSSLAppKeyCertLoadMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeyCertLoadMemory
-                                            (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECOPENSSLAPPKEYCERTLOADMEMORY"></a><h3>xmlSecOpenSSLAppKeyCertLoadMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoadMemory   (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22664"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21881"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22669"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21886"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22674"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21891"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate binary data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22679"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21896"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22684"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21901"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22689"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYCERTLOADBIO"></a>xmlSecOpenSSLAppKeyCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLAppKeyCertLoadBIO  (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
-                                             <font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECOPENSSLAPPKEYCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeyCertLoadBIO ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLAppKeyCertLoadBIO      (<a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key,
+                                                         <font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Reads the certificate from memory buffer and adds it to key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22702"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21918"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22707"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21923"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate bio.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22712"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21928"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate file format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22717"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21933"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22722"></a><h3>
-<a name="XMLSECOPENSSLAPPKEYFROMCERTLOADBIO"></a>xmlSecOpenSSLAppKeyFromCertLoadBIO ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> xmlSecOpenSSLAppKeyFromCertLoadBIO
-                                            (<font>BIO</font> *bio,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
+<a name="XMLSECOPENSSLAPPKEYFROMCERTLOADBIO"></a><h3>xmlSecOpenSSLAppKeyFromCertLoadBIO ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a>        xmlSecOpenSSLAppKeyFromCertLoadBIO  (<font>BIO</font> *bio,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATAFORMAT">xmlSecKeyDataFormat</a> format);</pre>
 <p>Loads public key from cert.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22734"><span style="white-space: nowrap"><var class="PARAMETER">bio</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21949"><span style="white-space: nowrap"><code class="PARAMETER">bio</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the BIO.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22739"><span style="white-space: nowrap"><var class="PARAMETER">format</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21954"><span style="white-space: nowrap"><code class="PARAMETER">format</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the cert format.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN21959"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22749"></a><h3>
-<a name="XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK"></a>xmlSecOpenSSLAppGetDefaultPwdCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>*       xmlSecOpenSSLAppGetDefaultPwdCallback
-                                            (void);</pre>
+<a name="XMLSECOPENSSLAPPGETDEFAULTPWDCALLBACK"></a><h3>xmlSecOpenSSLAppGetDefaultPwdCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>*               xmlSecOpenSSLAppGetDefaultPwdCallback
+                                                        (void);</pre>
 <p>Gets default password callback.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN21973"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> default password callback.</p></td>
+</tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-ref.html"><b>&lt;&lt;&lt;XML Security Library for OpenSLL API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-bn.html"><b>bn&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-ref.html"><b>&lt;&lt;&lt; XML Security Library for OpenSLL API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-bn.html"><b>bn &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-bn.html b/docs/api/xmlsec-openssl-bn.html
index 9296006..857263c 100644
--- a/docs/api/xmlsec-openssl-bn.html
+++ b/docs/api/xmlsec-openssl-bn.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>bn</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="PREVIOUS" title="app" href="xmlsec-openssl-app.html">
 <link rel="NEXT" title="crypto" href="xmlsec-openssl-crypto.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,59 +87,55 @@
 <h1>
 <a name="XMLSEC-OPENSSL-BN"></a>bn</h1>
 <div class="REFNAMEDIV">
-<a name="AEN22763"></a><h2>Name</h2>bn--Big numbers helper functions.</div>
+<a name="AEN21983"></a><h2>Name</h2>bn -- Big numbers helper functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN22766"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>BIGNUM</font>*     <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">xmlSecOpenSSLNodeGetBNValue</a>     (const <font>xmlNodePtr</font> cur,
-                                             <font>BIGNUM</font> **a);
-<font>int</font>         <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODESETBNVALUE">xmlSecOpenSSLNodeSetBNValue</a>     (<font>xmlNodePtr</font> cur,
-                                             const <font>BIGNUM</font> *a,
-                                             <font>int</font> addLineBreaks);</pre>
+<a name="XMLSEC-OPENSSL-BN.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>BIGNUM</font>*             <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODEGETBNVALUE">xmlSecOpenSSLNodeGetBNValue</a>         (const <font>xmlNodePtr</font> cur,
+                                                         <font>BIGNUM</font> **a);
+<font>int</font>                 <a href="xmlsec-openssl-bn.html#XMLSECOPENSSLNODESETBNVALUE">xmlSecOpenSSLNodeSetBNValue</a>         (<font>xmlNodePtr</font> cur,
+                                                         const <font>BIGNUM</font> *a,
+                                                         <font>int</font> addLineBreaks);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN22778"></a><h2>Description</h2>
+<a name="XMLSEC-OPENSSL-BN.DESCRIPTION"></a><h2>Description</h2>
 <p>Big numbers helper functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN22781"></a><h2>Details</h2>
+<a name="XMLSEC-OPENSSL-BN.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN22783"></a><h3>
-<a name="XMLSECOPENSSLNODEGETBNVALUE"></a>xmlSecOpenSSLNodeGetBNValue ()</h3>
-<pre class="PROGRAMLISTING"><font>BIGNUM</font>*     xmlSecOpenSSLNodeGetBNValue     (const <font>xmlNodePtr</font> cur,
-                                             <font>BIGNUM</font> **a);</pre>
+<a name="XMLSECOPENSSLNODEGETBNVALUE"></a><h3>xmlSecOpenSSLNodeGetBNValue ()</h3>
+<pre class="PROGRAMLISTING"><font>BIGNUM</font>*             xmlSecOpenSSLNodeGetBNValue         (const <font>xmlNodePtr</font> cur,
+                                                         <font>BIGNUM</font> **a);</pre>
 <p>Converts the node content from CryptoBinary format 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-CryptoBinary</span></font>) 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>) 
 to a BIGNUM. If no BIGNUM buffer provided then a new
 BIGNUM is created (caller is responsible for freeing it).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22797"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22016"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the poitner to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22802"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22021"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the BIGNUM buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22807"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>a pointer to BIGNUM produced from CryptoBinary string
+<td align="LEFT" valign="TOP"><a name="AEN22026"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> a pointer to BIGNUM produced from CryptoBinary string
 or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN22812"></a><h3>
-<a name="XMLSECOPENSSLNODESETBNVALUE"></a>xmlSecOpenSSLNodeSetBNValue ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLNodeSetBNValue     (<font>xmlNodePtr</font> cur,
-                                             const <font>BIGNUM</font> *a,
-                                             <font>int</font> addLineBreaks);</pre>
+<a name="XMLSECOPENSSLNODESETBNVALUE"></a><h3>xmlSecOpenSSLNodeSetBNValue ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLNodeSetBNValue         (<font>xmlNodePtr</font> cur,
+                                                         const <font>BIGNUM</font> *a,
+                                                         <font>int</font> addLineBreaks);</pre>
 <p>Converts BIGNUM to CryptoBinary string
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-CryptoBinary</span></font>) 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-CRYPTOBINARY"><span class="TYPE">sec-CryptoBinary</span></gtkdoclink>) 
 and sets it as the content of the given node. If the 
 addLineBreaks is set then line breaks are added 
 before and after the CryptoBinary string.</p>
@@ -148,29 +143,29 @@ before and after the CryptoBinary string.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22827"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22045"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22832"><span style="white-space: nowrap"><var class="PARAMETER">a</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22050"><span style="white-space: nowrap"><code class="PARAMETER">a</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the BIGNUM.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22837"><span style="white-space: nowrap"><var class="PARAMETER">addLineBreaks</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22055"><span style="white-space: nowrap"><code class="PARAMETER">addLineBreaks</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> if the flag is equal to 1 then 
 	linebreaks will be added before and after
 	new buffer content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN22842"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or -1 otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22060"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or -1 otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-app.html"><b>&lt;&lt;&lt;app</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-crypto.html"><b>crypto&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-app.html"><b>&lt;&lt;&lt; app</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-crypto.html"><b>crypto &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-crypto.html b/docs/api/xmlsec-openssl-crypto.html
index cb2cb4d..c95af31 100644
--- a/docs/api/xmlsec-openssl-crypto.html
+++ b/docs/api/xmlsec-openssl-crypto.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>crypto</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="PREVIOUS" title="bn" href="xmlsec-openssl-bn.html">
 <link rel="NEXT" title="evp" href="xmlsec-openssl-evp.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,1498 +87,1374 @@
 <h1>
 <a name="XMLSEC-OPENSSL-CRYPTO"></a>crypto</h1>
 <div class="REFNAMEDIV">
-<a name="AEN22852"></a><h2>Name</h2>crypto--Crypto transforms implementation for OpenSSL.</div>
+<a name="AEN22070"></a><h2>Name</h2>crypto -- Crypto transforms implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN22855"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA224-CAPS">XMLSEC_NO_SHA224</a>
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA256-CAPS">XMLSEC_NO_SHA256</a>
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA384-CAPS">XMLSEC_NO_SHA384</a>
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA512-CAPS">XMLSEC_NO_SHA512</a>
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-AES-CAPS">XMLSEC_NO_AES</a>
-<font>xmlSecCryptoDLFunctionsPtr</font> <a href="xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">xmlSecCryptoGetFunctions_openssl</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLINIT">xmlSecOpenSSLInit</a>               (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSHUTDOWN">xmlSecOpenSSLShutdown</a>           (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYSMNGRINIT">xmlSecOpenSSLKeysMngrInit</a>       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGENERATERANDOM">xmlSecOpenSSLGenerateRandom</a>     (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLSetDefaultTrustedCertsFolder</a>
-                                            (const <font>xmlChar</font> *path);
-const <font>xmlChar</font>* <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLGetDefaultTrustedCertsFolder</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESID">xmlSecOpenSSLKeyDataAesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESGETKLASS">xmlSecOpenSSLKeyDataAesGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESSET">xmlSecOpenSSLKeyDataAesSet</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCID">xmlSecOpenSSLTransformAes128CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS">xmlSecOpenSSLTransformAes128CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCID">xmlSecOpenSSLTransformAes192CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS">xmlSecOpenSSLTransformAes192CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCID">xmlSecOpenSSLTransformAes256CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS">xmlSecOpenSSLTransformAes256CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128ID">xmlSecOpenSSLTransformKWAes128Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128GETKLASS">xmlSecOpenSSLTransformKWAes128GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192ID">xmlSecOpenSSLTransformKWAes192Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192GETKLASS">xmlSecOpenSSLTransformKWAes192GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256ID">xmlSecOpenSSLTransformKWAes256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256GETKLASS">xmlSecOpenSSLTransformKWAes256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESID">xmlSecOpenSSLKeyDataDesId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESGETKLASS">xmlSecOpenSSLKeyDataDesGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESSET">xmlSecOpenSSLKeyDataDesSet</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCID">xmlSecOpenSSLTransformDes3CbcId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS">xmlSecOpenSSLTransformDes3CbcGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3ID">xmlSecOpenSSLTransformKWDes3Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3GETKLASS">xmlSecOpenSSLTransformKWDes3GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAID">xmlSecOpenSSLKeyDataDsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETKLASS">xmlSecOpenSSLKeyDataDsaGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTDSA">xmlSecOpenSSLKeyDataDsaAdoptDsa</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>DSA</font> *dsa);
-<font>DSA</font>*        <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETDSA">xmlSecOpenSSLKeyDataDsaGetDsa</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTEVP">xmlSecOpenSSLKeyDataDsaAdoptEvp</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETEVP">xmlSecOpenSSLKeyDataDsaGetEvp</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1ID">xmlSecOpenSSLTransformDsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS">xmlSecOpenSSLTransformDsaSha1GetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACGETMINOUTPUTLENGTH">xmlSecOpenSSLHmacGetMinOutputLength</a>
-                                            (void);
-<font>void</font>        <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACSETMINOUTPUTLENGTH">xmlSecOpenSSLHmacSetMinOutputLength</a>
-                                            (<font>int</font> min_length);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACID">xmlSecOpenSSLKeyDataHmacId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACGETKLASS">xmlSecOpenSSLKeyDataHmacGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACSET">xmlSecOpenSSLKeyDataHmacSet</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5ID">xmlSecOpenSSLTransformHmacMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS">xmlSecOpenSSLTransformHmacMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID">xmlSecOpenSSLTransformHmacRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">xmlSecOpenSSLTransformHmacRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1ID">xmlSecOpenSSLTransformHmacSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">xmlSecOpenSSLTransformHmacSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224ID">xmlSecOpenSSLTransformHmacSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS">xmlSecOpenSSLTransformHmacSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256ID">xmlSecOpenSSLTransformHmacSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS">xmlSecOpenSSLTransformHmacSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384ID">xmlSecOpenSSLTransformHmacSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS">xmlSecOpenSSLTransformHmacSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512ID">xmlSecOpenSSLTransformHmacSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS">xmlSecOpenSSLTransformHmacSha512GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5ID">xmlSecOpenSSLTransformMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5GETKLASS">xmlSecOpenSSLTransformMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160ID">xmlSecOpenSSLTransformRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS">xmlSecOpenSSLTransformRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAID">xmlSecOpenSSLKeyDataRsaId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETKLASS">xmlSecOpenSSLKeyDataRsaGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTRSA">xmlSecOpenSSLKeyDataRsaAdoptRsa</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>RSA</font> *rsa);
-<font>RSA</font>*        <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETRSA">xmlSecOpenSSLKeyDataRsaGetRsa</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTEVP">xmlSecOpenSSLKeyDataRsaAdoptEvp</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETEVP">xmlSecOpenSSLKeyDataRsaGetEvp</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5ID">xmlSecOpenSSLTransformRsaMd5Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS">xmlSecOpenSSLTransformRsaMd5GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160ID">xmlSecOpenSSLTransformRsaRipemd160Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS">xmlSecOpenSSLTransformRsaRipemd160GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1ID">xmlSecOpenSSLTransformRsaSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS">xmlSecOpenSSLTransformRsaSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224ID">xmlSecOpenSSLTransformRsaSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS">xmlSecOpenSSLTransformRsaSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256ID">xmlSecOpenSSLTransformRsaSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS">xmlSecOpenSSLTransformRsaSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384ID">xmlSecOpenSSLTransformRsaSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS">xmlSecOpenSSLTransformRsaSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512ID">xmlSecOpenSSLTransformRsaSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS">xmlSecOpenSSLTransformRsaSha512GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1ID">xmlSecOpenSSLTransformRsaPkcs1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS">xmlSecOpenSSLTransformRsaPkcs1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPID">xmlSecOpenSSLTransformRsaOaepId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS">xmlSecOpenSSLTransformRsaOaepGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1ID">xmlSecOpenSSLTransformSha1Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1GETKLASS">xmlSecOpenSSLTransformSha1GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224ID">xmlSecOpenSSLTransformSha224Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224GETKLASS">xmlSecOpenSSLTransformSha224GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256ID">xmlSecOpenSSLTransformSha256Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256GETKLASS">xmlSecOpenSSLTransformSha256GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384ID">xmlSecOpenSSLTransformSha384Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384GETKLASS">xmlSecOpenSSLTransformSha384GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512ID">xmlSecOpenSSLTransformSha512Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512GETKLASS">xmlSecOpenSSLTransformSha512GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB-CAPS">XMLSEC_OPENSSL_ERRORS_LIB</a>
-#define     <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</a>
-<font>void</font>        <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a>
-                                            (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSEC-OPENSSL-CRYPTO.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA224--CAPS">XMLSEC_NO_SHA224</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA256--CAPS">XMLSEC_NO_SHA256</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA384--CAPS">XMLSEC_NO_SHA384</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-SHA512--CAPS">XMLSEC_NO_SHA512</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-NO-AES--CAPS">XMLSEC_NO_AES</a>
+<font>xmlSecCryptoDLFunctionsPtr</font>  <a href="xmlsec-openssl-crypto.html#XMLSECCRYPTOGETFUNCTIONS-OPENSSL">xmlSecCryptoGetFunctions_openssl</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLINIT">xmlSecOpenSSLInit</a>                   (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSHUTDOWN">xmlSecOpenSSLShutdown</a>               (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYSMNGRINIT">xmlSecOpenSSLKeysMngrInit</a>           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGENERATERANDOM">xmlSecOpenSSLGenerateRandom</a>         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLSetDefaultTrustedCertsFolder</a>
+                                                        (const <font>xmlChar</font> *path);
+const <font>xmlChar</font>*      <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER">xmlSecOpenSSLGetDefaultTrustedCertsFolder</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESID">xmlSecOpenSSLKeyDataAesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESGETKLASS">xmlSecOpenSSLKeyDataAesGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAAESSET">xmlSecOpenSSLKeyDataAesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCID">xmlSecOpenSSLTransformAes128CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS">xmlSecOpenSSLTransformAes128CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCID">xmlSecOpenSSLTransformAes192CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS">xmlSecOpenSSLTransformAes192CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCID">xmlSecOpenSSLTransformAes256CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS">xmlSecOpenSSLTransformAes256CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128ID">xmlSecOpenSSLTransformKWAes128Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES128GETKLASS">xmlSecOpenSSLTransformKWAes128GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192ID">xmlSecOpenSSLTransformKWAes192Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES192GETKLASS">xmlSecOpenSSLTransformKWAes192GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256ID">xmlSecOpenSSLTransformKWAes256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWAES256GETKLASS">xmlSecOpenSSLTransformKWAes256GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESID">xmlSecOpenSSLKeyDataDesId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESGETKLASS">xmlSecOpenSSLKeyDataDesGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADESSET">xmlSecOpenSSLKeyDataDesSet</a>          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCID">xmlSecOpenSSLTransformDes3CbcId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS">xmlSecOpenSSLTransformDes3CbcGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3ID">xmlSecOpenSSLTransformKWDes3Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMKWDES3GETKLASS">xmlSecOpenSSLTransformKWDes3GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAID">xmlSecOpenSSLKeyDataDsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETKLASS">xmlSecOpenSSLKeyDataDsaGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTDSA">xmlSecOpenSSLKeyDataDsaAdoptDsa</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>DSA</font> *dsa);
+<font>DSA</font>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETDSA">xmlSecOpenSSLKeyDataDsaGetDsa</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAADOPTEVP">xmlSecOpenSSLKeyDataDsaAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);
+<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATADSAGETEVP">xmlSecOpenSSLKeyDataDsaGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1ID">xmlSecOpenSSLTransformDsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS">xmlSecOpenSSLTransformDsaSha1GetKlass</a>
+                                                        (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACGETMINOUTPUTLENGTH">xmlSecOpenSSLHmacGetMinOutputLength</a> (void);
+<font>void</font>                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLHMACSETMINOUTPUTLENGTH">xmlSecOpenSSLHmacSetMinOutputLength</a> (<font>int</font> min_length);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACID">xmlSecOpenSSLKeyDataHmacId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACGETKLASS">xmlSecOpenSSLKeyDataHmacGetKlass</a>    (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATAHMACSET">xmlSecOpenSSLKeyDataHmacSet</a>         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5ID">xmlSecOpenSSLTransformHmacMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS">xmlSecOpenSSLTransformHmacMd5GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID">xmlSecOpenSSLTransformHmacRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS">xmlSecOpenSSLTransformHmacRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1ID">xmlSecOpenSSLTransformHmacSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS">xmlSecOpenSSLTransformHmacSha1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224ID">xmlSecOpenSSLTransformHmacSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS">xmlSecOpenSSLTransformHmacSha224GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256ID">xmlSecOpenSSLTransformHmacSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS">xmlSecOpenSSLTransformHmacSha256GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384ID">xmlSecOpenSSLTransformHmacSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS">xmlSecOpenSSLTransformHmacSha384GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512ID">xmlSecOpenSSLTransformHmacSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS">xmlSecOpenSSLTransformHmacSha512GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5ID">xmlSecOpenSSLTransformMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMMD5GETKLASS">xmlSecOpenSSLTransformMd5GetKlass</a>   (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160ID">xmlSecOpenSSLTransformRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS">xmlSecOpenSSLTransformRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAID">xmlSecOpenSSLKeyDataRsaId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETKLASS">xmlSecOpenSSLKeyDataRsaGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTRSA">xmlSecOpenSSLKeyDataRsaAdoptRsa</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>RSA</font> *rsa);
+<font>RSA</font>*                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETRSA">xmlSecOpenSSLKeyDataRsaGetRsa</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAADOPTEVP">xmlSecOpenSSLKeyDataRsaAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);
+<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLKEYDATARSAGETEVP">xmlSecOpenSSLKeyDataRsaGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5ID">xmlSecOpenSSLTransformRsaMd5Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS">xmlSecOpenSSLTransformRsaMd5GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160ID">xmlSecOpenSSLTransformRsaRipemd160Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS">xmlSecOpenSSLTransformRsaRipemd160GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1ID">xmlSecOpenSSLTransformRsaSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS">xmlSecOpenSSLTransformRsaSha1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224ID">xmlSecOpenSSLTransformRsaSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS">xmlSecOpenSSLTransformRsaSha224GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256ID">xmlSecOpenSSLTransformRsaSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS">xmlSecOpenSSLTransformRsaSha256GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384ID">xmlSecOpenSSLTransformRsaSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS">xmlSecOpenSSLTransformRsaSha384GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512ID">xmlSecOpenSSLTransformRsaSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS">xmlSecOpenSSLTransformRsaSha512GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1ID">xmlSecOpenSSLTransformRsaPkcs1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS">xmlSecOpenSSLTransformRsaPkcs1GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPID">xmlSecOpenSSLTransformRsaOaepId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS">xmlSecOpenSSLTransformRsaOaepGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1ID">xmlSecOpenSSLTransformSha1Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA1GETKLASS">xmlSecOpenSSLTransformSha1GetKlass</a>  (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224ID">xmlSecOpenSSLTransformSha224Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA224GETKLASS">xmlSecOpenSSLTransformSha224GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256ID">xmlSecOpenSSLTransformSha256Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA256GETKLASS">xmlSecOpenSSLTransformSha256GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384ID">xmlSecOpenSSLTransformSha384Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA384GETKLASS">xmlSecOpenSSLTransformSha384GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512ID">xmlSecOpenSSLTransformSha512Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLTRANSFORMSHA512GETKLASS">xmlSecOpenSSLTransformSha512GetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-LIB--CAPS">XMLSEC_OPENSSL_ERRORS_LIB</a>
+#define             <a href="xmlsec-openssl-crypto.html#XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS">XMLSEC_OPENSSL_ERRORS_FUNCTION</a>
+<font>void</font>                <a href="xmlsec-openssl-crypto.html#XMLSECOPENSSLERRORSDEFAULTCALLBACK">xmlSecOpenSSLErrorsDefaultCallback</a>  (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN23051"></a><h2>Description</h2>
+<a name="XMLSEC-OPENSSL-CRYPTO.DESCRIPTION"></a><h2>Description</h2>
 <p>Crypto transforms implementation for OpenSSL.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN23054"></a><h2>Details</h2>
+<a name="XMLSEC-OPENSSL-CRYPTO.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN23056"></a><h3>
-<a name="XMLSEC-NO-SHA224-CAPS"></a>XMLSEC_NO_SHA224</h3>
+<a name="XMLSEC-NO-SHA224--CAPS"></a><h3>XMLSEC_NO_SHA224</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_NO_SHA224 1</pre>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23063"></a><h3>
-<a name="XMLSEC-NO-SHA256-CAPS"></a>XMLSEC_NO_SHA256</h3>
+<a name="XMLSEC-NO-SHA256--CAPS"></a><h3>XMLSEC_NO_SHA256</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_NO_SHA256 1</pre>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23070"></a><h3>
-<a name="XMLSEC-NO-SHA384-CAPS"></a>XMLSEC_NO_SHA384</h3>
+<a name="XMLSEC-NO-SHA384--CAPS"></a><h3>XMLSEC_NO_SHA384</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_NO_SHA384 1</pre>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23077"></a><h3>
-<a name="XMLSEC-NO-SHA512-CAPS"></a>XMLSEC_NO_SHA512</h3>
+<a name="XMLSEC-NO-SHA512--CAPS"></a><h3>XMLSEC_NO_SHA512</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_NO_SHA512 1</pre>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23084"></a><h3>
-<a name="XMLSEC-NO-AES-CAPS"></a>XMLSEC_NO_AES</h3>
+<a name="XMLSEC-NO-AES--CAPS"></a><h3>XMLSEC_NO_AES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_NO_AES	 1</pre>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23091"></a><h3>
-<a name="XMLSECCRYPTOGETFUNCTIONS-OPENSSL"></a>xmlSecCryptoGetFunctions_openssl ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font> xmlSecCryptoGetFunctions_openssl
-                                            (void);</pre>
+<a name="XMLSECCRYPTOGETFUNCTIONS-OPENSSL"></a><h3>xmlSecCryptoGetFunctions_openssl ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecCryptoDLFunctionsPtr</font>  xmlSecCryptoGetFunctions_openssl
+                                                        (void);</pre>
 <p>Gets the pointer to xmlsec-openssl functions table.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23101"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the xmlsec-openssl functions table or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22313"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the xmlsec-openssl functions table or NULL if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23106"></a><h3>
-<a name="XMLSECOPENSSLINIT"></a>xmlSecOpenSSLInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLInit               (void);</pre>
+<a name="XMLSECOPENSSLINIT"></a><h3>xmlSecOpenSSLInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLInit                   (void);</pre>
 <p>XMLSec library specific crypto engine initialization.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22327"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23121"></a><h3>
-<a name="XMLSECOPENSSLSHUTDOWN"></a>xmlSecOpenSSLShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLShutdown           (void);</pre>
+<a name="XMLSECOPENSSLSHUTDOWN"></a><h3>xmlSecOpenSSLShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLShutdown               (void);</pre>
 <p>XMLSec library specific crypto engine shutdown.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23131"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22341"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23136"></a><h3>
-<a name="XMLSECOPENSSLKEYSMNGRINIT"></a>xmlSecOpenSSLKeysMngrInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeysMngrInit       (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
+<a name="XMLSECOPENSSLKEYSMNGRINIT"></a><h3>xmlSecOpenSSLKeysMngrInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeysMngrInit           (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> mngr);</pre>
 <p>Adds OpenSSL specific key data stores in keys manager.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23147"><span style="white-space: nowrap"><var class="PARAMETER">mngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22356"><span style="white-space: nowrap"><code class="PARAMETER">mngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23152"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22361"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23157"></a><h3>
-<a name="XMLSECOPENSSLGENERATERANDOM"></a>xmlSecOpenSSLGenerateRandom ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLGenerateRandom     (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Generates <var class="PARAMETER">size</var> random bytes and puts result in <var class="PARAMETER">buffer</var>.</p>
+<a name="XMLSECOPENSSLGENERATERANDOM"></a><h3>xmlSecOpenSSLGenerateRandom ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLGenerateRandom         (<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Generates <code class="PARAMETER">size</code> random bytes and puts result in <code class="PARAMETER">buffer</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23171"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22379"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23176"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22384"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the numer of bytes to generate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23181"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22389"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23186"></a><h3>
-<a name="XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER"></a>xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLSetDefaultTrustedCertsFolder
-                                            (const <font>xmlChar</font> *path);</pre>
+<a name="XMLSECOPENSSLSETDEFAULTTRUSTEDCERTSFOLDER"></a><h3>xmlSecOpenSSLSetDefaultTrustedCertsFolder ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLSetDefaultTrustedCertsFolder
+                                                        (const <font>xmlChar</font> *path);</pre>
 <p>Sets the default trusted certs folder.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23197"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22404"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the default trusted certs path.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23202"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22409"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23207"></a><h3>
-<a name="XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER"></a>xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>* xmlSecOpenSSLGetDefaultTrustedCertsFolder
-                                            (void);</pre>
+<a name="XMLSECOPENSSLGETDEFAULTTRUSTEDCERTSFOLDER"></a><h3>xmlSecOpenSSLGetDefaultTrustedCertsFolder ()</h3>
+<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecOpenSSLGetDefaultTrustedCertsFolder
+                                                        (void);</pre>
 <p>Gets the default trusted certs folder.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23217"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the default trusted cert folder.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the default trusted cert folder.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23222"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAAESID"></a>xmlSecOpenSSLKeyDataAesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataAesId</pre>
+<a name="XMLSECOPENSSLKEYDATAAESID"></a><h3>xmlSecOpenSSLKeyDataAesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataAesId</pre>
 <p>The AES key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23230"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAAESGETKLASS"></a>xmlSecOpenSSLKeyDataAesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataAesGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATAAESGETKLASS"></a><h3>xmlSecOpenSSLKeyDataAesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataAesGetKlass     (void);</pre>
 <p>The AES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23240"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22444"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23245"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAAESSET"></a>xmlSecOpenSSLKeyDataAesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataAesSet      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECOPENSSLKEYDATAAESSET"></a><h3>xmlSecOpenSSLKeyDataAesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataAesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of AES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23258"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22461"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to AES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23263"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22466"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23268"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22471"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23273"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22476"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23278"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES128CBCID"></a>xmlSecOpenSSLTransformAes128CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformAes128CbcId</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES128CBCID"></a><h3>xmlSecOpenSSLTransformAes128CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes128CbcId</pre>
 <p>The AES128 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23286"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS"></a>xmlSecOpenSSLTransformAes128CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformAes128CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES128CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes128CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes128CbcGetKlass
+                                                        (void);</pre>
 <p>AES 128 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23296"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 128 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22497"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 128 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23301"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES192CBCID"></a>xmlSecOpenSSLTransformAes192CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformAes192CbcId</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES192CBCID"></a><h3>xmlSecOpenSSLTransformAes192CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes192CbcId</pre>
 <p>The AES192 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23309"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS"></a>xmlSecOpenSSLTransformAes192CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformAes192CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES192CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes192CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes192CbcGetKlass
+                                                        (void);</pre>
 <p>AES 192 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23319"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 192 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22518"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 192 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23324"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES256CBCID"></a>xmlSecOpenSSLTransformAes256CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformAes256CbcId</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES256CBCID"></a><h3>xmlSecOpenSSLTransformAes256CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformAes256CbcId</pre>
 <p>The AES256 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23332"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS"></a>xmlSecOpenSSLTransformAes256CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformAes256CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMAES256CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformAes256CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformAes256CbcGetKlass
+                                                        (void);</pre>
 <p>AES 256 CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23342"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to AES 256 CBC encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22539"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to AES 256 CBC encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23347"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES128ID"></a>xmlSecOpenSSLTransformKWAes128Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformKWAes128Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES128ID"></a><h3>xmlSecOpenSSLTransformKWAes128Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes128Id</pre>
 <p>The AES 128 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23355"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES128GETKLASS"></a>xmlSecOpenSSLTransformKWAes128GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformKWAes128GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES128GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes128GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes128GetKlass
+                                                        (void);</pre>
 <p>The AES-128 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23365"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-128 kew wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-128 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23370"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES192ID"></a>xmlSecOpenSSLTransformKWAes192Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformKWAes192Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES192ID"></a><h3>xmlSecOpenSSLTransformKWAes192Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes192Id</pre>
 <p>The AES 192 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23378"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES192GETKLASS"></a>xmlSecOpenSSLTransformKWAes192GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformKWAes192GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES192GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes192GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes192GetKlass
+                                                        (void);</pre>
 <p>The AES-192 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23388"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-192 kew wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22581"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-192 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23393"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES256ID"></a>xmlSecOpenSSLTransformKWAes256Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformKWAes256Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES256ID"></a><h3>xmlSecOpenSSLTransformKWAes256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWAes256Id</pre>
 <p>The AES 256 key wrap transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23401"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWAES256GETKLASS"></a>xmlSecOpenSSLTransformKWAes256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformKWAes256GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWAES256GETKLASS"></a><h3>xmlSecOpenSSLTransformKWAes256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWAes256GetKlass
+                                                        (void);</pre>
 <p>The AES-256 kew wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23411"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>AES-256 kew wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22602"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> AES-256 kew wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23416"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADESID"></a>xmlSecOpenSSLKeyDataDesId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataDesId</pre>
+<a name="XMLSECOPENSSLKEYDATADESID"></a><h3>xmlSecOpenSSLKeyDataDesId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataDesId</pre>
 <p>The DES key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23424"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADESGETKLASS"></a>xmlSecOpenSSLKeyDataDesGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataDesGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATADESGETKLASS"></a><h3>xmlSecOpenSSLKeyDataDesGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataDesGetKlass     (void);</pre>
 <p>The DES key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23434"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DES key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22623"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DES key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23439"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADESSET"></a>xmlSecOpenSSLKeyDataDesSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataDesSet      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECOPENSSLKEYDATADESSET"></a><h3>xmlSecOpenSSLKeyDataDesSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDesSet          (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of DES key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23452"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22640"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DES key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23457"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22645"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23462"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22650"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22655"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23472"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMDES3CBCID"></a>xmlSecOpenSSLTransformDes3CbcId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformDes3CbcId</pre>
+<a name="XMLSECOPENSSLTRANSFORMDES3CBCID"></a><h3>xmlSecOpenSSLTransformDes3CbcId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformDes3CbcId</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23480"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS"></a>xmlSecOpenSSLTransformDes3CbcGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformDes3CbcGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMDES3CBCGETKLASS"></a><h3>xmlSecOpenSSLTransformDes3CbcGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformDes3CbcGetKlass
+                                                        (void);</pre>
 <p>Triple DES CBC encryption transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23490"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to Triple DES encryption transform.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22676"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to Triple DES encryption transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23495"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWDES3ID"></a>xmlSecOpenSSLTransformKWDes3Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformKWDes3Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWDES3ID"></a><h3>xmlSecOpenSSLTransformKWDes3Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformKWDes3Id</pre>
 <p>The DES3 CBC cipher transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23503"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMKWDES3GETKLASS"></a>xmlSecOpenSSLTransformKWDes3GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformKWDes3GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMKWDES3GETKLASS"></a><h3>xmlSecOpenSSLTransformKWDes3GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformKWDes3GetKlass
+                                                        (void);</pre>
 <p>The Triple DES key wrapper transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23513"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Triple DES key wrapper transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22697"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Triple DES key wrapper transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23518"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAID"></a>xmlSecOpenSSLKeyDataDsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataDsaId</pre>
+<a name="XMLSECOPENSSLKEYDATADSAID"></a><h3>xmlSecOpenSSLKeyDataDsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataDsaId</pre>
 <p>The DSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23526"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAGETKLASS"></a>xmlSecOpenSSLKeyDataDsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataDsaGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATADSAGETKLASS"></a><h3>xmlSecOpenSSLKeyDataDsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataDsaGetKlass     (void);</pre>
 <p>The DSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23536"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to DSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22718"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to DSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23541"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAADOPTDSA"></a>xmlSecOpenSSLKeyDataDsaAdoptDsa ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataDsaAdoptDsa (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>DSA</font> *dsa);</pre>
+<a name="XMLSECOPENSSLKEYDATADSAADOPTDSA"></a><h3>xmlSecOpenSSLKeyDataDsaAdoptDsa ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDsaAdoptDsa     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>DSA</font> *dsa);</pre>
 <p>Sets the value of DSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23553"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22734"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23558"><span style="white-space: nowrap"><var class="PARAMETER">dsa</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22739"><span style="white-space: nowrap"><code class="PARAMETER">dsa</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL DSA key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23563"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23568"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAGETDSA"></a>xmlSecOpenSSLKeyDataDsaGetDsa ()</h3>
-<pre class="PROGRAMLISTING"><font>DSA</font>*        xmlSecOpenSSLKeyDataDsaGetDsa   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLKEYDATADSAGETDSA"></a><h3>xmlSecOpenSSLKeyDataDsaGetDsa ()</h3>
+<pre class="PROGRAMLISTING"><font>DSA</font>*                xmlSecOpenSSLKeyDataDsaGetDsa       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the OpenSSL DSA key from DSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23579"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22759"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23584"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL DSA key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22764"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL DSA key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23589"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAADOPTEVP"></a>xmlSecOpenSSLKeyDataDsaAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataDsaAdoptEvp (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);</pre>
+<a name="XMLSECOPENSSLKEYDATADSAADOPTEVP"></a><h3>xmlSecOpenSSLKeyDataDsaAdoptEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataDsaAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);</pre>
 <p>Sets the DSA key data value to OpenSSL EVP key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23601"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22780"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23606"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22785"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23611"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22790"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23616"></a><h3>
-<a name="XMLSECOPENSSLKEYDATADSAGETEVP"></a>xmlSecOpenSSLKeyDataDsaGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*   xmlSecOpenSSLKeyDataDsaGetEvp   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLKEYDATADSAGETEVP"></a><h3>xmlSecOpenSSLKeyDataDsaGetEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLKeyDataDsaGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the OpenSSL EVP key from DSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23627"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22805"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to DSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23632"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22810"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23637"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMDSASHA1ID"></a>xmlSecOpenSSLTransformDsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformDsaSha1Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMDSASHA1ID"></a><h3>xmlSecOpenSSLTransformDsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformDsaSha1Id</pre>
 <p>The DSA SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23645"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS"></a>xmlSecOpenSSLTransformDsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformDsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMDSASHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformDsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformDsaSha1GetKlass
+                                                        (void);</pre>
 <p>The DSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23655"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>DSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22831"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> DSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23660"></a><h3>
-<a name="XMLSECOPENSSLHMACGETMINOUTPUTLENGTH"></a>xmlSecOpenSSLHmacGetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLHmacGetMinOutputLength
-                                            (void);</pre>
+<a name="XMLSECOPENSSLHMACGETMINOUTPUTLENGTH"></a><h3>xmlSecOpenSSLHmacGetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLHmacGetMinOutputLength (void);</pre>
 <p>Gets the value of min HMAC length.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23670"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the min HMAC output length</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the min HMAC output length</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23675"></a><h3>
-<a name="XMLSECOPENSSLHMACSETMINOUTPUTLENGTH"></a>xmlSecOpenSSLHmacSetMinOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecOpenSSLHmacSetMinOutputLength
-                                            (<font>int</font> min_length);</pre>
+<a name="XMLSECOPENSSLHMACSETMINOUTPUTLENGTH"></a><h3>xmlSecOpenSSLHmacSetMinOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecOpenSSLHmacSetMinOutputLength (<font>int</font> min_length);</pre>
 <p>Sets the min HMAC output length</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23686"><span style="white-space: nowrap"><var class="PARAMETER">min_length</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22860"><span style="white-space: nowrap"><code class="PARAMETER">min_length</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the new min length </p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23691"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAHMACID"></a>xmlSecOpenSSLKeyDataHmacId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataHmacId</pre>
+<a name="XMLSECOPENSSLKEYDATAHMACID"></a><h3>xmlSecOpenSSLKeyDataHmacId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataHmacId</pre>
 <p>The DHMAC key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23699"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAHMACGETKLASS"></a>xmlSecOpenSSLKeyDataHmacGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataHmacGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATAHMACGETKLASS"></a><h3>xmlSecOpenSSLKeyDataHmacGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataHmacGetKlass    (void);</pre>
 <p>The HMAC key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23709"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>HMAC key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22881"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> HMAC key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23714"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAHMACSET"></a>xmlSecOpenSSLKeyDataHmacSet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataHmacSet     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
+<a name="XMLSECOPENSSLKEYDATAHMACSET"></a><h3>xmlSecOpenSSLKeyDataHmacSet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataHmacSet         (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufSize);</pre>
 <p>Sets the value of HMAC key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23727"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22898"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to HMAC key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23732"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22903"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to key value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23737"><span style="white-space: nowrap"><var class="PARAMETER">bufSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN22908"><span style="white-space: nowrap"><code class="PARAMETER">bufSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key value size (in bytes).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23742"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22913"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23747"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACMD5ID"></a>xmlSecOpenSSLTransformHmacMd5Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacMd5Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACMD5ID"></a><h3>xmlSecOpenSSLTransformHmacMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacMd5Id</pre>
 <p>The HMAC with MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23755"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS"></a>xmlSecOpenSSLTransformHmacMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacMd5GetKlass
+                                                        (void);</pre>
 <p>The HMAC-MD5 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23765"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-MD5 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22934"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-MD5 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23770"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID"></a>xmlSecOpenSSLTransformHmacRipemd160Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacRipemd160Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160ID"></a><h3>xmlSecOpenSSLTransformHmacRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacRipemd160Id</pre>
 <p>The HMAC with RipeMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23778"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS"></a>xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACRIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacRipemd160GetKlass
+                                                        (void);</pre>
 <p>The HMAC-RIPEMD160 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23788"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-RIPEMD160 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22955"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-RIPEMD160 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23793"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA1ID"></a>xmlSecOpenSSLTransformHmacSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacSha1Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA1ID"></a><h3>xmlSecOpenSSLTransformHmacSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha1Id</pre>
 <p>The HMAC with SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23801"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS"></a>xmlSecOpenSSLTransformHmacSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha1GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA1 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23811"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA1 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22976"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA1 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23816"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA224ID"></a>xmlSecOpenSSLTransformHmacSha224Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacSha224Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA224ID"></a><h3>xmlSecOpenSSLTransformHmacSha224Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha224Id</pre>
 <p>The HMAC with SHA224 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23824"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS"></a>xmlSecOpenSSLTransformHmacSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha224GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA224 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23834"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA224 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN22997"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA224 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23839"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA256ID"></a>xmlSecOpenSSLTransformHmacSha256Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacSha256Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA256ID"></a><h3>xmlSecOpenSSLTransformHmacSha256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha256Id</pre>
 <p>The HMAC with SHA256 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23847"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS"></a>xmlSecOpenSSLTransformHmacSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha256GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA256 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23857"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA256 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23018"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA256 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23862"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA384ID"></a>xmlSecOpenSSLTransformHmacSha384Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacSha384Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA384ID"></a><h3>xmlSecOpenSSLTransformHmacSha384Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha384Id</pre>
 <p>The HMAC with SHA384 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23870"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS"></a>xmlSecOpenSSLTransformHmacSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha384GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA384 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23880"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA384 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23039"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA384 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23885"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA512ID"></a>xmlSecOpenSSLTransformHmacSha512Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformHmacSha512Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA512ID"></a><h3>xmlSecOpenSSLTransformHmacSha512Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformHmacSha512Id</pre>
 <p>The HMAC with SHA512 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23893"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS"></a>xmlSecOpenSSLTransformHmacSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformHmacSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMHMACSHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformHmacSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformHmacSha512GetKlass
+                                                        (void);</pre>
 <p>The HMAC-SHA512 transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the HMAC-SHA512 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23060"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the HMAC-SHA512 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23908"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMMD5ID"></a>xmlSecOpenSSLTransformMd5Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformMd5Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMMD5ID"></a><h3>xmlSecOpenSSLTransformMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformMd5Id</pre>
 <p>The MD5 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23916"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMMD5GETKLASS"></a>xmlSecOpenSSLTransformMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformMd5GetKlass   (void);</pre>
 <p>MD5 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23926"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to MD5 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23081"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to MD5 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23931"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRIPEMD160ID"></a>xmlSecOpenSSLTransformRipemd160Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRipemd160Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRIPEMD160ID"></a><h3>xmlSecOpenSSLTransformRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRipemd160Id</pre>
 <p>The RIPEMD160 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23939"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS"></a>xmlSecOpenSSLTransformRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRipemd160GetKlass
+                                                        (void);</pre>
 <p>RIPEMD-160 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23949"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to RIPEMD-160 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23102"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to RIPEMD-160 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23954"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAID"></a>xmlSecOpenSSLKeyDataRsaId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataRsaId</pre>
+<a name="XMLSECOPENSSLKEYDATARSAID"></a><h3>xmlSecOpenSSLKeyDataRsaId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataRsaId</pre>
 <p>The RSA key klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23962"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAGETKLASS"></a>xmlSecOpenSSLKeyDataRsaGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataRsaGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATARSAGETKLASS"></a><h3>xmlSecOpenSSLKeyDataRsaGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataRsaGetKlass     (void);</pre>
 <p>The OpenSSL RSA key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN23972"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL RSA key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23123"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL RSA key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN23977"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAADOPTRSA"></a>xmlSecOpenSSLKeyDataRsaAdoptRsa ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataRsaAdoptRsa (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>RSA</font> *rsa);</pre>
+<a name="XMLSECOPENSSLKEYDATARSAADOPTRSA"></a><h3>xmlSecOpenSSLKeyDataRsaAdoptRsa ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataRsaAdoptRsa     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>RSA</font> *rsa);</pre>
 <p>Sets the value of RSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23989"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23139"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23994"><span style="white-space: nowrap"><var class="PARAMETER">rsa</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23144"><span style="white-space: nowrap"><code class="PARAMETER">rsa</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL RSA key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN23999"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24004"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAGETRSA"></a>xmlSecOpenSSLKeyDataRsaGetRsa ()</h3>
-<pre class="PROGRAMLISTING"><font>RSA</font>*        xmlSecOpenSSLKeyDataRsaGetRsa   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLKEYDATARSAGETRSA"></a><h3>xmlSecOpenSSLKeyDataRsaGetRsa ()</h3>
+<pre class="PROGRAMLISTING"><font>RSA</font>*                xmlSecOpenSSLKeyDataRsaGetRsa       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the OpenSSL RSA key from RSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24015"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23164"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24020"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL RSA key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23169"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL RSA key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24025"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAADOPTEVP"></a>xmlSecOpenSSLKeyDataRsaAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataRsaAdoptEvp (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);</pre>
+<a name="XMLSECOPENSSLKEYDATARSAADOPTEVP"></a><h3>xmlSecOpenSSLKeyDataRsaAdoptEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataRsaAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);</pre>
 <p>Sets the RSA key data value to OpenSSL EVP key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24037"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23185"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24042"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23190"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24047"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23195"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24052"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARSAGETEVP"></a>xmlSecOpenSSLKeyDataRsaGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*   xmlSecOpenSSLKeyDataRsaGetEvp   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLKEYDATARSAGETEVP"></a><h3>xmlSecOpenSSLKeyDataRsaGetEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLKeyDataRsaGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the OpenSSL EVP key from RSA key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24063"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23210"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to RSA key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24068"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23215"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL EVP key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24073"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAMD5ID"></a>xmlSecOpenSSLTransformRsaMd5Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaMd5Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAMD5ID"></a><h3>xmlSecOpenSSLTransformRsaMd5Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaMd5Id</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24081"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS"></a>xmlSecOpenSSLTransformRsaMd5GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaMd5GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAMD5GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaMd5GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaMd5GetKlass
+                                                        (void);</pre>
 <p>The RSA-MD5 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24091"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-MD5 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23236"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-MD5 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24096"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160ID"></a>xmlSecOpenSSLTransformRsaRipemd160Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaRipemd160Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160ID"></a><h3>xmlSecOpenSSLTransformRsaRipemd160Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaRipemd160Id</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24104"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS"></a>xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaRipemd160GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSARIPEMD160GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaRipemd160GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaRipemd160GetKlass
+                                                        (void);</pre>
 <p>The RSA-RIPEMD160 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24114"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-RIPEMD160 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23257"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-RIPEMD160 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24119"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA1ID"></a>xmlSecOpenSSLTransformRsaSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaSha1Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA1ID"></a><h3>xmlSecOpenSSLTransformRsaSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha1Id</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24127"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS"></a>xmlSecOpenSSLTransformRsaSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha1GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA1 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA1 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23278"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA1 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24142"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA224ID"></a>xmlSecOpenSSLTransformRsaSha224Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaSha224Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA224ID"></a><h3>xmlSecOpenSSLTransformRsaSha224Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha224Id</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24150"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS"></a>xmlSecOpenSSLTransformRsaSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha224GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA224 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24160"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA224 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23299"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA224 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24165"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA256ID"></a>xmlSecOpenSSLTransformRsaSha256Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaSha256Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA256ID"></a><h3>xmlSecOpenSSLTransformRsaSha256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha256Id</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24173"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS"></a>xmlSecOpenSSLTransformRsaSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha256GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA256 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24183"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA256 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23320"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA256 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24188"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA384ID"></a>xmlSecOpenSSLTransformRsaSha384Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaSha384Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA384ID"></a><h3>xmlSecOpenSSLTransformRsaSha384Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha384Id</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24196"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS"></a>xmlSecOpenSSLTransformRsaSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha384GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA384 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24206"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA384 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23341"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA384 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24211"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA512ID"></a>xmlSecOpenSSLTransformRsaSha512Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaSha512Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA512ID"></a><h3>xmlSecOpenSSLTransformRsaSha512Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaSha512Id</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24219"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS"></a>xmlSecOpenSSLTransformRsaSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSASHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaSha512GetKlass
+                                                        (void);</pre>
 <p>The RSA-SHA512 signature transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24229"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-SHA512 signature transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23362"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-SHA512 signature transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24234"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAPKCS1ID"></a>xmlSecOpenSSLTransformRsaPkcs1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaPkcs1Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAPKCS1ID"></a><h3>xmlSecOpenSSLTransformRsaPkcs1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaPkcs1Id</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24242"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS"></a>xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaPkcs1GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAPKCS1GETKLASS"></a><h3>xmlSecOpenSSLTransformRsaPkcs1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaPkcs1GetKlass
+                                                        (void);</pre>
 <p>The RSA-PKCS1 key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24252"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-PKCS1 key transport transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23383"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-PKCS1 key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24257"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAOAEPID"></a>xmlSecOpenSSLTransformRsaOaepId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformRsaOaepId</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAOAEPID"></a><h3>xmlSecOpenSSLTransformRsaOaepId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformRsaOaepId</pre>
 <p>The RSA PKCS1 key transport transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24265"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS"></a>xmlSecOpenSSLTransformRsaOaepGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformRsaOaepGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMRSAOAEPGETKLASS"></a><h3>xmlSecOpenSSLTransformRsaOaepGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformRsaOaepGetKlass
+                                                        (void);</pre>
 <p>The RSA-OAEP key transport transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>RSA-OAEP key transport transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23404"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> RSA-OAEP key transport transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24280"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA1ID"></a>xmlSecOpenSSLTransformSha1Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformSha1Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA1ID"></a><h3>xmlSecOpenSSLTransformSha1Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha1Id</pre>
 <p>The SHA1 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24288"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA1GETKLASS"></a>xmlSecOpenSSLTransformSha1GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformSha1GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA1GETKLASS"></a><h3>xmlSecOpenSSLTransformSha1GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha1GetKlass  (void);</pre>
 <p>SHA-1 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24298"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-1 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23425"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-1 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24303"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA224ID"></a>xmlSecOpenSSLTransformSha224Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformSha224Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA224ID"></a><h3>xmlSecOpenSSLTransformSha224Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha224Id</pre>
 <p>The SHA224 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24311"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA224GETKLASS"></a>xmlSecOpenSSLTransformSha224GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformSha224GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA224GETKLASS"></a><h3>xmlSecOpenSSLTransformSha224GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha224GetKlass
+                                                        (void);</pre>
 <p>SHA-224 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-224 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23446"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-224 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24326"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA256ID"></a>xmlSecOpenSSLTransformSha256Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformSha256Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA256ID"></a><h3>xmlSecOpenSSLTransformSha256Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha256Id</pre>
 <p>The SHA256 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24334"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA256GETKLASS"></a>xmlSecOpenSSLTransformSha256GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformSha256GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA256GETKLASS"></a><h3>xmlSecOpenSSLTransformSha256GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha256GetKlass
+                                                        (void);</pre>
 <p>SHA-256 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24344"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-256 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23467"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-256 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24349"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA384ID"></a>xmlSecOpenSSLTransformSha384Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformSha384Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA384ID"></a><h3>xmlSecOpenSSLTransformSha384Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha384Id</pre>
 <p>The SHA384 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24357"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA384GETKLASS"></a>xmlSecOpenSSLTransformSha384GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformSha384GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA384GETKLASS"></a><h3>xmlSecOpenSSLTransformSha384GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha384GetKlass
+                                                        (void);</pre>
 <p>SHA-384 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24367"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-384 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23488"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-384 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24372"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA512ID"></a>xmlSecOpenSSLTransformSha512Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLTransformSha512Id</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA512ID"></a><h3>xmlSecOpenSSLTransformSha512Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLTransformSha512Id</pre>
 <p>The SHA512 digest transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24380"></a><h3>
-<a name="XMLSECOPENSSLTRANSFORMSHA512GETKLASS"></a>xmlSecOpenSSLTransformSha512GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecOpenSSLTransformSha512GetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLTRANSFORMSHA512GETKLASS"></a><h3>xmlSecOpenSSLTransformSha512GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecOpenSSLTransformSha512GetKlass
+                                                        (void);</pre>
 <p>SHA-512 digest transform klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24390"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to SHA-512 digest transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23509"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to SHA-512 digest transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24395"></a><h3>
-<a name="XMLSEC-OPENSSL-ERRORS-LIB-CAPS"></a>XMLSEC_OPENSSL_ERRORS_LIB</h3>
+<a name="XMLSEC-OPENSSL-ERRORS-LIB--CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_LIB</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_OPENSSL_ERRORS_LIB			(ERR_LIB_USER + 57)</pre>
 <p>Macro. The XMLSec library klass for OpenSSL errors reporting functions.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24403"></a><h3>
-<a name="XMLSEC-OPENSSL-ERRORS-FUNCTION-CAPS"></a>XMLSEC_OPENSSL_ERRORS_FUNCTION</h3>
+<a name="XMLSEC-OPENSSL-ERRORS-FUNCTION--CAPS"></a><h3>XMLSEC_OPENSSL_ERRORS_FUNCTION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_OPENSSL_ERRORS_FUNCTION			0</pre>
 <p>Macro. The XMLSec library functions OpenSSL errors reporting functions.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24411"></a><h3>
-<a name="XMLSECOPENSSLERRORSDEFAULTCALLBACK"></a>xmlSecOpenSSLErrorsDefaultCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecOpenSSLErrorsDefaultCallback
-                                            (const <font>char</font> *file,
-                                             <font>int</font> line,
-                                             const <font>char</font> *func,
-                                             const <font>char</font> *errorObject,
-                                             const <font>char</font> *errorSubject,
-                                             <font>int</font> reason,
-                                             const <font>char</font> *msg);</pre>
+<a name="XMLSECOPENSSLERRORSDEFAULTCALLBACK"></a><h3>xmlSecOpenSSLErrorsDefaultCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecOpenSSLErrorsDefaultCallback  (const <font>char</font> *file,
+                                                         <font>int</font> line,
+                                                         const <font>char</font> *func,
+                                                         const <font>char</font> *errorObject,
+                                                         const <font>char</font> *errorSubject,
+                                                         <font>int</font> reason,
+                                                         const <font>char</font> *msg);</pre>
 <p>The default OpenSSL errors reporting callback function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24428"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23544"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location file name (__FILE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24433"><span style="white-space: nowrap"><var class="PARAMETER">line</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23549"><span style="white-space: nowrap"><code class="PARAMETER">line</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location line number (__LINE__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24438"><span style="white-space: nowrap"><var class="PARAMETER">func</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23554"><span style="white-space: nowrap"><code class="PARAMETER">func</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error location function name (__FUNCTION__ macro).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24443"><span style="white-space: nowrap"><var class="PARAMETER">errorObject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23559"><span style="white-space: nowrap"><code class="PARAMETER">errorObject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error object </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24448"><span style="white-space: nowrap"><var class="PARAMETER">errorSubject</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23564"><span style="white-space: nowrap"><code class="PARAMETER">errorSubject</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the error specific error subject.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24453"><span style="white-space: nowrap"><var class="PARAMETER">reason</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23569"><span style="white-space: nowrap"><code class="PARAMETER">reason</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the error code.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24458"><span style="white-space: nowrap"><var class="PARAMETER">msg</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23574"><span style="white-space: nowrap"><code class="PARAMETER">msg</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the additional error message.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-bn.html"><b>&lt;&lt;&lt;bn</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-evp.html"><b>evp&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-bn.html"><b>&lt;&lt;&lt; bn</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-evp.html"><b>evp &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-evp.html b/docs/api/xmlsec-openssl-evp.html
index 03eb708..7365c62 100644
--- a/docs/api/xmlsec-openssl-evp.html
+++ b/docs/api/xmlsec-openssl-evp.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>evp</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="PREVIOUS" title="crypto" href="xmlsec-openssl-crypto.html">
 <link rel="NEXT" title="x509" href="xmlsec-openssl-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,107 +87,101 @@
 <h1>
 <a name="XMLSEC-OPENSSL-EVP"></a>evp</h1>
 <div class="REFNAMEDIV">
-<a name="AEN24468"></a><h2>Name</h2>evp--EVP keys data implementation.</div>
+<a name="AEN23584"></a><h2>Name</h2>evp -- EVP keys data implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN24471"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>int</font>         <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">xmlSecOpenSSLEvpKeyDataAdoptEvp</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);
-<font>EVP_PKEY</font>*   <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">xmlSecOpenSSLEvpKeyDataGetEvp</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>EVP_PKEY</font>*   <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDUP">xmlSecOpenSSLEvpKeyDup</a>          (<font>EVP_PKEY</font> *pKey);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">xmlSecOpenSSLEvpKeyAdopt</a>   (<font>EVP_PKEY</font> *pKey);</pre>
+<a name="XMLSEC-OPENSSL-EVP.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>int</font>                 <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAADOPTEVP">xmlSecOpenSSLEvpKeyDataAdoptEvp</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);
+<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDATAGETEVP">xmlSecOpenSSLEvpKeyDataGetEvp</a>       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>EVP_PKEY</font>*           <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYDUP">xmlSecOpenSSLEvpKeyDup</a>              (<font>EVP_PKEY</font> *pKey);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-openssl-evp.html#XMLSECOPENSSLEVPKEYADOPT">xmlSecOpenSSLEvpKeyAdopt</a>            (<font>EVP_PKEY</font> *pKey);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN24487"></a><h2>Description</h2>
+<a name="XMLSEC-OPENSSL-EVP.DESCRIPTION"></a><h2>Description</h2>
 <p>EVP keys data implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN24490"></a><h2>Details</h2>
+<a name="XMLSEC-OPENSSL-EVP.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN24492"></a><h3>
-<a name="XMLSECOPENSSLEVPKEYDATAADOPTEVP"></a>xmlSecOpenSSLEvpKeyDataAdoptEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLEvpKeyDataAdoptEvp (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>EVP_PKEY</font> *pKey);</pre>
+<a name="XMLSECOPENSSLEVPKEYDATAADOPTEVP"></a><h3>xmlSecOpenSSLEvpKeyDataAdoptEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLEvpKeyDataAdoptEvp     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>EVP_PKEY</font> *pKey);</pre>
 <p>Sets the value of key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24504"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23619"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24509"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23624"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24514"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23629"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24519"></a><h3>
-<a name="XMLSECOPENSSLEVPKEYDATAGETEVP"></a>xmlSecOpenSSLEvpKeyDataGetEvp ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*   xmlSecOpenSSLEvpKeyDataGetEvp   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLEVPKEYDATAGETEVP"></a><h3>xmlSecOpenSSLEvpKeyDataGetEvp ()</h3>
+<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLEvpKeyDataGetEvp       (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the EVP_PKEY from the key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24530"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23644"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL EVP data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24535"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to EVP_PKEY or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23649"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to EVP_PKEY or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24540"></a><h3>
-<a name="XMLSECOPENSSLEVPKEYDUP"></a>xmlSecOpenSSLEvpKeyDup ()</h3>
-<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*   xmlSecOpenSSLEvpKeyDup          (<font>EVP_PKEY</font> *pKey);</pre>
-<p>Duplicates <var class="PARAMETER">pKey</var>.</p>
+<a name="XMLSECOPENSSLEVPKEYDUP"></a><h3>xmlSecOpenSSLEvpKeyDup ()</h3>
+<pre class="PROGRAMLISTING"><font>EVP_PKEY</font>*           xmlSecOpenSSLEvpKeyDup              (<font>EVP_PKEY</font> *pKey);</pre>
+<p>Duplicates <code class="PARAMETER">pKey</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24552"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23665"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24557"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created EVP_PKEY object or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23670"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created EVP_PKEY object or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24562"></a><h3>
-<a name="XMLSECOPENSSLEVPKEYADOPT"></a>xmlSecOpenSSLEvpKeyAdopt ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecOpenSSLEvpKeyAdopt   (<font>EVP_PKEY</font> *pKey);</pre>
+<a name="XMLSECOPENSSLEVPKEYADOPT"></a><h3>xmlSecOpenSSLEvpKeyAdopt ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecOpenSSLEvpKeyAdopt            (<font>EVP_PKEY</font> *pKey);</pre>
 <p>Creates xmlsec key object from OpenSSL key object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24573"><span style="white-space: nowrap"><var class="PARAMETER">pKey</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23685"><span style="white-space: nowrap"><code class="PARAMETER">pKey</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to EVP_PKEY.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24578"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23690"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created xmlsec key or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-crypto.html"><b>&lt;&lt;&lt;crypto</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-x509.html"><b>x509&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-crypto.html"><b>&lt;&lt;&lt; crypto</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-x509.html"><b>x509 &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-ref.html b/docs/api/xmlsec-openssl-ref.html
index 1cb837f..9a844c9 100644
--- a/docs/api/xmlsec-openssl-ref.html
+++ b/docs/api/xmlsec-openssl-ref.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library for OpenSLL API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="x509" href="xmlsec-x509.html">
 <link rel="NEXT" title="app" href="xmlsec-openssl-app.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -91,23 +90,23 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-openssl-app.html">app</a>--Application functions implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-app.html">app</a> -- Application functions implementation for OpenSSL.</dt>
 <dt>
-<a href="xmlsec-openssl-bn.html">bn</a>--Big numbers helper functions.</dt>
+<a href="xmlsec-openssl-bn.html">bn</a> -- Big numbers helper functions.</dt>
 <dt>
-<a href="xmlsec-openssl-crypto.html">crypto</a>--Crypto transforms implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-crypto.html">crypto</a> -- Crypto transforms implementation for OpenSSL.</dt>
 <dt>
-<a href="xmlsec-openssl-evp.html">evp</a>--EVP keys data implementation.</dt>
+<a href="xmlsec-openssl-evp.html">evp</a> -- EVP keys data implementation.</dt>
 <dt>
-<a href="xmlsec-openssl-x509.html">x509</a>--X509 certificates support implementation for OpenSSL.</dt>
+<a href="xmlsec-openssl-x509.html">x509</a> -- X509 certificates support implementation for OpenSSL.</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec-openssl. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-x509.html"><b>&lt;&lt;&lt;x509</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-app.html"><b>app&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-x509.html"><b>&lt;&lt;&lt; x509</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-openssl-x509.html b/docs/api/xmlsec-openssl-x509.html
index b9c331f..e6fc992 100644
--- a/docs/api/xmlsec-openssl-x509.html
+++ b/docs/api/xmlsec-openssl-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>x509</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
 <link rel="PREVIOUS" title="evp" href="xmlsec-openssl-evp.html">
 <link rel="NEXT" title="XML Security Library for GnuTLS API Reference." href="xmlsec-gnutls-ref.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,546 +87,503 @@
 <h1>
 <a name="XMLSEC-OPENSSL-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN24588"></a><h2>Name</h2>x509--X509 certificates support implementation for OpenSSL.</div>
+<a name="AEN23700"></a><h2>Name</h2>x509 -- X509 certificates support implementation for OpenSSL.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN24591"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</a>
-#define     <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</a>
-#define     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ID">xmlSecOpenSSLKeyDataX509Id</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKLASS">xmlSecOpenSSLKeyDataX509GetKlass</a>
-                                            (void);
-<font>X509</font>*       <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKEYCERT">xmlSecOpenSSLKeyDataX509GetKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT">xmlSecOpenSSLKeyDataX509AdoptKeyCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509</font> *cert);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCERT">xmlSecOpenSSLKeyDataX509AdoptCert</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509</font> *cert);
-<font>X509</font>*       <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERT">xmlSecOpenSSLKeyDataX509GetCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERTSSIZE">xmlSecOpenSSLKeyDataX509GetCertsSize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCRL">xmlSecOpenSSLKeyDataX509AdoptCrl</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509_CRL</font> *crl);
-<font>X509_CRL</font>*   <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRL">xmlSecOpenSSLKeyDataX509GetCrl</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
-<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRLSSIZE">xmlSecOpenSSLKeyDataX509GetCrlsSize</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
-<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509CERTGETKEY">xmlSecOpenSSLX509CertGetKey</a>
-                                            (<font>X509</font> *cert);
-#define     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTID">xmlSecOpenSSLKeyDataRawX509CertId</a>
-<font>xmlSecKeyDataId</font> <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS">xmlSecOpenSSLKeyDataRawX509CertGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREID">xmlSecOpenSSLX509StoreId</a>
-<font>xmlSecKeyDataStoreId</font> <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREGETKLASS">xmlSecOpenSSLX509StoreGetKlass</a>
-                                            (void);
-<font>X509</font>*       <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREFINDCERT">xmlSecOpenSSLX509StoreFindCert</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>X509</font>*       <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREVERIFY">xmlSecOpenSSLX509StoreVerify</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</a> *certs,
-                                             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCERT">xmlSecOpenSSLX509StoreAdoptCert</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>X509</font> *cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCRL">xmlSecOpenSSLX509StoreAdoptCrl</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>X509_CRL</font> *crl);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSPATH">xmlSecOpenSSLX509StoreAddCertsPath</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             const <font>char</font> *path);
-<font>int</font>         <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSFILE">xmlSecOpenSSLX509StoreAddCertsFile</a>
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             const <font>char</font> *file);</pre>
+<a name="XMLSEC-OPENSSL-X509.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a>
+#define             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a>
+#define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ID">xmlSecOpenSSLKeyDataX509Id</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKLASS">xmlSecOpenSSLKeyDataX509GetKlass</a>    (void);
+<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETKEYCERT">xmlSecOpenSSLKeyDataX509GetKeyCert</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT">xmlSecOpenSSLKeyDataX509AdoptKeyCert</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509</font> *cert);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCERT">xmlSecOpenSSLKeyDataX509AdoptCert</a>   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509</font> *cert);
+<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERT">xmlSecOpenSSLKeyDataX509GetCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCERTSSIZE">xmlSecOpenSSLKeyDataX509GetCertsSize</a>
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509ADOPTCRL">xmlSecOpenSSLKeyDataX509AdoptCrl</a>    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509_CRL</font> *crl);
+<font>X509_CRL</font>*           <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRL">xmlSecOpenSSLKeyDataX509GetCrl</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);
+<a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATAX509GETCRLSSIZE">xmlSecOpenSSLKeyDataX509GetCrlsSize</a> (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);
+<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509CERTGETKEY">xmlSecOpenSSLX509CertGetKey</a>         (<font>X509</font> *cert);
+#define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTID">xmlSecOpenSSLKeyDataRawX509CertId</a>
+<font>xmlSecKeyDataId</font>     <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS">xmlSecOpenSSLKeyDataRawX509CertGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREID">xmlSecOpenSSLX509StoreId</a>
+<font>xmlSecKeyDataStoreId</font>  <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREGETKLASS">xmlSecOpenSSLX509StoreGetKlass</a>    (void);
+<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREFINDCERT">xmlSecOpenSSLX509StoreFindCert</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>X509</font>*               <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREVERIFY">xmlSecOpenSSLX509StoreVerify</a>        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a> *certs,
+                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCERT">xmlSecOpenSSLX509StoreAdoptCert</a>     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>X509</font> *cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADOPTCRL">xmlSecOpenSSLX509StoreAdoptCrl</a>      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>X509_CRL</font> *crl);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSPATH">xmlSecOpenSSLX509StoreAddCertsPath</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         const <font>char</font> *path);
+<font>int</font>                 <a href="xmlsec-openssl-x509.html#XMLSECOPENSSLX509STOREADDCERTSFILE">xmlSecOpenSSLX509StoreAddCertsFile</a>  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         const <font>char</font> *file);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN24668"></a><h2>Description</h2>
+<a name="XMLSEC-OPENSSL-X509.DESCRIPTION"></a><h2>Description</h2>
 <p>X509 certificates support implementation for OpenSSL.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN24671"></a><h2>Details</h2>
+<a name="XMLSEC-OPENSSL-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN24673"></a><h3>
-<a name="XMLSEC-STACK-OF-X509-CAPS"></a>XMLSEC_STACK_OF_X509</h3>
+<a name="XMLSEC-STACK-OF-X509--CAPS"></a><h3>XMLSEC_STACK_OF_X509</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_STACK_OF_X509		STACK_OF(X509)</pre>
 <p>Macro. To make docbook happy.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24681"></a><h3>
-<a name="XMLSEC-STACK-OF-X509-CRL-CAPS"></a>XMLSEC_STACK_OF_X509_CRL</h3>
+<a name="XMLSEC-STACK-OF-X509-CRL--CAPS"></a><h3>XMLSEC_STACK_OF_X509_CRL</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_STACK_OF_X509_CRL	STACK_OF(X509_CRL)</pre>
 <p>Macro. To make docbook happy.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24689"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509ID"></a>xmlSecOpenSSLKeyDataX509Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataX509Id</pre>
+<a name="XMLSECOPENSSLKEYDATAX509ID"></a><h3>xmlSecOpenSSLKeyDataX509Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataX509Id</pre>
 <p>The OpenSSL X509 data klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24697"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETKLASS"></a>xmlSecOpenSSLKeyDataX509GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataX509GetKlass
-                                            (void);</pre>
-<p>The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-X509Data</span></font>).</p>
+<a name="XMLSECOPENSSLKEYDATAX509GETKLASS"></a><h3>xmlSecOpenSSLKeyDataX509GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataX509GetKlass    (void);</pre>
+<p>The OpenSSL X509 key data klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-X509DATA"><span class="TYPE">sec-X509Data</span></gtkdoclink>).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24709"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the X509 data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23817"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the X509 data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24714"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETKEYCERT"></a>xmlSecOpenSSLKeyDataX509GetKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*       xmlSecOpenSSLKeyDataX509GetKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<a name="XMLSECOPENSSLKEYDATAX509GETKEYCERT"></a><h3>xmlSecOpenSSLKeyDataX509GetKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLKeyDataX509GetKeyCert  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
 <p>Gets the certificate from which the key was extracted.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24725"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23832"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24730"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the key's certificate or NULL if key data was not used for key
+<td align="LEFT" valign="TOP"><a name="AEN23837"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the key's certificate or NULL if key data was not used for key
 extraction or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24735"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT"></a>xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataX509AdoptKeyCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509</font> *cert);</pre>
-<p>Sets the key's certificate in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECOPENSSLKEYDATAX509ADOPTKEYCERT"></a><h3>xmlSecOpenSSLKeyDataX509AdoptKeyCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptKeyCert
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509</font> *cert);</pre>
+<p>Sets the key's certificate in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24748"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23854"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24753"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23859"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24758"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23864"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24763"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509ADOPTCERT"></a>xmlSecOpenSSLKeyDataX509AdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataX509AdoptCert
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509</font> *cert);</pre>
+<a name="XMLSECOPENSSLKEYDATAX509ADOPTCERT"></a><h3>xmlSecOpenSSLKeyDataX509AdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptCert   (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509</font> *cert);</pre>
 <p>Adds certificate to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24775"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23880"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24780"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23885"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24785"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23890"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24790"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETCERT"></a>xmlSecOpenSSLKeyDataX509GetCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*       xmlSecOpenSSLKeyDataX509GetCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECOPENSSLKEYDATAX509GETCERT"></a><h3>xmlSecOpenSSLKeyDataX509GetCert ()</h3>
+<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLKeyDataX509GetCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a certificate from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24802"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23906"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24807"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23911"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to certificate or NULL if <var class="PARAMETER">pos</var> is larger than the 
-number of certificates in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23916"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to certificate or NULL if <code class="PARAMETER">pos</code> is larger than the 
+number of certificates in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24819"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETCERTSSIZE"></a>xmlSecOpenSSLKeyDataX509GetCertsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecOpenSSLKeyDataX509GetCertsSize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of certificates in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECOPENSSLKEYDATAX509GETCERTSSIZE"></a><h3>xmlSecOpenSSLKeyDataX509GetCertsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecOpenSSLKeyDataX509GetCertsSize
+                                                        (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of certificates in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24831"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23934"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of certificates in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23939"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of certificates in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24842"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509ADOPTCRL"></a>xmlSecOpenSSLKeyDataX509AdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLKeyDataX509AdoptCrl
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <font>X509_CRL</font> *crl);</pre>
+<a name="XMLSECOPENSSLKEYDATAX509ADOPTCRL"></a><h3>xmlSecOpenSSLKeyDataX509AdoptCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLKeyDataX509AdoptCrl    (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <font>X509_CRL</font> *crl);</pre>
 <p>Adds CRL to the X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24854"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23956"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24859"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23961"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24864"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23966"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24869"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETCRL"></a>xmlSecOpenSSLKeyDataX509GetCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>X509_CRL</font>*   xmlSecOpenSSLKeyDataX509GetCrl  (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
+<a name="XMLSECOPENSSLKEYDATAX509GETCRL"></a><h3>xmlSecOpenSSLKeyDataX509GetCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>X509_CRL</font>*           xmlSecOpenSSLKeyDataX509GetCrl      (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> pos);</pre>
 <p>Gets a CRL from X509 key data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24881"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23982"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24886"><span style="white-space: nowrap"><var class="PARAMETER">pos</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN23987"><span style="white-space: nowrap"><code class="PARAMETER">pos</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired CRL position.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24891"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to CRL or NULL if <var class="PARAMETER">pos</var> is larger than the 
-number of CRLs in <var class="PARAMETER">data</var> or an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN23992"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to CRL or NULL if <code class="PARAMETER">pos</code> is larger than the 
+number of CRLs in <code class="PARAMETER">data</code> or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24898"></a><h3>
-<a name="XMLSECOPENSSLKEYDATAX509GETCRLSSIZE"></a>xmlSecOpenSSLKeyDataX509GetCrlsSize ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>  xmlSecOpenSSLKeyDataX509GetCrlsSize
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
-<p>Gets the number of CRLs in <var class="PARAMETER">data</var>.</p>
+<a name="XMLSECOPENSSLKEYDATAX509GETCRLSSIZE"></a><h3>xmlSecOpenSSLKeyDataX509GetCrlsSize ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>          xmlSecOpenSSLKeyDataX509GetCrlsSize (<a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> data);</pre>
+<p>Gets the number of CRLs in <code class="PARAMETER">data</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24910"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24010"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24915"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>te number of CRLs in <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24015"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> te number of CRLs in <code class="PARAMETER">data</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24921"></a><h3>
-<a name="XMLSECOPENSSLX509CERTGETKEY"></a>xmlSecOpenSSLX509CertGetKey ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a> xmlSecOpenSSLX509CertGetKey
-                                            (<font>X509</font> *cert);</pre>
-<p>Extracts public key from the <var class="PARAMETER">cert</var>.</p>
+<a name="XMLSECOPENSSLX509CERTGETKEY"></a><h3>xmlSecOpenSSLX509CertGetKey ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-keysdata.html#XMLSECKEYDATA">xmlSecKeyDataPtr</a>    xmlSecOpenSSLX509CertGetKey         (<font>X509</font> *cert);</pre>
+<p>Extracts public key from the <code class="PARAMETER">cert</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24933"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24032"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN24938"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>public key value or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24037"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> public key value or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24943"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARAWX509CERTID"></a>xmlSecOpenSSLKeyDataRawX509CertId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLKeyDataRawX509CertId</pre>
+<a name="XMLSECOPENSSLKEYDATARAWX509CERTID"></a><h3>xmlSecOpenSSLKeyDataRawX509CertId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLKeyDataRawX509CertId</pre>
 <p>The OpenSSL raw X509 certificate klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24951"></a><h3>
-<a name="XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS"></a>xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font> xmlSecOpenSSLKeyDataRawX509CertGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLKEYDATARAWX509CERTGETKLASS"></a><h3>xmlSecOpenSSLKeyDataRawX509CertGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataId</font>     xmlSecOpenSSLKeyDataRawX509CertGetKlass
+                                                        (void);</pre>
 <p>The raw X509 certificates key data klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24961"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>raw X509 certificates key data klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24058"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> raw X509 certificates key data klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24966"></a><h3>
-<a name="XMLSECOPENSSLX509STOREID"></a>xmlSecOpenSSLX509StoreId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecOpenSSLX509StoreId</pre>
+<a name="XMLSECOPENSSLX509STOREID"></a><h3>xmlSecOpenSSLX509StoreId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecOpenSSLX509StoreId</pre>
 <p>The OpenSSL X509 store klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24974"></a><h3>
-<a name="XMLSECOPENSSLX509STOREGETKLASS"></a>xmlSecOpenSSLX509StoreGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font> xmlSecOpenSSLX509StoreGetKlass
-                                            (void);</pre>
+<a name="XMLSECOPENSSLX509STOREGETKLASS"></a><h3>xmlSecOpenSSLX509StoreGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecKeyDataStoreId</font>  xmlSecOpenSSLX509StoreGetKlass    (void);</pre>
 <p>The OpenSSL X509 certificates key data store klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN24984"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to OpenSSL X509 certificates key data store klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24079"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to OpenSSL X509 certificates key data store klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN24989"></a><h3>
-<a name="XMLSECOPENSSLX509STOREFINDCERT"></a>xmlSecOpenSSLX509StoreFindCert ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*       xmlSecOpenSSLX509StoreFindCert  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>xmlChar</font> *subjectName,
-                                             <font>xmlChar</font> *issuerName,
-                                             <font>xmlChar</font> *issuerSerial,
-                                             <font>xmlChar</font> *ski,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Searches <var class="PARAMETER">store</var> for a certificate that matches given criteria.</p>
+<a name="XMLSECOPENSSLX509STOREFINDCERT"></a><h3>xmlSecOpenSSLX509StoreFindCert ()</h3>
+<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLX509StoreFindCert      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>xmlChar</font> *subjectName,
+                                                         <font>xmlChar</font> *issuerName,
+                                                         <font>xmlChar</font> *issuerSerial,
+                                                         <font>xmlChar</font> *ski,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Searches <code class="PARAMETER">store</code> for a certificate that matches given criteria.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25006"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24100"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25011"><span style="white-space: nowrap"><var class="PARAMETER">subjectName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24105"><span style="white-space: nowrap"><code class="PARAMETER">subjectName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25016"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24110"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate issuer name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25021"><span style="white-space: nowrap"><var class="PARAMETER">issuerSerial</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24115"><span style="white-space: nowrap"><code class="PARAMETER">issuerSerial</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the desired certificate issuer serial number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25026"><span style="white-space: nowrap"><var class="PARAMETER">ski</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24120"><span style="white-space: nowrap"><code class="PARAMETER">ski</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired certificate SKI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25031"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24125"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25037"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to found certificate or NULL if certificate is not found
+<td align="LEFT" valign="TOP"><a name="AEN24131"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to found certificate or NULL if certificate is not found
 or an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25042"></a><h3>
-<a name="XMLSECOPENSSLX509STOREVERIFY"></a>xmlSecOpenSSLX509StoreVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>X509</font>*       xmlSecOpenSSLX509StoreVerify    (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CAPS">XMLSEC_STACK_OF_X509</a> *certs,
-                                             <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL-CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
-<p>Verifies <var class="PARAMETER">certs</var> list.</p>
+<a name="XMLSECOPENSSLX509STOREVERIFY"></a><h3>xmlSecOpenSSLX509StoreVerify ()</h3>
+<pre class="PROGRAMLISTING"><font>X509</font>*               xmlSecOpenSSLX509StoreVerify        (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509--CAPS">XMLSEC_STACK_OF_X509</a> *certs,
+                                                         <a href="xmlsec-openssl-x509.html#XMLSEC-STACK-OF-X509-CRL--CAPS">XMLSEC_STACK_OF_X509_CRL</a> *crls,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> *keyInfoCtx);</pre>
+<p>Verifies <code class="PARAMETER">certs</code> list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25057"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24150"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25062"><span style="white-space: nowrap"><var class="PARAMETER">certs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24155"><span style="white-space: nowrap"><code class="PARAMETER">certs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the untrusted certificates stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25067"><span style="white-space: nowrap"><var class="PARAMETER">crls</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24160"><span style="white-space: nowrap"><code class="PARAMETER">crls</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the crls stack.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25072"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24165"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25078"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the first verified certificate from <var class="PARAMETER">certs</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the first verified certificate from <code class="PARAMETER">certs</code>.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25084"></a><h3>
-<a name="XMLSECOPENSSLX509STOREADOPTCERT"></a>xmlSecOpenSSLX509StoreAdoptCert ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLX509StoreAdoptCert (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>X509</font> *cert,
-                                             <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
+<a name="XMLSECOPENSSLX509STOREADOPTCERT"></a><h3>xmlSecOpenSSLX509StoreAdoptCert ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAdoptCert     (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>X509</font> *cert,
+                                                         <a href="xmlsec-keysdata.html#XMLSECKEYDATATYPE">xmlSecKeyDataType</a> type);</pre>
 <p>Adds trusted (root) or untrusted certificate to the store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25097"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24189"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25102"><span style="white-space: nowrap"><var class="PARAMETER">cert</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24194"><span style="white-space: nowrap"><code class="PARAMETER">cert</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509 certificate.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25107"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24199"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the certificate type (trusted/untrusted).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25112"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24204"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25117"></a><h3>
-<a name="XMLSECOPENSSLX509STOREADOPTCRL"></a>xmlSecOpenSSLX509StoreAdoptCrl ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLX509StoreAdoptCrl  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             <font>X509_CRL</font> *crl);</pre>
+<a name="XMLSECOPENSSLX509STOREADOPTCRL"></a><h3>xmlSecOpenSSLX509StoreAdoptCrl ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAdoptCrl      (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         <font>X509_CRL</font> *crl);</pre>
 <p>Adds X509 CRL to the store.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25129"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24220"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to X509 key data store klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25134"><span style="white-space: nowrap"><var class="PARAMETER">crl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24225"><span style="white-space: nowrap"><code class="PARAMETER">crl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to OpenSSL X509_CRL.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25139"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25144"></a><h3>
-<a name="XMLSECOPENSSLX509STOREADDCERTSPATH"></a>xmlSecOpenSSLX509StoreAddCertsPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLX509StoreAddCertsPath
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             const <font>char</font> *path);</pre>
-<p>Adds all certs in the <var class="PARAMETER">path</var> to the list of trusted certs
-in <var class="PARAMETER">store</var>.</p>
+<a name="XMLSECOPENSSLX509STOREADDCERTSPATH"></a><h3>xmlSecOpenSSLX509StoreAddCertsPath ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAddCertsPath  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         const <font>char</font> *path);</pre>
+<p>Adds all certs in the <code class="PARAMETER">path</code> to the list of trusted certs
+in <code class="PARAMETER">store</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25158"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24248"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to OpenSSL x509 store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25163"><span style="white-space: nowrap"><var class="PARAMETER">path</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24253"><span style="white-space: nowrap"><code class="PARAMETER">path</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the path to the certs dir.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25168"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24258"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN25173"></a><h3>
-<a name="XMLSECOPENSSLX509STOREADDCERTSFILE"></a>xmlSecOpenSSLX509StoreAddCertsFile ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecOpenSSLX509StoreAddCertsFile
-                                            (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
-                                             const <font>char</font> *file);</pre>
-<p>Adds all certs in <var class="PARAMETER">file</var> to the list of trusted certs
-in <var class="PARAMETER">store</var>. It is possible for <var class="PARAMETER">file</var> to contain multiple certs.</p>
+<a name="XMLSECOPENSSLX509STOREADDCERTSFILE"></a><h3>xmlSecOpenSSLX509StoreAddCertsFile ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecOpenSSLX509StoreAddCertsFile  (<a href="xmlsec-keysdata.html#XMLSECKEYDATASTORE">xmlSecKeyDataStorePtr</a> store,
+                                                         const <font>char</font> *file);</pre>
+<p>Adds all certs in <code class="PARAMETER">file</code> to the list of trusted certs
+in <code class="PARAMETER">store</code>. It is possible for <code class="PARAMETER">file</code> to contain multiple certs.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25188"><span style="white-space: nowrap"><var class="PARAMETER">store</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24277"><span style="white-space: nowrap"><code class="PARAMETER">store</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to OpenSSL x509 store.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25193"><span style="white-space: nowrap"><var class="PARAMETER">file</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN24282"><span style="white-space: nowrap"><code class="PARAMETER">file</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the certs file.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN25198"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN24287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-openssl-evp.html"><b>&lt;&lt;&lt;evp</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-gnutls-ref.html"><b>XML Security Library for GnuTLS API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-openssl-evp.html"><b>&lt;&lt;&lt; evp</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-gnutls-ref.html"><b>XML Security Library for GnuTLS API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-parser.html b/docs/api/xmlsec-parser.html
index 331f217..6138abc 100644
--- a/docs/api/xmlsec-parser.html
+++ b/docs/api/xmlsec-parser.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>parser</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="nodeset" href="xmlsec-nodeset.html">
 <link rel="NEXT" title="templates" href="xmlsec-templates.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,150 +87,141 @@
 <h1>
 <a name="XMLSEC-PARSER"></a>parser</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12584"></a><h2>Name</h2>parser--Parser transform implementation.</div>
+<a name="AEN12089"></a><h2>Name</h2>parser -- Parser transform implementation.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN12587"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>xmlDocPtr</font>   <a href="xmlsec-parser.html#XMLSECPARSEFILE">xmlSecParseFile</a>                 (const <font>char</font> *filename);
-<font>xmlDocPtr</font>   <a href="xmlsec-parser.html#XMLSECPARSEMEMORY">xmlSecParseMemory</a>               (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                             <font>int</font> recovery);
-<font>xmlDocPtr</font>   <a href="xmlsec-parser.html#XMLSECPARSEMEMORYEXT">xmlSecParseMemoryExt</a>            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);
-#define     <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERID">xmlSecTransformXmlParserId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERGETKLASS">xmlSecTransformXmlParserGetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-PARSER.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEFILE">xmlSecParseFile</a>                     (const <font>char</font> *filename);
+<font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEMEMORY">xmlSecParseMemory</a>                   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
+                                                         <font>int</font> recovery);
+<font>xmlDocPtr</font>           <a href="xmlsec-parser.html#XMLSECPARSEMEMORYEXT">xmlSecParseMemoryExt</a>                (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);
+#define             <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERID">xmlSecTransformXmlParserId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-parser.html#XMLSECTRANSFORMXMLPARSERGETKLASS">xmlSecTransformXmlParserGetKlass</a>    (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN12609"></a><h2>Description</h2>
+<a name="XMLSEC-PARSER.DESCRIPTION"></a><h2>Description</h2>
 <p>Parser transform implementation.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN12612"></a><h2>Details</h2>
+<a name="XMLSEC-PARSER.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN12614"></a><h3>
-<a name="XMLSECPARSEFILE"></a>xmlSecParseFile ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>   xmlSecParseFile                 (const <font>char</font> *filename);</pre>
-<p>Loads XML Doc from file <var class="PARAMETER">filename</var>. We need a special version because of 
-c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseFileWithData()</code></font> function.</p>
+<a name="XMLSECPARSEFILE"></a><h3>xmlSecParseFile ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseFile                     (const <font>char</font> *filename);</pre>
+<p>Loads XML Doc from file <code class="PARAMETER">filename</code>. We need a special version because of 
+c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEFILEWITHDATA"><code class="FUNCTION">xmlSAXParseFileWithData()</code></gtkdoclink> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12628"><span style="white-space: nowrap"><var class="PARAMETER">filename</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12132"><span style="white-space: nowrap"><code class="PARAMETER">filename</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the filename.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12633"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the loaded XML document or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12137"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12638"></a><h3>
-<a name="XMLSECPARSEMEMORY"></a>xmlSecParseMemory ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>   xmlSecParseMemory               (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                             <font>int</font> recovery);</pre>
+<a name="XMLSECPARSEMEMORY"></a><h3>xmlSecParseMemory ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseMemory                   (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
+                                                         <font>int</font> recovery);</pre>
 <p>Loads XML Doc from memory. We need a special version because of 
-c14n issue. The code is copied from <font><code class="FUNCTION">xmlSAXParseMemory()</code></font> function.</p>
+c14n issue. The code is copied from <gtkdoclink href="XMLSAXPARSEMEMORY"><code class="FUNCTION">xmlSAXParseMemory()</code></gtkdoclink> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12653"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12156"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12658"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12161"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the input buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12663"><span style="white-space: nowrap"><var class="PARAMETER">recovery</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12166"><span style="white-space: nowrap"><code class="PARAMETER">recovery</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the flag.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12668"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the loaded XML document or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12171"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12673"></a><h3>
-<a name="XMLSECPARSEMEMORYEXT"></a>xmlSecParseMemoryExt ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>   xmlSecParseMemoryExt            (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);</pre>
-<p>Loads XML Doc from 3 chunks of memory: <var class="PARAMETER">prefix</var>, <var class="PARAMETER">buffer</var> and <var class="PARAMETER">postfix</var>.</p>
+<a name="XMLSECPARSEMEMORYEXT"></a><h3>xmlSecParseMemoryExt ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecParseMemoryExt                (const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> prefixSize,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bufferSize,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *postfix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> postfixSize);</pre>
+<p>Loads XML Doc from 3 chunks of memory: <code class="PARAMETER">prefix</code>, <code class="PARAMETER">buffer</code> and <code class="PARAMETER">postfix</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12692"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12194"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the first part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12697"><span style="white-space: nowrap"><var class="PARAMETER">prefixSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12199"><span style="white-space: nowrap"><code class="PARAMETER">prefixSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the size of the first part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12702"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12204"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the second part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12707"><span style="white-space: nowrap"><var class="PARAMETER">bufferSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12209"><span style="white-space: nowrap"><code class="PARAMETER">bufferSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the size of the second part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12712"><span style="white-space: nowrap"><var class="PARAMETER">postfix</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12214"><span style="white-space: nowrap"><code class="PARAMETER">postfix</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the third part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12717"><span style="white-space: nowrap"><var class="PARAMETER">postfixSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12219"><span style="white-space: nowrap"><code class="PARAMETER">postfixSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the size of the third part of the input.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12722"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the loaded XML document or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the loaded XML document or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12727"></a><h3>
-<a name="XMLSECTRANSFORMXMLPARSERID"></a>xmlSecTransformXmlParserId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformXmlParserId</pre>
+<a name="XMLSECTRANSFORMXMLPARSERID"></a><h3>xmlSecTransformXmlParserId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformXmlParserId</pre>
 <p>The XML Parser transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12735"></a><h3>
-<a name="XMLSECTRANSFORMXMLPARSERGETKLASS"></a>xmlSecTransformXmlParserGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformXmlParserGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMXMLPARSERGETKLASS"></a><h3>xmlSecTransformXmlParserGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXmlParserGetKlass    (void);</pre>
 <p>The XML parser transform.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN12745"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>XML parser transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12245"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> XML parser transform klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-nodeset.html"><b>&lt;&lt;&lt;nodeset</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-templates.html"><b>templates&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-nodeset.html"><b>&lt;&lt;&lt; nodeset</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-templates.html"><b>templates &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-ref.html b/docs/api/xmlsec-ref.html
index 1b1ab11..0401ee3 100644
--- a/docs/api/xmlsec-ref.html
+++ b/docs/api/xmlsec-ref.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Core Library API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="PREVIOUS" title="XML Security Library API Reference." href="xmlsec-reference.html">
 <link rel="NEXT" title="app" href="xmlsec-app.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -91,59 +90,59 @@
 <div class="TOC"><dl>
 <dt><b>Table of Contents</b></dt>
 <dt>
-<a href="xmlsec-app.html">app</a>--Crypto-engine independent application support function.</dt>
+<a href="xmlsec-app.html">app</a> -- Crypto-engine independent application support function.</dt>
 <dt>
-<a href="xmlsec-base64.html">base64</a>--Base64 encoding/decoding functions.</dt>
+<a href="xmlsec-base64.html">base64</a> -- Base64 encoding/decoding functions.</dt>
 <dt>
-<a href="xmlsec-bn.html">bn</a>--Big numbers support functions.</dt>
+<a href="xmlsec-bn.html">bn</a> -- Big numbers support functions.</dt>
 <dt>
-<a href="xmlsec-buffer.html">buffer</a>--Binary buffer implementation.</dt>
+<a href="xmlsec-buffer.html">buffer</a> -- Binary buffer implementation.</dt>
 <dt>
-<a href="xmlsec-dl.html">dl</a>--Dynamic crypto-engine library loading support.</dt>
+<a href="xmlsec-dl.html">dl</a> -- Dynamic crypto-engine library loading support.</dt>
 <dt>
-<a href="xmlsec-errors.html">errors</a>--Error/log messages support.</dt>
+<a href="xmlsec-errors.html">errors</a> -- Error/log messages support.</dt>
 <dt>
-<a href="xmlsec-io.html">io</a>--Input/output support.</dt>
+<a href="xmlsec-io.html">io</a> -- Input/output support.</dt>
 <dt>
-<a href="xmlsec-keyinfo.html">keyinfo</a>--<a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</dt>
+<a href="xmlsec-keyinfo.html">keyinfo</a> -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node parser.</dt>
 <dt>
-<a href="xmlsec-keysdata.html">keysdata</a>--Crypto key data object definition.</dt>
+<a href="xmlsec-keysdata.html">keysdata</a> -- Crypto key data object definition.</dt>
 <dt>
-<a href="xmlsec-keys.html">keys</a>--Crypto key object definition.</dt>
+<a href="xmlsec-keys.html">keys</a> -- Crypto key object definition.</dt>
 <dt>
-<a href="xmlsec-keysmngr.html">keysmngr</a>--Keys manager object support.</dt>
+<a href="xmlsec-keysmngr.html">keysmngr</a> -- Keys manager object support.</dt>
 <dt>
-<a href="xmlsec-list.html">list</a>--Generic list structure implementation.</dt>
+<a href="xmlsec-list.html">list</a> -- Generic list structure implementation.</dt>
 <dt>
-<a href="xmlsec-membuf.html">membuf</a>--Memory buffer transform implementation.</dt>
+<a href="xmlsec-membuf.html">membuf</a> -- Memory buffer transform implementation.</dt>
 <dt>
-<a href="xmlsec-nodeset.html">nodeset</a>--Nodeset object implementation.</dt>
+<a href="xmlsec-nodeset.html">nodeset</a> -- Nodeset object implementation.</dt>
 <dt>
-<a href="xmlsec-parser.html">parser</a>--Parser transform implementation.</dt>
+<a href="xmlsec-parser.html">parser</a> -- Parser transform implementation.</dt>
 <dt>
-<a href="xmlsec-templates.html">templates</a>--Dynamic templates creation functions.</dt>
+<a href="xmlsec-templates.html">templates</a> -- Dynamic templates creation functions.</dt>
 <dt>
-<a href="xmlsec-transforms.html">transforms</a>--Transform object definition.</dt>
+<a href="xmlsec-transforms.html">transforms</a> -- Transform object definition.</dt>
 <dt>
-<a href="xmlsec-version.html">version</a>--Version macros.</dt>
+<a href="xmlsec-version.html">version</a> -- Version macros.</dt>
 <dt>
-<a href="xmlsec-xmldsig.html">xmldsig</a>--XML Digital Signature support.</dt>
+<a href="xmlsec-xmldsig.html">xmldsig</a> -- XML Digital Signature support.</dt>
 <dt>
-<a href="xmlsec-xmlenc.html">xmlenc</a>--XML Encryption support.</dt>
+<a href="xmlsec-xmlenc.html">xmlenc</a> -- XML Encryption support.</dt>
 <dt>
-<a href="xmlsec-xmlsec.html">xmlsec</a>--Utility functions.</dt>
+<a href="xmlsec-xmlsec.html">xmlsec</a> -- Utility functions.</dt>
 <dt>
-<a href="xmlsec-xmltree.html">xmltree</a>--XML tree operations.</dt>
+<a href="xmlsec-xmltree.html">xmltree</a> -- XML tree operations.</dt>
 <dt>
-<a href="xmlsec-x509.html">x509</a>--<a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</dt>
+<a href="xmlsec-x509.html">x509</a> -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</dt>
 </dl></div>
 <p>This section contains the API reference for xmlsec. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </p>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-reference.html"><b>&lt;&lt;&lt;XML Security Library API Reference.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-app.html"><b>app&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-reference.html"><b>&lt;&lt;&lt; XML Security Library API Reference.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-app.html"><b>app &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-reference.html b/docs/api/xmlsec-reference.html
index 83f20f7..bafcc15 100644
--- a/docs/api/xmlsec-reference.html
+++ b/docs/api/xmlsec-reference.html
@@ -2,11 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>XML Security Library API Reference.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="PREVIOUS" title="APPENDIX B. XML Security Library Encryption Klasses." href="xmlsec-encryption-klasses.html">
 <link rel="NEXT" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -98,8 +97,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-encryption-klasses.html"><b>&lt;&lt;&lt;APPENDIX B. XML Security Library Encryption Klasses.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-ref.html"><b>XML Security Core Library API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-encryption-klasses.html"><b>&lt;&lt;&lt; APPENDIX B. XML Security Library Encryption Klasses.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-ref.html"><b>XML Security Core Library API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-signature-klasses.html b/docs/api/xmlsec-signature-klasses.html
index 3d2b8be..e066a70 100644
--- a/docs/api/xmlsec-signature-klasses.html
+++ b/docs/api/xmlsec-signature-klasses.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>APPENDIX A. XML Security Library Signature Klasses.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Library Tutorial" href="xmlsec-notes.html">
 <link rel="PREVIOUS" title="Writing a custom keys manager." href="xmlsec-custom-keys-manager.html">
 <link rel="NEXT" title="APPENDIX B. XML Security Library Encryption Klasses." href="xmlsec-encryption-klasses.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -94,8 +93,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-custom-keys-manager.html"><b>&lt;&lt;&lt;Writing a custom keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encryption-klasses.html"><b>APPENDIX B. XML Security Library Encryption Klasses.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-custom-keys-manager.html"><b>&lt;&lt;&lt; Writing a custom keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encryption-klasses.html"><b>APPENDIX B. XML Security Library Encryption Klasses. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-templates.html b/docs/api/xmlsec-templates.html
index a833db7..d9cc96c 100644
--- a/docs/api/xmlsec-templates.html
+++ b/docs/api/xmlsec-templates.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>templates</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="parser" href="xmlsec-parser.html">
 <link rel="NEXT" title="transforms" href="xmlsec-transforms.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,147 +87,134 @@
 <h1>
 <a name="XMLSEC-TEMPLATES"></a>templates</h1>
 <div class="REFNAMEDIV">
-<a name="AEN12755"></a><h2>Name</h2>templates--Dynamic templates creation functions.</div>
+<a name="AEN12255"></a><h2>Name</h2>templates -- Dynamic templates creation functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN12758"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">xmlSecTmplSignatureCreate</a>       (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> c14nMethodId,
-                                             <font>xmlSecTransformId</font> signMethodId,
-                                             const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATENSPREF">xmlSecTmplSignatureCreateNsPref</a> (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> c14nMethodId,
-                                             <font>xmlSecTransformId</font> signMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *nsPrefix);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREENSUREKEYINFO">xmlSecTmplSignatureEnsureKeyInfo</a>
-                                            (<font>xmlNodePtr</font> signNode,
-                                             const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDREFERENCE">xmlSecTmplSignatureAddReference</a> (<font>xmlNodePtr</font> signNode,
-                                             <font>xmlSecTransformId</font> digestMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDOBJECT">xmlSecTmplSignatureAddObject</a>    (<font>xmlNodePtr</font> signNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *mimeType,
-                                             const <font>xmlChar</font> *encoding);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETSIGNMETHODNODE">xmlSecTmplSignatureGetSignMethodNode</a>
-                                            (<font>xmlNodePtr</font> signNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETC14NMETHODNODE">xmlSecTmplSignatureGetC14NMethodNode</a>
-                                            (<font>xmlNodePtr</font> signNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLREFERENCEADDTRANSFORM">xmlSecTmplReferenceAddTransform</a> (<font>xmlNodePtr</font> referenceNode,
-                                             <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDSIGNPROPERTIES">xmlSecTmplObjectAddSignProperties</a>
-                                            (<font>xmlNodePtr</font> objectNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *target);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDMANIFEST">xmlSecTmplObjectAddManifest</a>     (<font>xmlNodePtr</font> objectNode,
-                                             const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLMANIFESTADDREFERENCE">xmlSecTmplManifestAddReference</a>  (<font>xmlNodePtr</font> manifestNode,
-                                             <font>xmlSecTransformId</font> digestMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATACREATE">xmlSecTmplEncDataCreate</a>         (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> encMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *mimeType,
-                                             const <font>xmlChar</font> *encoding);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREKEYINFO">xmlSecTmplEncDataEnsureKeyInfo</a>  (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREENCPROPERTIES">xmlSecTmplEncDataEnsureEncProperties</a>
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAADDENCPROPERTY">xmlSecTmplEncDataAddEncProperty</a> (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *target);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERVALUE">xmlSecTmplEncDataEnsureCipherValue</a>
-                                            (<font>xmlNodePtr</font> encNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERREFERENCE">xmlSecTmplEncDataEnsureCipherReference</a>
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLENCDATAGETENCMETHODNODE">xmlSecTmplEncDataGetEncMethodNode</a>
-                                            (<font>xmlNodePtr</font> encNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLCIPHERREFERENCEADDTRANSFORM">xmlSecTmplCipherReferenceAddTransform</a>
-                                            (<font>xmlNodePtr</font> cipherReferenceNode,
-                                             <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDDATAREFERENCE">xmlSecTmplReferenceListAddDataReference</a>
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDKEYREFERENCE">xmlSecTmplReferenceListAddKeyReference</a>
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYNAME">xmlSecTmplKeyInfoAddKeyName</a>     (<font>xmlNodePtr</font> keyInfoNode,
-                                             const <font>xmlChar</font> *name);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYVALUE">xmlSecTmplKeyInfoAddKeyValue</a>    (<font>xmlNodePtr</font> keyInfoNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDX509DATA">xmlSecTmplKeyInfoAddX509Data</a>    (<font>xmlNodePtr</font> keyInfoNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDRETRIEVALMETHOD">xmlSecTmplKeyInfoAddRetrievalMethod</a>
-                                            (<font>xmlNodePtr</font> keyInfoNode,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLRETRIEVALMETHODADDTRANSFORM">xmlSecTmplRetrievalMethodAddTransform</a>
-                                            (<font>xmlNodePtr</font> retrMethodNode,
-                                             <font>xmlSecTransformId</font> transformId);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDENCRYPTEDKEY">xmlSecTmplKeyInfoAddEncryptedKey</a>
-                                            (<font>xmlNodePtr</font> keyInfoNode,
-                                             <font>xmlSecTransformId</font> encMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *recipient);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDISSUERSERIAL">xmlSecTmplX509DataAddIssuerSerial</a>
-                                            (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDISSUERNAME">xmlSecTmplX509IssuerSerialAddIssuerName</a>
-                                            (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                             const <font>xmlChar</font> *issuerName);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER">xmlSecTmplX509IssuerSerialAddSerialNumber</a>
-                                            (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                             const <font>xmlChar</font> *serial);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSUBJECTNAME">xmlSecTmplX509DataAddSubjectName</a>
-                                            (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSKI">xmlSecTmplX509DataAddSKI</a>        (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCERTIFICATE">xmlSecTmplX509DataAddCertificate</a>
-                                            (<font>xmlNodePtr</font> x509DataNode);
-<font>xmlNodePtr</font>  <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCRL">xmlSecTmplX509DataAddCRL</a>        (<font>xmlNodePtr</font> x509DataNode);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH">xmlSecTmplTransformAddHmacOutputLength</a>
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDRSAOAEPPARAM">xmlSecTmplTransformAddRsaOaepParam</a>
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET">xmlSecTmplTransformAddXsltStylesheet</a>
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *xslt);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES">xmlSecTmplTransformAddC14NInclNamespaces</a>
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *prefixList);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH">xmlSecTmplTransformAddXPath</a>     (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH2">xmlSecTmplTransformAddXPath2</a>    (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);
-<font>int</font>         <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPOINTER">xmlSecTmplTransformAddXPointer</a>  (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);</pre>
+<a name="XMLSEC-TEMPLATES.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS"><font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATE">xmlSecTmplSignatureCreate</a>           (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> c14nMethodId,
+                                                         <font>xmlSecTransformId</font> signMethodId,
+                                                         const <font>xmlChar</font> *id);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATURECREATENSPREF">xmlSecTmplSignatureCreateNsPref</a>     (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> c14nMethodId,
+                                                         <font>xmlSecTransformId</font> signMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *nsPrefix);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREENSUREKEYINFO">xmlSecTmplSignatureEnsureKeyInfo</a>    (<font>xmlNodePtr</font> signNode,
+                                                         const <font>xmlChar</font> *id);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDREFERENCE">xmlSecTmplSignatureAddReference</a>     (<font>xmlNodePtr</font> signNode,
+                                                         <font>xmlSecTransformId</font> digestMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREADDOBJECT">xmlSecTmplSignatureAddObject</a>        (<font>xmlNodePtr</font> signNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *mimeType,
+                                                         const <font>xmlChar</font> *encoding);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETSIGNMETHODNODE">xmlSecTmplSignatureGetSignMethodNode</a>
+                                                        (<font>xmlNodePtr</font> signNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLSIGNATUREGETC14NMETHODNODE">xmlSecTmplSignatureGetC14NMethodNode</a>
+                                                        (<font>xmlNodePtr</font> signNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCEADDTRANSFORM">xmlSecTmplReferenceAddTransform</a>     (<font>xmlNodePtr</font> referenceNode,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDSIGNPROPERTIES">xmlSecTmplObjectAddSignProperties</a>   (<font>xmlNodePtr</font> objectNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *target);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLOBJECTADDMANIFEST">xmlSecTmplObjectAddManifest</a>         (<font>xmlNodePtr</font> objectNode,
+                                                         const <font>xmlChar</font> *id);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLMANIFESTADDREFERENCE">xmlSecTmplManifestAddReference</a>      (<font>xmlNodePtr</font> manifestNode,
+                                                         <font>xmlSecTransformId</font> digestMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATACREATE">xmlSecTmplEncDataCreate</a>             (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> encMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *mimeType,
+                                                         const <font>xmlChar</font> *encoding);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREKEYINFO">xmlSecTmplEncDataEnsureKeyInfo</a>      (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSUREENCPROPERTIES">xmlSecTmplEncDataEnsureEncProperties</a>
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAADDENCPROPERTY">xmlSecTmplEncDataAddEncProperty</a>     (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *target);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERVALUE">xmlSecTmplEncDataEnsureCipherValue</a>  (<font>xmlNodePtr</font> encNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAENSURECIPHERREFERENCE">xmlSecTmplEncDataEnsureCipherReference</a>
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLENCDATAGETENCMETHODNODE">xmlSecTmplEncDataGetEncMethodNode</a>   (<font>xmlNodePtr</font> encNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLCIPHERREFERENCEADDTRANSFORM">xmlSecTmplCipherReferenceAddTransform</a>
+                                                        (<font>xmlNodePtr</font> cipherReferenceNode,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDDATAREFERENCE">xmlSecTmplReferenceListAddDataReference</a>
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLREFERENCELISTADDKEYREFERENCE">xmlSecTmplReferenceListAddKeyReference</a>
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYNAME">xmlSecTmplKeyInfoAddKeyName</a>         (<font>xmlNodePtr</font> keyInfoNode,
+                                                         const <font>xmlChar</font> *name);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDKEYVALUE">xmlSecTmplKeyInfoAddKeyValue</a>        (<font>xmlNodePtr</font> keyInfoNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDX509DATA">xmlSecTmplKeyInfoAddX509Data</a>        (<font>xmlNodePtr</font> keyInfoNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDRETRIEVALMETHOD">xmlSecTmplKeyInfoAddRetrievalMethod</a> (<font>xmlNodePtr</font> keyInfoNode,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLRETRIEVALMETHODADDTRANSFORM">xmlSecTmplRetrievalMethodAddTransform</a>
+                                                        (<font>xmlNodePtr</font> retrMethodNode,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLKEYINFOADDENCRYPTEDKEY">xmlSecTmplKeyInfoAddEncryptedKey</a>    (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <font>xmlSecTransformId</font> encMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *recipient);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDISSUERSERIAL">xmlSecTmplX509DataAddIssuerSerial</a>   (<font>xmlNodePtr</font> x509DataNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDISSUERNAME">xmlSecTmplX509IssuerSerialAddIssuerName</a>
+                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
+                                                         const <font>xmlChar</font> *issuerName);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER">xmlSecTmplX509IssuerSerialAddSerialNumber</a>
+                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
+                                                         const <font>xmlChar</font> *serial);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSUBJECTNAME">xmlSecTmplX509DataAddSubjectName</a>    (<font>xmlNodePtr</font> x509DataNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDSKI">xmlSecTmplX509DataAddSKI</a>            (<font>xmlNodePtr</font> x509DataNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCERTIFICATE">xmlSecTmplX509DataAddCertificate</a>    (<font>xmlNodePtr</font> x509DataNode);
+<font>xmlNodePtr</font>          <a href="xmlsec-templates.html#XMLSECTMPLX509DATAADDCRL">xmlSecTmplX509DataAddCRL</a>            (<font>xmlNodePtr</font> x509DataNode);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH">xmlSecTmplTransformAddHmacOutputLength</a>
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDRSAOAEPPARAM">xmlSecTmplTransformAddRsaOaepParam</a>  (<font>xmlNodePtr</font> transformNode,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET">xmlSecTmplTransformAddXsltStylesheet</a>
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *xslt);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES">xmlSecTmplTransformAddC14NInclNamespaces</a>
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *prefixList);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH">xmlSecTmplTransformAddXPath</a>         (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPATH2">xmlSecTmplTransformAddXPath2</a>        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);
+<font>int</font>                 <a href="xmlsec-templates.html#XMLSECTMPLTRANSFORMADDXPOINTER">xmlSecTmplTransformAddXPointer</a>      (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN12942"></a><h2>Description</h2>
+<a name="XMLSEC-TEMPLATES.DESCRIPTION"></a><h2>Description</h2>
 <p>Dynamic templates creation functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN12945"></a><h2>Details</h2>
+<a name="XMLSEC-TEMPLATES.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN12947"></a><h3>
-<a name="XMLSECTMPLSIGNATURECREATE"></a>xmlSecTmplSignatureCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureCreate       (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> c14nMethodId,
-                                             <font>xmlSecTransformId</font> signMethodId,
-                                             const <font>xmlChar</font> *id);</pre>
+<a name="XMLSECTMPLSIGNATURECREATE"></a><h3>xmlSecTmplSignatureCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureCreate           (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> c14nMethodId,
+                                                         <font>xmlSecTransformId</font> signMethodId,
+                                                         const <font>xmlChar</font> *id);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with the mandatory <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>, 
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> and 
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> children and sub-children. 
@@ -238,40 +224,39 @@ in the XML document.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12966"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12465"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to signature document or NULL; in the 
-		second case, application must later call <var class="PARAMETER">xmlSetTreeDoc</var>
+		second case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code>
 		to ensure that all the children nodes have correct 
 		pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12972"><span style="white-space: nowrap"><var class="PARAMETER">c14nMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12471"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature canonicalization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12977"><span style="white-space: nowrap"><var class="PARAMETER">signMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12476"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature  method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12982"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12481"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN12987"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an 
+<td align="LEFT" valign="TOP"><a name="AEN12486"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an 
 error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN12993"></a><h3>
-<a name="XMLSECTMPLSIGNATURECREATENSPREF"></a>xmlSecTmplSignatureCreateNsPref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureCreateNsPref (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> c14nMethodId,
-                                             <font>xmlSecTransformId</font> signMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *nsPrefix);</pre>
+<a name="XMLSECTMPLSIGNATURECREATENSPREF"></a><h3>xmlSecTmplSignatureCreateNsPref ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureCreateNsPref     (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> c14nMethodId,
+                                                         <font>xmlSecTransformId</font> signMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *nsPrefix);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with the mandatory
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>, <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a>,
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> and <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> children and
@@ -284,1111 +269,1062 @@ inserting the returned node in the XML document.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13013"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12511"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to signature document or NULL; in the 
-		second case, application must later call <var class="PARAMETER">xmlSetTreeDoc</var>
+		second case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code>
 		to ensure that all the children nodes have correct 
 		pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13019"><span style="white-space: nowrap"><var class="PARAMETER">c14nMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12517"><span style="white-space: nowrap"><code class="PARAMETER">c14nMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature canonicalization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13024"><span style="white-space: nowrap"><var class="PARAMETER">signMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12522"><span style="white-space: nowrap"><code class="PARAMETER">signMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the signature  method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13029"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12527"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13034"><span style="white-space: nowrap"><var class="PARAMETER">nsPrefix</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12532"><span style="white-space: nowrap"><code class="PARAMETER">nsPrefix</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the namespace prefix for the signature element (e.g. "dsig"), or NULL </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13039"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an 
+<td align="LEFT" valign="TOP"><a name="AEN12537"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node or NULL if an 
 error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13045"></a><h3>
-<a name="XMLSECTMPLSIGNATUREENSUREKEYINFO"></a>xmlSecTmplSignatureEnsureKeyInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureEnsureKeyInfo
-                                            (<font>xmlNodePtr</font> signNode,
-                                             const <font>xmlChar</font> *id);</pre>
+<a name="XMLSECTMPLSIGNATUREENSUREKEYINFO"></a><h3>xmlSecTmplSignatureEnsureKeyInfo ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureEnsureKeyInfo    (<font>xmlNodePtr</font> signNode,
+                                                         const <font>xmlChar</font> *id);</pre>
 <p>Adds (if necessary) <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> 
-node <var class="PARAMETER">signNode</var>.</p>
+node <code class="PARAMETER">signNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13060"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12557"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13066"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12563"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13071"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or NULL if an 
+<td align="LEFT" valign="TOP"><a name="AEN12568"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or NULL if an 
 error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13077"></a><h3>
-<a name="XMLSECTMPLSIGNATUREADDREFERENCE"></a>xmlSecTmplSignatureAddReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureAddReference (<font>xmlNodePtr</font> signNode,
-                                             <font>xmlSecTransformId</font> digestMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with given URI (<var class="PARAMETER">uri</var>), Id (<var class="PARAMETER">id</var>) and 
-Type (<var class="PARAMETER">type</var>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
-<a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> child of <var class="PARAMETER">signNode</var>.</p>
+<a name="XMLSECTMPLSIGNATUREADDREFERENCE"></a><h3>xmlSecTmplSignatureAddReference ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureAddReference     (<font>xmlNodePtr</font> signNode,
+                                                         <font>xmlSecTransformId</font> digestMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with given URI (<code class="PARAMETER">uri</code>), Id (<code class="PARAMETER">id</code>) and 
+Type (<code class="PARAMETER">type</code>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
+<a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> child of <code class="PARAMETER">signNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13100"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12596"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13106"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12602"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13111"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12607"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13116"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12612"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node uri (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13121"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12617"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13126"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12622"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13132"></a><h3>
-<a name="XMLSECTMPLSIGNATUREADDOBJECT"></a>xmlSecTmplSignatureAddObject ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureAddObject    (<font>xmlNodePtr</font> signNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *mimeType,
-                                             const <font>xmlChar</font> *encoding);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node <var class="PARAMETER">signNode</var>.</p>
+<a name="XMLSECTMPLSIGNATUREADDOBJECT"></a><h3>xmlSecTmplSignatureAddObject ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureAddObject        (<font>xmlNodePtr</font> signNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *mimeType,
+                                                         const <font>xmlChar</font> *encoding);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node <code class="PARAMETER">signNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13149"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12644"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13155"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12650"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13160"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12655"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the object mime type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13165"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12660"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the object encoding (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13170"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12665"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13176"></a><h3>
-<a name="XMLSECTMPLSIGNATUREGETSIGNMETHODNODE"></a>xmlSecTmplSignatureGetSignMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureGetSignMethodNode
-                                            (<font>xmlNodePtr</font> signNode);</pre>
+<a name="XMLSECTMPLSIGNATUREGETSIGNMETHODNODE"></a><h3>xmlSecTmplSignatureGetSignMethodNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureGetSignMethodNode
+                                                        (<font>xmlNodePtr</font> signNode);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod"; target="_top">&lt;dsig:SignatureMethod/&gt;</a> child of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13189"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12683"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13195"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod%20"; target="_top">&lt;dsig:SignatureMethod /&gt;</a> node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureMethod%20"; target="_top">&lt;dsig:SignatureMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13201"></a><h3>
-<a name="XMLSECTMPLSIGNATUREGETC14NMETHODNODE"></a>xmlSecTmplSignatureGetC14NMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplSignatureGetC14NMethodNode
-                                            (<font>xmlNodePtr</font> signNode);</pre>
+<a name="XMLSECTMPLSIGNATUREGETC14NMETHODNODE"></a><h3>xmlSecTmplSignatureGetC14NMethodNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplSignatureGetC14NMethodNode
+                                                        (<font>xmlNodePtr</font> signNode);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod"; target="_top">&lt;dsig:CanonicalizationMethod/&gt;</a> child of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13214"><span style="white-space: nowrap"><var class="PARAMETER">signNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12707"><span style="white-space: nowrap"><code class="PARAMETER">signNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature%20"; target="_top">&lt;dsig:Signature /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13220"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod%20"; target="_top">&lt;dsig:CanonicalizationMethod /&gt;</a> node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN12713"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-CanonicalizationMethod%20"; target="_top">&lt;dsig:CanonicalizationMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13226"></a><h3>
-<a name="XMLSECTMPLREFERENCEADDTRANSFORM"></a>xmlSecTmplReferenceAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplReferenceAddTransform (<font>xmlNodePtr</font> referenceNode,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node <var class="PARAMETER">referenceNode</var>.</p>
+<a name="XMLSECTMPLREFERENCEADDTRANSFORM"></a><h3>xmlSecTmplReferenceAddTransform ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceAddTransform     (<font>xmlNodePtr</font> referenceNode,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node <code class="PARAMETER">referenceNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13241"><span style="white-space: nowrap"><var class="PARAMETER">referenceNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12733"><span style="white-space: nowrap"><code class="PARAMETER">referenceNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13247"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12739"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform method id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13252"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or NULL if an 
+<td align="LEFT" valign="TOP"><a name="AEN12744"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or NULL if an 
 error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13258"></a><h3>
-<a name="XMLSECTMPLOBJECTADDSIGNPROPERTIES"></a>xmlSecTmplObjectAddSignProperties ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplObjectAddSignProperties
-                                            (<font>xmlNodePtr</font> objectNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *target);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <var class="PARAMETER">objectNode</var>.</p>
+<a name="XMLSECTMPLOBJECTADDSIGNPROPERTIES"></a><h3>xmlSecTmplObjectAddSignProperties ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplObjectAddSignProperties   (<font>xmlNodePtr</font> objectNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *target);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <code class="PARAMETER">objectNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13274"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12765"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13280"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12771"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13285"><span style="white-space: nowrap"><var class="PARAMETER">target</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12776"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Target  (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13290"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12781"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureProperties"; target="_top">&lt;dsig:SignatureProperties/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13296"></a><h3>
-<a name="XMLSECTMPLOBJECTADDMANIFEST"></a>xmlSecTmplObjectAddManifest ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplObjectAddManifest     (<font>xmlNodePtr</font> objectNode,
-                                             const <font>xmlChar</font> *id);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <var class="PARAMETER">objectNode</var>.</p>
+<a name="XMLSECTMPLOBJECTADDMANIFEST"></a><h3>xmlSecTmplObjectAddManifest ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplObjectAddManifest         (<font>xmlNodePtr</font> objectNode,
+                                                         const <font>xmlChar</font> *id);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node <code class="PARAMETER">objectNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13311"><span style="white-space: nowrap"><var class="PARAMETER">objectNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12801"><span style="white-space: nowrap"><code class="PARAMETER">objectNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the  pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Object"; target="_top">&lt;dsig:Object/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13317"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12807"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13322"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12812"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13328"></a><h3>
-<a name="XMLSECTMPLMANIFESTADDREFERENCE"></a>xmlSecTmplManifestAddReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplManifestAddReference  (<font>xmlNodePtr</font> manifestNode,
-                                             <font>xmlSecTransformId</font> digestMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with specified URI (<var class="PARAMETER">uri</var>), Id (<var class="PARAMETER">id</var>) and 
-Type (<var class="PARAMETER">type</var>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
-<a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node <var class="PARAMETER">manifestNode</var>.</p>
+<a name="XMLSECTMPLMANIFESTADDREFERENCE"></a><h3>xmlSecTmplManifestAddReference ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplManifestAddReference      (<font>xmlNodePtr</font> manifestNode,
+                                                         <font>xmlSecTransformId</font> digestMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node with specified URI (<code class="PARAMETER">uri</code>), Id (<code class="PARAMETER">id</code>) and 
+Type (<code class="PARAMETER">type</code>) attributes and the required children <a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestMethod"; target="_top">&lt;dsig:DigestMethod/&gt;</a> and
+<a href="http://www.w3.org/TR/xmldsig-core/#sec-DigestValue"; target="_top">&lt;dsig:DigestValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node <code class="PARAMETER">manifestNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13351"><span style="white-space: nowrap"><var class="PARAMETER">manifestNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12840"><span style="white-space: nowrap"><code class="PARAMETER">manifestNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13357"><span style="white-space: nowrap"><var class="PARAMETER">digestMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12846"><span style="white-space: nowrap"><code class="PARAMETER">digestMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the reference digest method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13362"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12851"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the node id (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13367"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12856"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node uri (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13372"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12861"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the reference node type (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13377"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12866"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13383"></a><h3>
-<a name="XMLSECTMPLENCDATACREATE"></a>xmlSecTmplEncDataCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataCreate         (<font>xmlDocPtr</font> doc,
-                                             <font>xmlSecTransformId</font> encMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *mimeType,
-                                             const <font>xmlChar</font> *encoding);</pre>
+<a name="XMLSECTMPLENCDATACREATE"></a><h3>xmlSecTmplEncDataCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataCreate             (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlSecTransformId</font> encMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *mimeType,
+                                                         const <font>xmlChar</font> *encoding);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData%20"; target="_top">&lt;enc:EncryptedData /&gt;</a> node for encryption template.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13400"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12888"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to signature document or NULL; in the later
-		case, application must later call <var class="PARAMETER">xmlSetTreeDoc</var> to ensure 
+		case, application must later call <code class="PARAMETER">xmlSetTreeDoc</code> to ensure 
 		that all the children nodes have correct pointer to XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13406"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12894"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the encryption method (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13411"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12899"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13416"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12904"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13421"><span style="white-space: nowrap"><var class="PARAMETER">mimeType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12909"><span style="white-space: nowrap"><code class="PARAMETER">mimeType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the MimeType attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13426"><span style="white-space: nowrap"><var class="PARAMETER">encoding</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12914"><span style="white-space: nowrap"><code class="PARAMETER">encoding</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Encoding attribute (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13431"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer newly created  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node or NULL 
+<td align="LEFT" valign="TOP"><a name="AEN12919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer newly created  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node or NULL 
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13437"></a><h3>
-<a name="XMLSECTMPLENCDATAENSUREKEYINFO"></a>xmlSecTmplEncDataEnsureKeyInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataEnsureKeyInfo  (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> to the  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <var class="PARAMETER">encNode</var>.</p>
+<a name="XMLSECTMPLENCDATAENSUREKEYINFO"></a><h3>xmlSecTmplEncDataEnsureKeyInfo ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureKeyInfo      (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> to the  <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13452"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12939"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13458"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12945"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the Id attrbibute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13463"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN12950"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13469"></a><h3>
-<a name="XMLSECTMPLENCDATAENSUREENCPROPERTIES"></a>xmlSecTmplEncDataEnsureEncProperties ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataEnsureEncProperties
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id);</pre>
+<a name="XMLSECTMPLENCDATAENSUREENCPROPERTIES"></a><h3>xmlSecTmplEncDataEnsureEncProperties ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureEncProperties
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> 
-node <var class="PARAMETER">encNode</var>.</p>
+node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13484"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12970"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13490"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN12976"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13495"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN12981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13501"></a><h3>
-<a name="XMLSECTMPLENCDATAADDENCPROPERTY"></a>xmlSecTmplEncDataAddEncProperty ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataAddEncProperty (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *target);</pre>
+<a name="XMLSECTMPLENCDATAADDENCPROPERTY"></a><h3>xmlSecTmplEncDataAddEncProperty ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataAddEncProperty     (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *target);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty"; target="_top">&lt;enc:EncryptionProperty/&gt;</a> node (and the parent 
 <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperties"; target="_top">&lt;enc:EncryptionProperties/&gt;</a> node if required) to the 
-<a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <var class="PARAMETER">encNode</var>.</p>
+<a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13518"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13003"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13524"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13009"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13529"><span style="white-space: nowrap"><var class="PARAMETER">target</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13014"><span style="white-space: nowrap"><code class="PARAMETER">target</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Target attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13534"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty"; target="_top">&lt;enc:EncryptionProperty/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13019"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionProperty"; target="_top">&lt;enc:EncryptionProperty/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13540"></a><h3>
-<a name="XMLSECTMPLENCDATAENSURECIPHERVALUE"></a>xmlSecTmplEncDataEnsureCipherValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataEnsureCipherValue
-                                            (<font>xmlNodePtr</font> encNode);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <var class="PARAMETER">encNode</var>.</p>
+<a name="XMLSECTMPLENCDATAENSURECIPHERVALUE"></a><h3>xmlSecTmplEncDataEnsureCipherValue ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureCipherValue  (<font>xmlNodePtr</font> encNode);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13554"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13038"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13560"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13044"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13566"></a><h3>
-<a name="XMLSECTMPLENCDATAENSURECIPHERREFERENCE"></a>xmlSecTmplEncDataEnsureCipherReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataEnsureCipherReference
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node with specified URI attribute <var class="PARAMETER">uri</var>
-to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <var class="PARAMETER">encNode</var>.</p>
+<a name="XMLSECTMPLENCDATAENSURECIPHERREFERENCE"></a><h3>xmlSecTmplEncDataEnsureCipherReference ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataEnsureCipherReference
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node with specified URI attribute <code class="PARAMETER">uri</code>
+to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13582"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13065"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13588"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13071"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URI attribute (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13593"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13076"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13599"></a><h3>
-<a name="XMLSECTMPLENCDATAGETENCMETHODNODE"></a>xmlSecTmplEncDataGetEncMethodNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplEncDataGetEncMethodNode
-                                            (<font>xmlNodePtr</font> encNode);</pre>
+<a name="XMLSECTMPLENCDATAGETENCMETHODNODE"></a><h3>xmlSecTmplEncDataGetEncMethodNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplEncDataGetEncMethodNode   (<font>xmlNodePtr</font> encNode);</pre>
 <p>Gets pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncrytpionMethod"; target="_top">&lt;enc:EncrytpionMethod/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13611"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13093"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EcnryptedData%20"; target="_top">&lt;enc:EcnryptedData /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13617"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod%20"; target="_top">&lt;enc:EncryptionMethod /&gt;</a> node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13099"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod%20"; target="_top">&lt;enc:EncryptionMethod /&gt;</a> node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13623"></a><h3>
-<a name="XMLSECTMPLCIPHERREFERENCEADDTRANSFORM"></a>xmlSecTmplCipherReferenceAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplCipherReferenceAddTransform
-                                            (<font>xmlNodePtr</font> cipherReferenceNode,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
+<a name="XMLSECTMPLCIPHERREFERENCEADDTRANSFORM"></a><h3>xmlSecTmplCipherReferenceAddTransform ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplCipherReferenceAddTransform
+                                                        (<font>xmlNodePtr</font> cipherReferenceNode,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node (and the parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node)
-with specified transform methods <var class="PARAMETER">transform</var> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a>
-child node of the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <var class="PARAMETER">encNode</var>.</p>
+with specified transform methods <code class="PARAMETER">transform</code> to the <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a>
+child node of the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node <code class="PARAMETER">encNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13641"><span style="white-space: nowrap"><var class="PARAMETER">cipherReferenceNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13122"><span style="white-space: nowrap"><code class="PARAMETER">cipherReferenceNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherReference"; target="_top">&lt;enc:CipherReference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13647"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13128"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13652"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13133"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13658"></a><h3>
-<a name="XMLSECTMPLREFERENCELISTADDDATAREFERENCE"></a>xmlSecTmplReferenceListAddDataReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplReferenceListAddDataReference
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);</pre>
+<a name="XMLSECTMPLREFERENCELISTADDDATAREFERENCE"></a><h3>xmlSecTmplReferenceListAddDataReference ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceListAddDataReference
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-DataReference"; target="_top">&lt;enc:DataReference/&gt;</a> and the parent <a href="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList"; target="_top">&lt;enc:ReferenceList/&gt;</a> node (if needed).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13672"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13152"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	                the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13678"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13158"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13683"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-DataReference"; target="_top">&lt;enc:DataReference/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13163"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-DataReference"; target="_top">&lt;enc:DataReference/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13689"></a><h3>
-<a name="XMLSECTMPLREFERENCELISTADDKEYREFERENCE"></a>xmlSecTmplReferenceListAddKeyReference ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplReferenceListAddKeyReference
-                                            (<font>xmlNodePtr</font> encNode,
-                                             const <font>xmlChar</font> *uri);</pre>
+<a name="XMLSECTMPLREFERENCELISTADDKEYREFERENCE"></a><h3>xmlSecTmplReferenceListAddKeyReference ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplReferenceListAddKeyReference
+                                                        (<font>xmlNodePtr</font> encNode,
+                                                         const <font>xmlChar</font> *uri);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference"; target="_top">&lt;enc:KeyReference/&gt;</a> and the parent <a href="http://www.w3.org/TR/xmlenc-core/#sec-ReferenceList"; target="_top">&lt;enc:ReferenceList/&gt;</a> node (if needed).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13703"><span style="white-space: nowrap"><var class="PARAMETER">encNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13182"><span style="white-space: nowrap"><code class="PARAMETER">encNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	                the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13709"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13188"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>                        uri to reference (optional)</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13714"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference"; target="_top">&lt;enc:KeyReference/&gt;</a> node or 
+<td align="LEFT" valign="TOP"><a name="AEN13193"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyReference"; target="_top">&lt;enc:KeyReference/&gt;</a> node or 
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13720"></a><h3>
-<a name="XMLSECTMPLKEYINFOADDKEYNAME"></a>xmlSecTmplKeyInfoAddKeyName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplKeyInfoAddKeyName     (<font>xmlNodePtr</font> keyInfoNode,
-                                             const <font>xmlChar</font> *name);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var>.</p>
+<a name="XMLSECTMPLKEYINFOADDKEYNAME"></a><h3>xmlSecTmplKeyInfoAddKeyName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddKeyName         (<font>xmlNodePtr</font> keyInfoNode,
+                                                         const <font>xmlChar</font> *name);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13735"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13213"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13741"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13219"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the key name (optional).	</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13746"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13224"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyName"; target="_top">&lt;dsig:KeyName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13752"></a><h3>
-<a name="XMLSECTMPLKEYINFOADDKEYVALUE"></a>xmlSecTmplKeyInfoAddKeyValue ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplKeyInfoAddKeyValue    (<font>xmlNodePtr</font> keyInfoNode);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var>.</p>
+<a name="XMLSECTMPLKEYINFOADDKEYVALUE"></a><h3>xmlSecTmplKeyInfoAddKeyValue ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddKeyValue        (<font>xmlNodePtr</font> keyInfoNode);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13766"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13243"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13772"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13249"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyValue"; target="_top">&lt;dsig:KeyValue/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13778"></a><h3>
-<a name="XMLSECTMPLKEYINFOADDX509DATA"></a>xmlSecTmplKeyInfoAddX509Data ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplKeyInfoAddX509Data    (<font>xmlNodePtr</font> keyInfoNode);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var>.</p>
+<a name="XMLSECTMPLKEYINFOADDX509DATA"></a><h3>xmlSecTmplKeyInfoAddX509Data ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddX509Data        (<font>xmlNodePtr</font> keyInfoNode);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13792"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13268"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13798"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13804"></a><h3>
-<a name="XMLSECTMPLKEYINFOADDRETRIEVALMETHOD"></a>xmlSecTmplKeyInfoAddRetrievalMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplKeyInfoAddRetrievalMethod
-                                            (<font>xmlNodePtr</font> keyInfoNode,
-                                             const <font>xmlChar</font> *uri,
-                                             const <font>xmlChar</font> *type);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var>.</p>
+<a name="XMLSECTMPLKEYINFOADDRETRIEVALMETHOD"></a><h3>xmlSecTmplKeyInfoAddRetrievalMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddRetrievalMethod (<font>xmlNodePtr</font> keyInfoNode,
+                                                         const <font>xmlChar</font> *uri,
+                                                         const <font>xmlChar</font> *type);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13820"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13295"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13826"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13301"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the URI attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13831"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13306"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13311"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13842"></a><h3>
-<a name="XMLSECTMPLRETRIEVALMETHODADDTRANSFORM"></a>xmlSecTmplRetrievalMethodAddTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplRetrievalMethodAddTransform
-                                            (<font>xmlNodePtr</font> retrMethodNode,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
+<a name="XMLSECTMPLRETRIEVALMETHODADDTRANSFORM"></a><h3>xmlSecTmplRetrievalMethodAddTransform ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplRetrievalMethodAddTransform
+                                                        (<font>xmlNodePtr</font> retrMethodNode,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node (and the parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node
-if required) to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node <var class="PARAMETER">retrMethod</var>.</p>
+if required) to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node <code class="PARAMETER">retrMethod</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13858"><span style="white-space: nowrap"><var class="PARAMETER">retrMethodNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13332"><span style="white-space: nowrap"><code class="PARAMETER">retrMethodNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-RetrievalMethod"; target="_top">&lt;dsig:RetrievalMethod/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13864"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13338"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the transform id.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13869"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transforms"; target="_top">&lt;dsig:Transforms/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13875"></a><h3>
-<a name="XMLSECTMPLKEYINFOADDENCRYPTEDKEY"></a>xmlSecTmplKeyInfoAddEncryptedKey ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplKeyInfoAddEncryptedKey
-                                            (<font>xmlNodePtr</font> keyInfoNode,
-                                             <font>xmlSecTransformId</font> encMethodId,
-                                             const <font>xmlChar</font> *id,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *recipient);</pre>
+<a name="XMLSECTMPLKEYINFOADDENCRYPTEDKEY"></a><h3>xmlSecTmplKeyInfoAddEncryptedKey ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplKeyInfoAddEncryptedKey    (<font>xmlNodePtr</font> keyInfoNode,
+                                                         <font>xmlSecTransformId</font> encMethodId,
+                                                         const <font>xmlChar</font> *id,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *recipient);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node with given attributes to 
-the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <var class="PARAMETER">keyInfoNode</var>.</p>
+the <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node <code class="PARAMETER">keyInfoNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13893"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13366"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13899"><span style="white-space: nowrap"><var class="PARAMETER">encMethodId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13372"><span style="white-space: nowrap"><code class="PARAMETER">encMethodId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the encryption method (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13904"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13377"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Id attribute (optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13909"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13382"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Type attribute (optional). </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13914"><span style="white-space: nowrap"><var class="PARAMETER">recipient</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13387"><span style="white-space: nowrap"><code class="PARAMETER">recipient</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the Recipient attribute (optional). </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13392"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13925"></a><h3>
-<a name="XMLSECTMPLX509DATAADDISSUERSERIAL"></a>xmlSecTmplX509DataAddIssuerSerial ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509DataAddIssuerSerial
-                                            (<font>xmlNodePtr</font> x509DataNode);</pre>
+<a name="XMLSECTMPLX509DATAADDISSUERSERIAL"></a><h3>xmlSecTmplX509DataAddIssuerSerial ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddIssuerSerial   (<font>xmlNodePtr</font> x509DataNode);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13938"><span style="white-space: nowrap"><var class="PARAMETER">x509DataNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13410"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13944"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13416"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13950"></a><h3>
-<a name="XMLSECTMPLX509ISSUERSERIALADDISSUERNAME"></a>xmlSecTmplX509IssuerSerialAddIssuerName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509IssuerSerialAddIssuerName
-                                            (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                             const <font>xmlChar</font> *issuerName);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <var class="PARAMETER">x509IssuerSerialNode</var>.</p>
+<a name="XMLSECTMPLX509ISSUERSERIALADDISSUERNAME"></a><h3>xmlSecTmplX509IssuerSerialAddIssuerName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509IssuerSerialAddIssuerName
+                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
+                                                         const <font>xmlChar</font> *issuerName);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <code class="PARAMETER">x509IssuerSerialNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13965"><span style="white-space: nowrap"><var class="PARAMETER">x509IssuerSerialNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13436"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13971"><span style="white-space: nowrap"><var class="PARAMETER">issuerName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13442"><span style="white-space: nowrap"><code class="PARAMETER">issuerName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the issuer name (optional).	</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13976"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13447"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerName"; target="_top">&lt;dsig:X509IssuerName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN13982"></a><h3>
-<a name="XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER"></a>xmlSecTmplX509IssuerSerialAddSerialNumber ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509IssuerSerialAddSerialNumber
-                                            (<font>xmlNodePtr</font> x509IssuerSerialNode,
-                                             const <font>xmlChar</font> *serial);</pre>
-<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <var class="PARAMETER">x509IssuerSerialNode</var>.</p>
+<a name="XMLSECTMPLX509ISSUERSERIALADDSERIALNUMBER"></a><h3>xmlSecTmplX509IssuerSerialAddSerialNumber ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509IssuerSerialAddSerialNumber
+                                                        (<font>xmlNodePtr</font> x509IssuerSerialNode,
+                                                         const <font>xmlChar</font> *serial);</pre>
+<p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node <code class="PARAMETER">x509IssuerSerialNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN13997"><span style="white-space: nowrap"><var class="PARAMETER">x509IssuerSerialNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13467"><span style="white-space: nowrap"><code class="PARAMETER">x509IssuerSerialNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14003"><span style="white-space: nowrap"><var class="PARAMETER">serial</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13473"><span style="white-space: nowrap"><code class="PARAMETER">serial</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the serial number (optional).	</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14008"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13478"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SerialNumber"; target="_top">&lt;dsig:X509SerialNumber/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14014"></a><h3>
-<a name="XMLSECTMPLX509DATAADDSUBJECTNAME"></a>xmlSecTmplX509DataAddSubjectName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509DataAddSubjectName
-                                            (<font>xmlNodePtr</font> x509DataNode);</pre>
+<a name="XMLSECTMPLX509DATAADDSUBJECTNAME"></a><h3>xmlSecTmplX509DataAddSubjectName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddSubjectName    (<font>xmlNodePtr</font> x509DataNode);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14027"><span style="white-space: nowrap"><var class="PARAMETER">x509DataNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13496"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14033"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13502"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14039"></a><h3>
-<a name="XMLSECTMPLX509DATAADDSKI"></a>xmlSecTmplX509DataAddSKI ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509DataAddSKI        (<font>xmlNodePtr</font> x509DataNode);</pre>
+<a name="XMLSECTMPLX509DATAADDSKI"></a><h3>xmlSecTmplX509DataAddSKI ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddSKI            (<font>xmlNodePtr</font> x509DataNode);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI"; target="_top">&lt;dsig:X509SKI/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14052"><span style="white-space: nowrap"><var class="PARAMETER">x509DataNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13520"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14058"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI"; target="_top">&lt;dsig:X509SKI/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13526"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SKI"; target="_top">&lt;dsig:X509SKI/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14064"></a><h3>
-<a name="XMLSECTMPLX509DATAADDCERTIFICATE"></a>xmlSecTmplX509DataAddCertificate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509DataAddCertificate
-                                            (<font>xmlNodePtr</font> x509DataNode);</pre>
+<a name="XMLSECTMPLX509DATAADDCERTIFICATE"></a><h3>xmlSecTmplX509DataAddCertificate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddCertificate    (<font>xmlNodePtr</font> x509DataNode);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14077"><span style="white-space: nowrap"><var class="PARAMETER">x509DataNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13544"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14083"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13550"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14089"></a><h3>
-<a name="XMLSECTMPLX509DATAADDCRL"></a>xmlSecTmplX509DataAddCRL ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecTmplX509DataAddCRL        (<font>xmlNodePtr</font> x509DataNode);</pre>
+<a name="XMLSECTMPLX509DATAADDCRL"></a><h3>xmlSecTmplX509DataAddCRL ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecTmplX509DataAddCRL            (<font>xmlNodePtr</font> x509DataNode);</pre>
 <p>Adds <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node to the given <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14102"><span style="white-space: nowrap"><var class="PARAMETER">x509DataNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13568"><span style="white-space: nowrap"><code class="PARAMETER">x509DataNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node or
+<td align="LEFT" valign="TOP"><a name="AEN13574"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the newly created <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node or
 NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14114"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH"></a>xmlSecTmplTransformAddHmacOutputLength ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddHmacOutputLength
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);</pre>
+<a name="XMLSECTMPLTRANSFORMADDHMACOUTPUTLENGTH"></a><h3>xmlSecTmplTransformAddHmacOutputLength ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddHmacOutputLength
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> bitsLen);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmldsig-core/#sec-HMACOutputLength"; target="_top">&lt;dsig:HMACOutputLength/&gt;</a> child for the HMAC transform 
-node <var class="PARAMETER">node</var>.</p>
+node <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14128"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13593"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14134"><span style="white-space: nowrap"><var class="PARAMETER">bitsLen</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13599"><span style="white-space: nowrap"><code class="PARAMETER">bitsLen</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the required length in bits</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14139"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negatie value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13604"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negatie value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14144"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDRSAOAEPPARAM"></a>xmlSecTmplTransformAddRsaOaepParam ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddRsaOaepParam
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Creates <a href="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam"; target="_top">&lt;enc:OAEPParam/&gt;</a> child node in the <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECTMPLTRANSFORMADDRSAOAEPPARAM"></a><h3>xmlSecTmplTransformAddRsaOaepParam ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddRsaOaepParam  (<font>xmlNodePtr</font> transformNode,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buf,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Creates <a href="http://www.w3.org/TR/xmlenc-core/#sec-OAEPParam"; target="_top">&lt;enc:OAEPParam/&gt;</a> child node in the <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14159"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13623"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14165"><span style="white-space: nowrap"><var class="PARAMETER">buf</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13629"><span style="white-space: nowrap"><code class="PARAMETER">buf</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the OAEP param buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14170"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13634"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the OAEP param buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14175"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13639"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14180"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET"></a>xmlSecTmplTransformAddXsltStylesheet ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddXsltStylesheet
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *xslt);</pre>
-<p>Writes the XSLT transform expression to the <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECTMPLTRANSFORMADDXSLTSTYLESHEET"></a><h3>xmlSecTmplTransformAddXsltStylesheet ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXsltStylesheet
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *xslt);</pre>
+<p>Writes the XSLT transform expression to the <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14193"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13656"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14199"><span style="white-space: nowrap"><var class="PARAMETER">xslt</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13662"><span style="white-space: nowrap"><code class="PARAMETER">xslt</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XSLT transform exspression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14204"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13667"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14209"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES"></a>xmlSecTmplTransformAddC14NInclNamespaces ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddC14NInclNamespaces
-                                            (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *prefixList);</pre>
-<p>Adds "inclusive" namespaces to the ExcC14N transform node <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECTMPLTRANSFORMADDC14NINCLNAMESPACES"></a><h3>xmlSecTmplTransformAddC14NInclNamespaces ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddC14NInclNamespaces
+                                                        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *prefixList);</pre>
+<p>Adds "inclusive" namespaces to the ExcC14N transform node <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14222"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13684"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14228"><span style="white-space: nowrap"><var class="PARAMETER">prefixList</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13690"><span style="white-space: nowrap"><code class="PARAMETER">prefixList</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the white space delimited  list of namespace prefixes, 
-		where "<font><span class="TYPE">default</span></font>" indicates the default namespace
+		where "<gtkdoclink href="DEFAULT"><span class="TYPE">default</span></gtkdoclink>" indicates the default namespace
 		(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14235"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 if success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13697"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 if success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14240"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDXPATH"></a>xmlSecTmplTransformAddXPath ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddXPath     (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);</pre>
+<a name="XMLSECTMPLTRANSFORMADDXPATH"></a><h3>xmlSecTmplTransformAddXPath ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPath         (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);</pre>
 <p>Writes XPath transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node 
-<var class="PARAMETER">node</var>.</p>
+<code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14255"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13716"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14261"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13722"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14266"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13727"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs
 		(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14271"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 for success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13732"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14276"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDXPATH2"></a>xmlSecTmplTransformAddXPath2 ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddXPath2    (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *type,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);</pre>
+<a name="XMLSECTMPLTRANSFORMADDXPATH2"></a><h3>xmlSecTmplTransformAddXPath2 ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPath2        (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *type,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);</pre>
 <p>Writes XPath2 transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node 
-<var class="PARAMETER">node</var>.</p>
+<code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14292"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13752"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14298"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13758"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XPath2 transform type ("union", "intersect" or "subtract").</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14303"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13763"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14308"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13768"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14313"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 for success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13773"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14318"></a><h3>
-<a name="XMLSECTMPLTRANSFORMADDXPOINTER"></a>xmlSecTmplTransformAddXPointer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTmplTransformAddXPointer  (<font>xmlNodePtr</font> transformNode,
-                                             const <font>xmlChar</font> *expression,
-                                             const <font>xmlChar</font> **nsList);</pre>
+<a name="XMLSECTMPLTRANSFORMADDXPOINTER"></a><h3>xmlSecTmplTransformAddXPointer ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTmplTransformAddXPointer      (<font>xmlNodePtr</font> transformNode,
+                                                         const <font>xmlChar</font> *expression,
+                                                         const <font>xmlChar</font> **nsList);</pre>
 <p>Writes XPoniter transform infromation to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node 
-<var class="PARAMETER">node</var>.</p>
+<code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14333"><span style="white-space: nowrap"><var class="PARAMETER">transformNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13792"><span style="white-space: nowrap"><code class="PARAMETER">transformNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the pointer to the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14339"><span style="white-space: nowrap"><var class="PARAMETER">expression</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13798"><span style="white-space: nowrap"><code class="PARAMETER">expression</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the XPath expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14344"><span style="white-space: nowrap"><var class="PARAMETER">nsList</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN13803"><span style="white-space: nowrap"><code class="PARAMETER">nsList</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the NULL terminated list of namespace prefix/href pairs.
 		(optional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14349"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 for success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN13808"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 for success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-parser.html"><b>&lt;&lt;&lt;parser</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-transforms.html"><b>transforms&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-parser.html"><b>&lt;&lt;&lt; parser</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-transforms.html"><b>transforms &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-transforms.html b/docs/api/xmlsec-transforms.html
index 4098925..a02f0a4 100644
--- a/docs/api/xmlsec-transforms.html
+++ b/docs/api/xmlsec-transforms.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>transforms</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="templates" href="xmlsec-templates.html">
 <link rel="NEXT" title="version" href="xmlsec-version.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,298 +87,268 @@
 <h1>
 <a name="XMLSEC-TRANSFORMS"></a>transforms</h1>
 <div class="REFNAMEDIV">
-<a name="AEN14359"></a><h2>Name</h2>transforms--Transform object definition.</div>
+<a name="AEN13818"></a><h2>Name</h2>transforms -- Transform object definition.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN14362"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</a>
-<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSGET">xmlSecTransformIdsGet</a>      (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSINIT">xmlSecTransformIdsInit</a>          (void);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSSHUTDOWN">xmlSecTransformIdsShutdown</a>      (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTERDEFAULT">xmlSecTransformIdsRegisterDefault</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTER">xmlSecTransformIdsRegister</a>      (<font>xmlSecTransformId</font> id);
-enum        <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a>;
-enum        <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a>;
-enum        <a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a>;
-typedef     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a>;
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPENONE">xmlSecTransformUriTypeNone</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEEMPTY">xmlSecTransformUriTypeEmpty</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPESAMEDOCUMENT">xmlSecTransformUriTypeSameDocument</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPELOCAL">xmlSecTransformUriTypeLocal</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEREMOTE">xmlSecTransformUriTypeRemote</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEANY">xmlSecTransformUriTypeAny</a>
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPECHECK">xmlSecTransformUriTypeCheck</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
-                                             const <font>xmlChar</font> *uri);
-typedef     <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>;
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEUNKNOWN">xmlSecTransformDataTypeUnknown</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEBIN">xmlSecTransformDataTypeBin</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEXML">xmlSecTransformDataTypeXml</a>
-typedef     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a>;
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEUNKNOWN">xmlSecTransformUsageUnknown</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDSIGTRANSFORM">xmlSecTransformUsageDSigTransform</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEC14NMETHOD">xmlSecTransformUsageC14NMethod</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDIGESTMETHOD">xmlSecTransformUsageDigestMethod</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGESIGNATUREMETHOD">xmlSecTransformUsageSignatureMethod</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD">xmlSecTransformUsageEncryptionMethod</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEANY">xmlSecTransformUsageAny</a>
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">*xmlSecTransformCtxPreExecuteCallback</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-#define     <a href="xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</a>
-struct      <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a>;
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE">xmlSecTransformCtxCreate</a>
-                                            (void);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">xmlSecTransformCtxDestroy</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">xmlSecTransformCtxInitialize</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">xmlSecTransformCtxFinalize</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXRESET">xmlSecTransformCtxReset</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCOPYUSERPREF">xmlSecTransformCtxCopyUserPref</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXSETURI">xmlSecTransformCtxSetUri</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <font>xmlChar</font> *uri,
-                                             <font>xmlNodePtr</font> hereNode);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXAPPEND">xmlSecTransformCtxAppend</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPEND">xmlSecTransformCtxPrepend</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDAPPEND">xmlSecTransformCtxCreateAndAppend</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlSecTransformId</font> id);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDPREPEND">xmlSecTransformCtxCreateAndPrepend</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlSecTransformId</font> id);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">xmlSecTransformCtxNodeRead</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODESLISTREAD">xmlSecTransformCtxNodesListRead</a> (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPARE">xmlSecTransformCtxPrepare</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXBINARYEXECUTE">xmlSecTransformCtxBinaryExecute</a> (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXURIEXECUTE">xmlSecTransformCtxUriExecute</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <font>xmlChar</font> *uri);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXXMLEXECUTE">xmlSecTransformCtxXmlExecute</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">xmlSecTransformCtxExecute</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlDocPtr</font> doc);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGDUMP">xmlSecTransformCtxDebugDump</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGXMLDUMP">xmlSecTransformCtxDebugXmlDump</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>FILE</font> *output);
-struct      <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransform</a>;
-<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE">xmlSecTransformCreate</a>    (<font>xmlSecTransformId</font> id);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY">xmlSecTransformDestroy</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>xmlSecTransformPtr</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREAD">xmlSecTransformNodeRead</a>  (<font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUMP">xmlSecTransformPump</a>             (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEY">xmlSecTransformSetKey</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQ">xmlSecTransformSetKeyReq</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY">xmlSecTransformVerify</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYNODECONTENT">xmlSecTransformVerifyNodeContent</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPE">xmlSecTransformGetDataType</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBIN">xmlSecTransformPushBin</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBIN">xmlSecTransformPopBin</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXML">xmlSecTransformPushXml</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXML">xmlSecTransformPopXml</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTE">xmlSecTransformExecute</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>int</font> last,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGDUMP">xmlSecTransformDebugDump</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGXMLDUMP">xmlSecTransformDebugXmlDump</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETNAME">xmlSecTransformGetName</a>          (transform)
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMISVALID">xmlSecTransformIsValid</a>          (transform)
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">xmlSecTransformCheckType</a>        (transform, t)
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">xmlSecTransformCheckId</a>          (transform, i)
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">xmlSecTransformCheckSize</a>        (transform, size)
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT">xmlSecTransformConnect</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVE">xmlSecTransformRemove</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTGETDATATYPE">xmlSecTransformDefaultGetDataType</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHBIN">xmlSecTransformDefaultPushBin</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPBIN">xmlSecTransformDefaultPopBin</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHXML">xmlSecTransformDefaultPushXml</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPXML">xmlSecTransformDefaultPopXml</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>xmlOutputBufferPtr</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEOUTPUTBUFFER">xmlSecTransformCreateOutputBuffer</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>xmlParserInputBufferPtr</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEINPUTBUFFER">xmlSecTransformCreateInputBuffer</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">*xmlSecTransformInitializeMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<font>void</font>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">*xmlSecTransformFinalizeMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
-<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> (<a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">*xmlSecTransformGetDataTypeMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">*xmlSecTransformNodeReadMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">*xmlSecTransformNodeWriteMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">*xmlSecTransformSetKeyRequirementsMethod</a>)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">*xmlSecTransformSetKeyMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">*xmlSecTransformVerifyMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">*xmlSecTransformPushBinMethod</a>) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">*xmlSecTransformPopBinMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">*xmlSecTransformPushXmlMethod</a>) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">*xmlSecTransformPopXmlMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-<font>int</font>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">*xmlSecTransformExecuteMethod</a>) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>int</font> last,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
-struct      <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASS">xmlSecTransformKlass</a>;
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASSGETNAME">xmlSecTransformKlassGetName</a>     (klass)
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTID">xmlSecTransformIdListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTGETKLASS">xmlSecTransformIdListGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFIND">xmlSecTransformIdListFind</a>       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecTransformId</font> transformId);
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYHREF">xmlSecTransformIdListFindByHref</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *href,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYNAME">xmlSecTransformIdListFindByName</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGDUMP">xmlSecTransformIdListDebugDump</a>  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGXMLDUMP">xmlSecTransformIdListDebugXmlDump</a>
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDUNKNOWN">xmlSecTransformIdUnknown</a>
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64ID">xmlSecTransformBase64Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">xmlSecTransformBase64GetKlass</a>
-                                            (void);
-<font>void</font>        <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">xmlSecTransformBase64SetLineSize</a>
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NID">xmlSecTransformInclC14NId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NGETKLASS">xmlSecTransformInclC14NGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSID">xmlSecTransformInclC14NWithCommentsId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformInclC14NWithCommentsGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11ID">xmlSecTransformInclC14N11Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11GETKLASS">xmlSecTransformInclC14N11GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID">xmlSecTransformInclC14N11WithCommentsId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS">xmlSecTransformInclC14N11WithCommentsGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NID">xmlSecTransformExclC14NId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NGETKLASS">xmlSecTransformExclC14NGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID">xmlSecTransformExclC14NWithCommentsId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformExclC14NWithCommentsGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDID">xmlSecTransformEnvelopedId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDGETKLASS">xmlSecTransformEnvelopedGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHID">xmlSecTransformXPathId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHGETKLASS">xmlSecTransformXPathGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2ID">xmlSecTransformXPath2Id</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2GETKLASS">xmlSecTransformXPath2GetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERID">xmlSecTransformXPointerId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERGETKLASS">xmlSecTransformXPointerGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">xmlSecTransformXPointerSetExpr</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *expr,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
-                                             <font>xmlNodePtr</font> hereNode);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTID">xmlSecTransformXsltId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">xmlSecTransformXsltGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NID">xmlSecTransformRemoveXmlTagsC14NId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS">xmlSecTransformRemoveXmlTagsC14NGetKlass</a>
-                                            (void);
-#define     <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKID">xmlSecTransformVisa3DHackId</a>
-<font>xmlSecTransformId</font> <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKGETKLASS">xmlSecTransformVisa3DHackGetKlass</a>
-                                            (void);
-<font>int</font>         <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKSETID">xmlSecTransformVisa3DHackSetID</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *id);</pre>
+<a name="XMLSEC-TRANSFORMS.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS">XMLSEC_TRANSFORM_BINARY_CHUNK</a>
+<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSGET">xmlSecTransformIdsGet</a>               (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSINIT">xmlSecTransformIdsInit</a>              (void);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSSHUTDOWN">xmlSecTransformIdsShutdown</a>          (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTERDEFAULT">xmlSecTransformIdsRegisterDefault</a>   (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDSREGISTER">xmlSecTransformIdsRegister</a>          (<font>xmlSecTransformId</font> id);
+enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a>;
+enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a>;
+enum                <a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a>;
+typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a>;
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPENONE">xmlSecTransformUriTypeNone</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEEMPTY">xmlSecTransformUriTypeEmpty</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPESAMEDOCUMENT">xmlSecTransformUriTypeSameDocument</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPELOCAL">xmlSecTransformUriTypeLocal</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEREMOTE">xmlSecTransformUriTypeRemote</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPEANY">xmlSecTransformUriTypeAny</a>
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPECHECK">xmlSecTransformUriTypeCheck</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
+                                                         const <font>xmlChar</font> *uri);
+typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>;
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEUNKNOWN">xmlSecTransformDataTypeUnknown</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEBIN">xmlSecTransformDataTypeBin</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPEXML">xmlSecTransformDataTypeXml</a>
+typedef             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a>;
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEUNKNOWN">xmlSecTransformUsageUnknown</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDSIGTRANSFORM">xmlSecTransformUsageDSigTransform</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEC14NMETHOD">xmlSecTransformUsageC14NMethod</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEDIGESTMETHOD">xmlSecTransformUsageDigestMethod</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGESIGNATUREMETHOD">xmlSecTransformUsageSignatureMethod</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD">xmlSecTransformUsageEncryptionMethod</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGEANY">xmlSecTransformUsageAny</a>
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">*xmlSecTransformCtxPreExecuteCallback</a>)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+#define             <a href="xmlsec-transforms.html#XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</a>
+struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a>;
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE">xmlSecTransformCtxCreate</a>         (void);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY">xmlSecTransformCtxDestroy</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE">xmlSecTransformCtxInitialize</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE">xmlSecTransformCtxFinalize</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXRESET">xmlSecTransformCtxReset</a>             (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCOPYUSERPREF">xmlSecTransformCtxCopyUserPref</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXSETURI">xmlSecTransformCtxSetUri</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <font>xmlChar</font> *uri,
+                                                         <font>xmlNodePtr</font> hereNode);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXAPPEND">xmlSecTransformCtxAppend</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPEND">xmlSecTransformCtxPrepend</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDAPPEND">xmlSecTransformCtxCreateAndAppend</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlSecTransformId</font> id);
+<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATEANDPREPEND">xmlSecTransformCtxCreateAndPrepend</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlSecTransformId</font> id);
+<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODEREAD">xmlSecTransformCtxNodeRead</a>          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXNODESLISTREAD">xmlSecTransformCtxNodesListRead</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREPARE">xmlSecTransformCtxPrepare</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXBINARYEXECUTE">xmlSecTransformCtxBinaryExecute</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXURIEXECUTE">xmlSecTransformCtxUriExecute</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <font>xmlChar</font> *uri);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXXMLEXECUTE">xmlSecTransformCtxXmlExecute</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXEXECUTE">xmlSecTransformCtxExecute</a>           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlDocPtr</font> doc);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGDUMP">xmlSecTransformCtxDebugDump</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDEBUGXMLDUMP">xmlSecTransformCtxDebugXmlDump</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>FILE</font> *output);
+struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransform</a>;
+<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE">xmlSecTransformCreate</a>               (<font>xmlSecTransformId</font> id);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY">xmlSecTransformDestroy</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<font>xmlSecTransformPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREAD">xmlSecTransformNodeRead</a>             (<font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUMP">xmlSecTransformPump</a>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEY">xmlSecTransformSetKey</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQ">xmlSecTransformSetKeyReq</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY">xmlSecTransformVerify</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYNODECONTENT">xmlSecTransformVerifyNodeContent</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPE">xmlSecTransformGetDataType</a>     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBIN">xmlSecTransformPushBin</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBIN">xmlSecTransformPopBin</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXML">xmlSecTransformPushXml</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXML">xmlSecTransformPopXml</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTE">xmlSecTransformExecute</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>int</font> last,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGDUMP">xmlSecTransformDebugDump</a>            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEBUGXMLDUMP">xmlSecTransformDebugXmlDump</a>         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMGETNAME">xmlSecTransformGetName</a>              (transform)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMISVALID">xmlSecTransformIsValid</a>              (transform)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKTYPE">xmlSecTransformCheckType</a>            (transform, t)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKID">xmlSecTransformCheckId</a>              (transform, i)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCHECKSIZE">xmlSecTransformCheckSize</a>            (transform, size)
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT">xmlSecTransformConnect</a>              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVE">xmlSecTransformRemove</a>               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTGETDATATYPE">xmlSecTransformDefaultGetDataType</a>
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHBIN">xmlSecTransformDefaultPushBin</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPBIN">xmlSecTransformDefaultPopBin</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPUSHXML">xmlSecTransformDefaultPushXml</a>       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMDEFAULTPOPXML">xmlSecTransformDefaultPopXml</a>        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>xmlOutputBufferPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEOUTPUTBUFFER">xmlSecTransformCreateOutputBuffer</a>   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>xmlParserInputBufferPtr</font>  <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATEINPUTBUFFER">xmlSecTransformCreateInputBuffer</a>
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">*xmlSecTransformInitializeMethod</a>)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<font>void</font>                (<a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">*xmlSecTransformFinalizeMethod</a>)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);
+<a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">*xmlSecTransformGetDataTypeMethod</a>)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">*xmlSecTransformNodeReadMethod</a>)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">*xmlSecTransformNodeWriteMethod</a>)   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">*xmlSecTransformSetKeyRequirementsMethod</a>)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">*xmlSecTransformSetKeyMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">*xmlSecTransformVerifyMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">*xmlSecTransformPushBinMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">*xmlSecTransformPopBinMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">*xmlSecTransformPushXmlMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">*xmlSecTransformPopXmlMethod</a>)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+<font>int</font>                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">*xmlSecTransformExecuteMethod</a>)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>int</font> last,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);
+struct              <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASS">xmlSecTransformKlass</a>;
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMKLASSGETNAME">xmlSecTransformKlassGetName</a>         (klass)
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTID">xmlSecTransformIdListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTGETKLASS">xmlSecTransformIdListGetKlass</a>       (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFIND">xmlSecTransformIdListFind</a>           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYHREF">xmlSecTransformIdListFindByHref</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *href,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTFINDBYNAME">xmlSecTransformIdListFindByName</a>     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGDUMP">xmlSecTransformIdListDebugDump</a>      (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDLISTDEBUGXMLDUMP">xmlSecTransformIdListDebugXmlDump</a>   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMIDUNKNOWN">xmlSecTransformIdUnknown</a>
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64ID">xmlSecTransformBase64Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64GETKLASS">xmlSecTransformBase64GetKlass</a>       (void);
+<font>void</font>                <a href="xmlsec-transforms.html#XMLSECTRANSFORMBASE64SETLINESIZE">xmlSecTransformBase64SetLineSize</a>    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NID">xmlSecTransformInclC14NId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NGETKLASS">xmlSecTransformInclC14NGetKlass</a>     (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSID">xmlSecTransformInclC14NWithCommentsId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformInclC14NWithCommentsGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11ID">xmlSecTransformInclC14N11Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11GETKLASS">xmlSecTransformInclC14N11GetKlass</a>   (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID">xmlSecTransformInclC14N11WithCommentsId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS">xmlSecTransformInclC14N11WithCommentsGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NID">xmlSecTransformExclC14NId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NGETKLASS">xmlSecTransformExclC14NGetKlass</a>     (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID">xmlSecTransformExclC14NWithCommentsId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS">xmlSecTransformExclC14NWithCommentsGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDID">xmlSecTransformEnvelopedId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMENVELOPEDGETKLASS">xmlSecTransformEnvelopedGetKlass</a>    (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHID">xmlSecTransformXPathId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATHGETKLASS">xmlSecTransformXPathGetKlass</a>        (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2ID">xmlSecTransformXPath2Id</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPATH2GETKLASS">xmlSecTransformXPath2GetKlass</a>       (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERID">xmlSecTransformXPointerId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERGETKLASS">xmlSecTransformXPointerGetKlass</a>     (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMXPOINTERSETEXPR">xmlSecTransformXPointerSetExpr</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *expr,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
+                                                         <font>xmlNodePtr</font> hereNode);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTID">xmlSecTransformXsltId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMXSLTGETKLASS">xmlSecTransformXsltGetKlass</a>         (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NID">xmlSecTransformRemoveXmlTagsC14NId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS">xmlSecTransformRemoveXmlTagsC14NGetKlass</a>
+                                                        (void);
+#define             <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKID">xmlSecTransformVisa3DHackId</a>
+<font>xmlSecTransformId</font>   <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKGETKLASS">xmlSecTransformVisa3DHackGetKlass</a>   (void);
+<font>int</font>                 <a href="xmlsec-transforms.html#XMLSECTRANSFORMVISA3DHACKSETID">xmlSecTransformVisa3DHackSetID</a>      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *id);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN14762"></a><h2>Description</h2>
+<a name="XMLSEC-TRANSFORMS.DESCRIPTION"></a><h2>Description</h2>
 <p>Transform object definition.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN14765"></a><h2>Details</h2>
+<a name="XMLSEC-TRANSFORMS.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN14767"></a><h3>
-<a name="XMLSEC-TRANSFORM-BINARY-CHUNK-CAPS"></a>XMLSEC_TRANSFORM_BINARY_CHUNK</h3>
+<a name="XMLSEC-TRANSFORM-BINARY-CHUNK--CAPS"></a><h3>XMLSEC_TRANSFORM_BINARY_CHUNK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_TRANSFORM_BINARY_CHUNK			64</pre>
 <p>The binary data chunks size. XMLSec processes binary data one chunk 
 at a time. Changing this impacts xmlsec memory usage and performance.</p>
@@ -387,78 +356,71 @@ at a time. Changing this impacts xmlsec memory usage and performance.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14775"></a><h3>
-<a name="XMLSECTRANSFORMIDSGET"></a>xmlSecTransformIdsGet ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> xmlSecTransformIdsGet      (void);</pre>
+<a name="XMLSECTRANSFORMIDSGET"></a><h3>xmlSecTransformIdsGet ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a>    xmlSecTransformIdsGet               (void);</pre>
 <p>Gets global registered transform klasses list.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14785"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to list of all registered transform klasses.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14242"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to list of all registered transform klasses.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14790"></a><h3>
-<a name="XMLSECTRANSFORMIDSINIT"></a>xmlSecTransformIdsInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformIdsInit          (void);</pre>
+<a name="XMLSECTRANSFORMIDSINIT"></a><h3>xmlSecTransformIdsInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsInit              (void);</pre>
 <p>Initializes the transform klasses. This function is called from the 
 <a href="xmlsec-xmlsec.html#XMLSECINIT"><span class="TYPE">xmlSecInit</span></a> function and the application should not call it directly.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14802"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14258"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14807"></a><h3>
-<a name="XMLSECTRANSFORMIDSSHUTDOWN"></a>xmlSecTransformIdsShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformIdsShutdown      (void);</pre>
+<a name="XMLSECTRANSFORMIDSSHUTDOWN"></a><h3>xmlSecTransformIdsShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdsShutdown          (void);</pre>
 <p>Shuts down the keys data klasses. This function is called from the 
 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN"><span class="TYPE">xmlSecShutdown</span></a> function and the application should not call it directly.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14818"></a><h3>
-<a name="XMLSECTRANSFORMIDSREGISTERDEFAULT"></a>xmlSecTransformIdsRegisterDefault ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformIdsRegisterDefault
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMIDSREGISTERDEFAULT"></a><h3>xmlSecTransformIdsRegisterDefault ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsRegisterDefault   (void);</pre>
 <p>Registers default (implemented by XML Security Library)
 transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN14828"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14282"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14833"></a><h3>
-<a name="XMLSECTRANSFORMIDSREGISTER"></a>xmlSecTransformIdsRegister ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformIdsRegister      (<font>xmlSecTransformId</font> id);</pre>
-<p>Registers <var class="PARAMETER">id</var> in the global list of transform klasses.</p>
+<a name="XMLSECTRANSFORMIDSREGISTER"></a><h3>xmlSecTransformIdsRegister ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdsRegister          (<font>xmlSecTransformId</font> id);</pre>
+<p>Registers <code class="PARAMETER">id</code> in the global list of transform klasses.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14845"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14298"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14850"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14303"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14855"></a><h3>
-<a name="XMLSECTRANSFORMSTATUS"></a>enum xmlSecTransformStatus</h3>
+<a name="XMLSECTRANSFORMSTATUS"></a><h3>enum xmlSecTransformStatus</h3>
 <pre class="PROGRAMLISTING">typedef enum  {
     xmlSecTransformStatusNone = 0,
     xmlSecTransformStatusWorking,
@@ -471,31 +433,30 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14864"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformStatusNone</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSNONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusNone</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the status unknown.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14869"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformStatusWorking</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSWORKING"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusWorking</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the transform is executed.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14874"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformStatusFinished</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSFINISHED"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusFinished</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the transform finished</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14879"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformStatusOk</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSOK"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusOk</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform succeeded.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14884"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformStatusFail</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMSTATUSFAIL"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformStatusFail</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform failed (an error occur).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14889"></a><h3>
-<a name="XMLSECTRANSFORMMODE"></a>enum xmlSecTransformMode</h3>
+<a name="XMLSECTRANSFORMMODE"></a><h3>enum xmlSecTransformMode</h3>
 <pre class="PROGRAMLISTING">typedef enum  {
     xmlSecTransformModeNone = 0,
     xmlSecTransformModePush,
@@ -506,23 +467,22 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14898"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformModeNone</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODENONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModeNone</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the mode is unknown.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14903"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformModePush</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODEPUSH"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModePush</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		pushing data thru transform. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14908"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformModePop</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMMODEPOP"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformModePop</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 		popping data from transform.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14913"></a><h3>
-<a name="XMLSECTRANSFORMOPERATION"></a>enum xmlSecTransformOperation</h3>
+<a name="XMLSECTRANSFORMOPERATION"></a><h3>enum xmlSecTransformOperation</h3>
 <pre class="PROGRAMLISTING">typedef enum  {
     xmlSecTransformOperationNone = 0,
     xmlSecTransformOperationEncode,
@@ -537,218 +497,197 @@ transform klasses: XPath transform, Base64 transform, ...</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14922"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationNone</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONNONE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationNone</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the operation is unknown.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14927"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationEncode</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONENCODE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationEncode</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the encode operation (for base64 transform).	</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14932"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationDecode</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONDECODE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationDecode</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the decode operation (for base64 transform).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14937"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationSign</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONSIGN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationSign</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the sign or digest operation.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14942"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationVerify</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONVERIFY"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationVerify</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the verification of signature or digest operation.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14947"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationEncrypt</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONENCRYPT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationEncrypt</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the encryption operation.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN14952"><span style="white-space: nowrap"><var class="LITERAL">xmlSecTransformOperationDecrypt</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECTRANSFORMOPERATIONDECRYPT"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecTransformOperationDecrypt</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the decryption operation.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14957"></a><h3>
-<a name="XMLSECTRANSFORMURITYPE"></a>xmlSecTransformUriType</h3>
+<a name="XMLSECTRANSFORMURITYPE"></a><h3>xmlSecTransformUriType</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int				xmlSecTransformUriType;</pre>
 <p>URI transform type bit mask.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14965"></a><h3>
-<a name="XMLSECTRANSFORMURITYPENONE"></a>xmlSecTransformUriTypeNone</h3>
+<a name="XMLSECTRANSFORMURITYPENONE"></a><h3>xmlSecTransformUriTypeNone</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeNone		0x0000</pre>
 <p>The URI type is unknown or not set.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14973"></a><h3>
-<a name="XMLSECTRANSFORMURITYPEEMPTY"></a>xmlSecTransformUriTypeEmpty</h3>
+<a name="XMLSECTRANSFORMURITYPEEMPTY"></a><h3>xmlSecTransformUriTypeEmpty</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeEmpty		0x0001</pre>
 <p>The empty URI ("") type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14981"></a><h3>
-<a name="XMLSECTRANSFORMURITYPESAMEDOCUMENT"></a>xmlSecTransformUriTypeSameDocument</h3>
+<a name="XMLSECTRANSFORMURITYPESAMEDOCUMENT"></a><h3>xmlSecTransformUriTypeSameDocument</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeSameDocument	0x0002		</pre>
 <p>The smae document ("#...") but not empty ("") URI type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14989"></a><h3>
-<a name="XMLSECTRANSFORMURITYPELOCAL"></a>xmlSecTransformUriTypeLocal</h3>
+<a name="XMLSECTRANSFORMURITYPELOCAL"></a><h3>xmlSecTransformUriTypeLocal</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeLocal		0x0004</pre>
 <p>The local URI ("file:///....") type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN14997"></a><h3>
-<a name="XMLSECTRANSFORMURITYPEREMOTE"></a>xmlSecTransformUriTypeRemote</h3>
+<a name="XMLSECTRANSFORMURITYPEREMOTE"></a><h3>xmlSecTransformUriTypeRemote</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeRemote		0x0008</pre>
 <p>The remote URI type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15005"></a><h3>
-<a name="XMLSECTRANSFORMURITYPEANY"></a>xmlSecTransformUriTypeAny</h3>
+<a name="XMLSECTRANSFORMURITYPEANY"></a><h3>xmlSecTransformUriTypeAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUriTypeAny		0xFFFF</pre>
 <p>Any URI type.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15013"></a><h3>
-<a name="XMLSECTRANSFORMURITYPECHECK"></a>xmlSecTransformUriTypeCheck ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformUriTypeCheck     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
-                                             const <font>xmlChar</font> *uri);</pre>
-<p>Checks if <var class="PARAMETER">uri</var> matches expected type <var class="PARAMETER">type</var>.</p>
+<a name="XMLSECTRANSFORMURITYPECHECK"></a><h3>xmlSecTransformUriTypeCheck ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformUriTypeCheck         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> type,
+                                                         const <font>xmlChar</font> *uri);</pre>
+<p>Checks if <code class="PARAMETER">uri</code> matches expected type <code class="PARAMETER">type</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15027"><span style="white-space: nowrap"><var class="PARAMETER">type</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14469"><span style="white-space: nowrap"><code class="PARAMETER">type</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the expected URI type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15032"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14474"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the uri for checking.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15037"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if <var class="PARAMETER">uri</var> matches <var class="PARAMETER">type</var>, 0 if not or a negative value
+<td align="LEFT" valign="TOP"><a name="AEN14479"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">uri</code> matches <code class="PARAMETER">type</code>, 0 if not or a negative value
 if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15044"></a><h3>
-<a name="XMLSECTRANSFORMDATATYPE"></a>xmlSecTransformDataType</h3>
+<a name="XMLSECTRANSFORMDATATYPE"></a><h3>xmlSecTransformDataType</h3>
 <pre class="PROGRAMLISTING">typedef xmlSecByte				xmlSecTransformDataType;</pre>
 <p>Transform data type bit mask.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15052"></a><h3>
-<a name="XMLSECTRANSFORMDATATYPEUNKNOWN"></a>xmlSecTransformDataTypeUnknown</h3>
+<a name="XMLSECTRANSFORMDATATYPEUNKNOWN"></a><h3>xmlSecTransformDataTypeUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeUnknown		0x0000</pre>
 <p>The transform data type is unknown or nor data expected.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15060"></a><h3>
-<a name="XMLSECTRANSFORMDATATYPEBIN"></a>xmlSecTransformDataTypeBin</h3>
+<a name="XMLSECTRANSFORMDATATYPEBIN"></a><h3>xmlSecTransformDataTypeBin</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeBin		0x0001</pre>
 <p>The binary transform data.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15068"></a><h3>
-<a name="XMLSECTRANSFORMDATATYPEXML"></a>xmlSecTransformDataTypeXml</h3>
+<a name="XMLSECTRANSFORMDATATYPEXML"></a><h3>xmlSecTransformDataTypeXml</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformDataTypeXml		0x0002</pre>
 <p>The xml transform data.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15076"></a><h3>
-<a name="XMLSECTRANSFORMUSAGE"></a>xmlSecTransformUsage</h3>
+<a name="XMLSECTRANSFORMUSAGE"></a><h3>xmlSecTransformUsage</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int				xmlSecTransformUsage;</pre>
 <p>The transform usage bit mask.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15084"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEUNKNOWN"></a>xmlSecTransformUsageUnknown</h3>
+<a name="XMLSECTRANSFORMUSAGEUNKNOWN"></a><h3>xmlSecTransformUsageUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageUnknown		0x0000</pre>
 <p>Transforms usage is unknown or undefined.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15092"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEDSIGTRANSFORM"></a>xmlSecTransformUsageDSigTransform</h3>
+<a name="XMLSECTRANSFORMUSAGEDSIGTRANSFORM"></a><h3>xmlSecTransformUsageDSigTransform</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageDSigTransform	0x0001</pre>
 <p>Transform could be used in &lt;dsig:Transform&gt;.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15100"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEC14NMETHOD"></a>xmlSecTransformUsageC14NMethod</h3>
+<a name="XMLSECTRANSFORMUSAGEC14NMETHOD"></a><h3>xmlSecTransformUsageC14NMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageC14NMethod		0x0002</pre>
 <p>Transform could be used in &lt;dsig:CanonicalizationMethod&gt;.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15108"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEDIGESTMETHOD"></a>xmlSecTransformUsageDigestMethod</h3>
+<a name="XMLSECTRANSFORMUSAGEDIGESTMETHOD"></a><h3>xmlSecTransformUsageDigestMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageDigestMethod	0x0004</pre>
 <p>Transform could be used in &lt;dsig:DigestMethod&gt;.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15116"></a><h3>
-<a name="XMLSECTRANSFORMUSAGESIGNATUREMETHOD"></a>xmlSecTransformUsageSignatureMethod</h3>
+<a name="XMLSECTRANSFORMUSAGESIGNATUREMETHOD"></a><h3>xmlSecTransformUsageSignatureMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageSignatureMethod	0x0008</pre>
 <p>Transform could be used in &lt;dsig:SignatureMethod&gt;.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15124"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD"></a>xmlSecTransformUsageEncryptionMethod</h3>
+<a name="XMLSECTRANSFORMUSAGEENCRYPTIONMETHOD"></a><h3>xmlSecTransformUsageEncryptionMethod</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageEncryptionMethod	0x0010</pre>
 <p>Transform could be used in &lt;enc:EncryptionMethod&gt;.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15132"></a><h3>
-<a name="XMLSECTRANSFORMUSAGEANY"></a>xmlSecTransformUsageAny</h3>
+<a name="XMLSECTRANSFORMUSAGEANY"></a><h3>xmlSecTransformUsageAny</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformUsageAny			0xFFFF</pre>
 <p>Transform could be used for operation.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15140"></a><h3>
-<a name="XMLSECTRANSFORMCTXPREEXECUTECALLBACK"></a>xmlSecTransformCtxPreExecuteCallback ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformCtxPreExecuteCallback)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMCTXPREEXECUTECALLBACK"></a><h3>xmlSecTransformCtxPreExecuteCallback ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformCtxPreExecuteCallback)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The callback called after creating transforms chain but before
 starting data processing. Application can use this callback to
 do additional transforms chain verification or modification and
@@ -757,20 +696,19 @@ aborting transforms execution (if necessary).</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15151"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14580"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform's context. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15156"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success and a negative value otherwise (in this case,
+<td align="LEFT" valign="TOP"><a name="AEN14585"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success and a negative value otherwise (in this case,
 transforms chain will not be executed and xmlsec processing stops).</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15161"></a><h3>
-<a name="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK-CAPS"></a>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</h3>
+<a name="XMLSEC-TRANSFORMCTX-FLAGS-USE-VISA3D-HACK--CAPS"></a><h3>XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_TRANSFORMCTX_FLAGS_USE_VISA3D_HACK		0x00000001</pre>
 <p>If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
@@ -779,10 +717,8 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15169"></a><h3>
-<a name="XMLSECTRANSFORMCTX"></a>struct xmlSecTransformCtx</h3>
+<a name="XMLSECTRANSFORMCTX"></a><h3>struct xmlSecTransformCtx</h3>
 <pre class="PROGRAMLISTING">struct xmlSecTransformCtx {
-
     /* user settings */
     void*					userData;
     unsigned int				flags;
@@ -808,31 +744,31 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15178"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14605"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to user data (xmlsec and xmlsec-crypto never 
 		touch this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15184"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14611"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the bit mask flags to control transforms execution 
 		(reserved for the future).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15190"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14617"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the bit mask flags to control transforms execution 
 			(reserved for the future).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15196"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledUris</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14623"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledUris</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the allowed transform data source uri types.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15202"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledTransforms</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14629"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">enabledTransforms</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the list of enabled transforms; if list is empty (default)
 		then all registered transforms are enabled.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15208"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">preExecCallback</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14635"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">preExecCallback</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the callback called after preparing transform chain
 		and right before actual data processing; application
 		can use this callback to change transforms parameters,
@@ -841,74 +777,70 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 		if needed).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15214"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14641"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms result buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15220"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14647"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transforms chain processng status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15226"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14653"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data source URI without xpointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15232"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">xptrExpr</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14659"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">xptrExpr</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the xpointer expression from data source URI (if any).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15238"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">first</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14665"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">first</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the first transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15244"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">last</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14671"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">last</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the last transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15250"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14677"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15256"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14683"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15262"></a><h3>
-<a name="XMLSECTRANSFORMCTXCREATE"></a>xmlSecTransformCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> xmlSecTransformCtxCreate
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMCTXCREATE"></a><h3>xmlSecTransformCtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a>  xmlSecTransformCtxCreate         (void);</pre>
 <p>Creates transforms chain processing context.
 The caller is responsible for destroying returend object by calling 
 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXDESTROY"><span class="TYPE">xmlSecTransformCtxDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15274"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated context object or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN14700"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15279"></a><h3>
-<a name="XMLSECTRANSFORMCTXDESTROY"></a>xmlSecTransformCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformCtxDestroy       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<a name="XMLSECTRANSFORMCTXDESTROY"></a><h3>xmlSecTransformCtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDestroy           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
 <p>Destroy context object created with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXCREATE"><span class="TYPE">xmlSecTransformCtxCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15292"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14717"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15297"></a><h3>
-<a name="XMLSECTRANSFORMCTXINITIALIZE"></a>xmlSecTransformCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxInitialize    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<a name="XMLSECTRANSFORMCTXINITIALIZE"></a><h3>xmlSecTransformCtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxInitialize        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
 <p>Initializes transforms chain processing context.
 The caller is responsible for cleaing up returend object by calling 
 <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXFINALIZE"><span class="TYPE">xmlSecTransformCtxFinalize</span></a> function.</p>
@@ -916,81 +848,77 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15310"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14734"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15315"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14739"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15320"></a><h3>
-<a name="XMLSECTRANSFORMCTXFINALIZE"></a>xmlSecTransformCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformCtxFinalize      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
-<p>Cleans up <var class="PARAMETER">ctx</var> object initialized with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE"><span class="TYPE">xmlSecTransformCtxInitialize</span></a> function.</p>
+<a name="XMLSECTRANSFORMCTXFINALIZE"></a><h3>xmlSecTransformCtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxFinalize          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<p>Cleans up <code class="PARAMETER">ctx</code> object initialized with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXINITIALIZE"><span class="TYPE">xmlSecTransformCtxInitialize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15334"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14757"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15339"></a><h3>
-<a name="XMLSECTRANSFORMCTXRESET"></a>xmlSecTransformCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformCtxReset         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
+<a name="XMLSECTRANSFORMCTXRESET"></a><h3>xmlSecTransformCtxReset ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxReset             (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx);</pre>
 <p>Resets transfroms context for new processing.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15350"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14772"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15355"></a><h3>
-<a name="XMLSECTRANSFORMCTXCOPYUSERPREF"></a>xmlSecTransformCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxCopyUserPref  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);</pre>
-<p>Copies user settings from <var class="PARAMETER">src</var> context to <var class="PARAMETER">dst</var>.</p>
+<a name="XMLSECTRANSFORMCTXCOPYUSERPREF"></a><h3>xmlSecTransformCtxCopyUserPref ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxCopyUserPref      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> dst,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> src);</pre>
+<p>Copies user settings from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15369"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14790"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15374"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14795"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15379"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14800"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15384"></a><h3>
-<a name="XMLSECTRANSFORMCTXSETURI"></a>xmlSecTransformCtxSetUri ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxSetUri        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <font>xmlChar</font> *uri,
-                                             <font>xmlNodePtr</font> hereNode);</pre>
+<a name="XMLSECTRANSFORMCTXSETURI"></a><h3>xmlSecTransformCtxSetUri ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxSetUri            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <font>xmlChar</font> *uri,
+                                                         <font>xmlNodePtr</font> hereNode);</pre>
 <p>Parses uri and adds xpointer transforms if required.</p>
 <p>The following examples demonstrate what the URI attribute identifies and
 how it is dereferenced 
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-ReferenceProcessingModel</span></font>):</p>
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-REFERENCEPROCESSINGMODEL"><span class="TYPE">sec-ReferenceProcessingModel</span></gtkdoclink>):</p>
 <p>- URI="http://example.com/bar.xml";
 identifies the octets that represent the external resource 
 'http://example.com/bar.xml', that is probably an XML document given 
 its file extension. </p>
-<p>- URI="http://example.com/bar.xml<font><span class="TYPE">chapter1</span></font>"
+<p>- URI="http://example.com/bar.xml<gtkdoclink href="CHAPTER1"><span class="TYPE">chapter1</span></gtkdoclink>"
 identifies the element with ID attribute value 'chapter1' of the 
 external XML resource 'http://example.com/bar.xml', provided as an 
 octet stream. Again, for the sake of interoperability, the element 
@@ -1000,7 +928,7 @@ resources is not REQUIRED in this specification). </p>
 <p>- URI=""
 identifies the node-set (minus any comment nodes) of the XML resource 
 containing the signature </p>
-<p>- URI="<font><span class="TYPE">chapter1</span></font>"
+<p>- URI="<gtkdoclink href="CHAPTER1"><span class="TYPE">chapter1</span></gtkdoclink>"
 identifies a node-set containing the element with ID attribute value 
 'chapter1' of the XML resource containing the signature. XML Signature 
 (and its applications) modify this node-set to include the element plus 
@@ -1009,358 +937,340 @@ all descendents including namespaces and attributes -- but not comments.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15408"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14828"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15413"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14833"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15418"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14838"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to "here" node required by some 
 		XML transforms (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15423"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14843"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15428"></a><h3>
-<a name="XMLSECTRANSFORMCTXAPPEND"></a>xmlSecTransformCtxAppend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxAppend        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
-<p>Connects the <var class="PARAMETER">transform</var> to the end of the chain of transforms in the <var class="PARAMETER">ctx</var> 
+<a name="XMLSECTRANSFORMCTXAPPEND"></a><h3>xmlSecTransformCtxAppend ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxAppend            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<p>Connects the <code class="PARAMETER">transform</code> to the end of the chain of transforms in the <code class="PARAMETER">ctx</code> 
 (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15444"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14863"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15449"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14868"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to new transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15454"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14873"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15459"></a><h3>
-<a name="XMLSECTRANSFORMCTXPREPEND"></a>xmlSecTransformCtxPrepend ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxPrepend       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
-<p>Connects the <var class="PARAMETER">transform</var> to the beggining of the chain of transforms in the <var class="PARAMETER">ctx</var> 
+<a name="XMLSECTRANSFORMCTXPREPEND"></a><h3>xmlSecTransformCtxPrepend ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxPrepend           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<p>Connects the <code class="PARAMETER">transform</code> to the beggining of the chain of transforms in the <code class="PARAMETER">ctx</code> 
 (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15475"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14893"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15480"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14898"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to new transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15485"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14903"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15490"></a><h3>
-<a name="XMLSECTRANSFORMCTXCREATEANDAPPEND"></a>xmlSecTransformCtxCreateAndAppend ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> xmlSecTransformCtxCreateAndAppend
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlSecTransformId</font> id);</pre>
+<a name="XMLSECTRANSFORMCTXCREATEANDAPPEND"></a><h3>xmlSecTransformCtxCreateAndAppend ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxCreateAndAppend   (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlSecTransformId</font> id);</pre>
 <p>Creaeates new transform and connects it to the end of the chain of 
-transforms in the <var class="PARAMETER">ctx</var> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
+transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15505"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14922"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15510"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14927"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the new transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15515"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created transform or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14932"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15520"></a><h3>
-<a name="XMLSECTRANSFORMCTXCREATEANDPREPEND"></a>xmlSecTransformCtxCreateAndPrepend ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> xmlSecTransformCtxCreateAndPrepend
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlSecTransformId</font> id);</pre>
+<a name="XMLSECTRANSFORMCTXCREATEANDPREPEND"></a><h3>xmlSecTransformCtxCreateAndPrepend ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxCreateAndPrepend  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlSecTransformId</font> id);</pre>
 <p>Creaeates new transform and connects it to the end of the chain of 
-transforms in the <var class="PARAMETER">ctx</var> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
+transforms in the <code class="PARAMETER">ctx</code> (see <a href="xmlsec-transforms.html#XMLSECTRANSFORMCONNECT"><span class="TYPE">xmlSecTransformConnect</span></a> function for details).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15535"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14951"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15540"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14956"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the new transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15545"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created transform or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14961"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15550"></a><h3>
-<a name="XMLSECTRANSFORMCTXNODEREAD"></a>xmlSecTransformCtxNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> xmlSecTransformCtxNodeRead
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
-<p>Reads the transform from the <var class="PARAMETER">node</var> and appends it to the current chain 
-of transforms in <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECTRANSFORMCTXNODEREAD"></a><h3>xmlSecTransformCtxNodeRead ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformCtxNodeRead          (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<p>Reads the transform from the <code class="PARAMETER">node</code> and appends it to the current chain 
+of transforms in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15565"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14980"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15570"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14985"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform's node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15575"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN14990"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15580"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created transform or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN14995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15585"></a><h3>
-<a name="XMLSECTRANSFORMCTXNODESLISTREAD"></a>xmlSecTransformCtxNodesListRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxNodesListRead (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
-<p>Reads transforms from the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> children of the <var class="PARAMETER">node</var> and 
-appends them to the current transforms chain in <var class="PARAMETER">ctx</var> object.</p>
+<a name="XMLSECTRANSFORMCTXNODESLISTREAD"></a><h3>xmlSecTransformCtxNodesListRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxNodesListRead     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<p>Reads transforms from the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> children of the <code class="PARAMETER">node</code> and 
+appends them to the current transforms chain in <code class="PARAMETER">ctx</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15601"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15015"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15606"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15020"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> nodes parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15612"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15026"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform's usage (signature, encryption, etc.).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15617"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15031"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15622"></a><h3>
-<a name="XMLSECTRANSFORMCTXPREPARE"></a>xmlSecTransformCtxPrepare ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxPrepare       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);</pre>
-<p>Prepares the transform context for processing data of <var class="PARAMETER">inputDataType</var>.</p>
+<a name="XMLSECTRANSFORMCTXPREPARE"></a><h3>xmlSecTransformCtxPrepare ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxPrepare           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> inputDataType);</pre>
+<p>Prepares the transform context for processing data of <code class="PARAMETER">inputDataType</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15635"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15048"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15640"><span style="white-space: nowrap"><var class="PARAMETER">inputDataType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15053"><span style="white-space: nowrap"><code class="PARAMETER">inputDataType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the expected input type.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15645"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15058"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15650"></a><h3>
-<a name="XMLSECTRANSFORMCTXBINARYEXECUTE"></a>xmlSecTransformCtxBinaryExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxBinaryExecute (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
-<p>Processes binary data using transforms chain in the <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECTRANSFORMCTXBINARYEXECUTE"></a><h3>xmlSecTransformCtxBinaryExecute ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxBinaryExecute     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<p>Processes binary data using transforms chain in the <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15664"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15076"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15669"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15081"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15674"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15086"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15679"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15091"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15684"></a><h3>
-<a name="XMLSECTRANSFORMCTXURIEXECUTE"></a>xmlSecTransformCtxUriExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxUriExecute    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             const <font>xmlChar</font> *uri);</pre>
-<p>Process binary data from the URI using transforms chain in <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECTRANSFORMCTXURIEXECUTE"></a><h3>xmlSecTransformCtxUriExecute ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxUriExecute        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         const <font>xmlChar</font> *uri);</pre>
+<p>Process binary data from the URI using transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15697"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15108"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15702"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15113"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15707"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15118"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15712"></a><h3>
-<a name="XMLSECTRANSFORMCTXXMLEXECUTE"></a>xmlSecTransformCtxXmlExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxXmlExecute    (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);</pre>
-<p>Process <var class="PARAMETER">nodes</var> using transforms in the transforms chain in <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECTRANSFORMCTXXMLEXECUTE"></a><h3>xmlSecTransformCtxXmlExecute ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxXmlExecute        (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes);</pre>
+<p>Process <code class="PARAMETER">nodes</code> using transforms in the transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15726"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15136"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15731"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15141"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input node set.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15736"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15146"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15741"></a><h3>
-<a name="XMLSECTRANSFORMCTXEXECUTE"></a>xmlSecTransformCtxExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformCtxExecute       (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>xmlDocPtr</font> doc);</pre>
-<p>Executes transforms chain in <var class="PARAMETER">ctx</var>.</p>
+<a name="XMLSECTRANSFORMCTXEXECUTE"></a><h3>xmlSecTransformCtxExecute ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformCtxExecute           (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>xmlDocPtr</font> doc);</pre>
+<p>Executes transforms chain in <code class="PARAMETER">ctx</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15754"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15163"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15759"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15168"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to input document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15764"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15173"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15769"></a><h3>
-<a name="XMLSECTRANSFORMCTXDEBUGDUMP"></a>xmlSecTransformCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformCtxDebugDump     (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints transforms context debug information to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECTRANSFORMCTXDEBUGDUMP"></a><h3>xmlSecTransformCtxDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDebugDump         (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints transforms context debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15782"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15190"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15787"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15195"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15792"></a><h3>
-<a name="XMLSECTRANSFORMCTXDEBUGXMLDUMP"></a>xmlSecTransformCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformCtxDebugXmlDump  (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints transforms context debug information to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECTRANSFORMCTXDEBUGXMLDUMP"></a><h3>xmlSecTransformCtxDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformCtxDebugXmlDump      (<a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> ctx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints transforms context debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15805"><span style="white-space: nowrap"><var class="PARAMETER">ctx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15212"><span style="white-space: nowrap"><code class="PARAMETER">ctx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transforms chain processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15810"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15217"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15815"></a><h3>
-<a name="XMLSECTRANSFORM"></a>struct xmlSecTransform</h3>
+<a name="XMLSECTRANSFORM"></a><h3>struct xmlSecTransform</h3>
 <pre class="PROGRAMLISTING">struct xmlSecTransform {
-
     xmlSecTransformId 			id; 
     xmlSecTransformOperation		operation;
     xmlSecTransformStatus		status;
@@ -1387,96 +1297,93 @@ appends them to the current transforms chain in <var class="PARAMETER">ctx</var>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15824"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">id</code></span></a></td>
-<td align="LEFT" valign="TOP"><p> 		the transform id (pointer to <font><span class="TYPE">xmlSecTransformId</span></font>).</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15230"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">id</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p> 		the transform id (pointer to <gtkdoclink href="XMLSECTRANSFORMID"><span class="TYPE">xmlSecTransformId</span></gtkdoclink>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15832"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15238"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform's opertaion.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15838"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15244"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUS">xmlSecTransformStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15844"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">hereNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15250"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">hereNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform's <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform%20"; target="_top">&lt;dsig:Transform /&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15851"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">next</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15257"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">next</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to next transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15857"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">prev</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15263"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">prev</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to previous transform in the chain.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15863"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">inBuf</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15269"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">inBuf</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15869"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">outBuf</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15275"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBuffer</a> <code class="STRUCTFIELD">outBuf</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the output binary data buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15875"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">inNodes</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15281"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">inNodes</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input XML nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15881"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">outNodes</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15287"><span style="white-space: nowrap"><a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> <code class="STRUCTFIELD">outNodes</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the output XML nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15887"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15293"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15893"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15299"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15899"></a><h3>
-<a name="XMLSECTRANSFORMCREATE"></a>xmlSecTransformCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> xmlSecTransformCreate    (<font>xmlSecTransformId</font> id);</pre>
-<p>Creates new transform of the <var class="PARAMETER">id</var> klass. The caller is responsible for
+<a name="XMLSECTRANSFORMCREATE"></a><h3>xmlSecTransformCreate ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a>  xmlSecTransformCreate               (<font>xmlSecTransformId</font> id);</pre>
+<p>Creates new transform of the <code class="PARAMETER">id</code> klass. The caller is responsible for
 destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFORMDESTROY"><span class="TYPE">xmlSecTransformDestroy</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15913"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15318"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform id to create.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15918"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created transform or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15323"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15923"></a><h3>
-<a name="XMLSECTRANSFORMDESTROY"></a>xmlSecTransformDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformDestroy          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<a name="XMLSECTRANSFORMDESTROY"></a><h3>xmlSecTransformDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDestroy              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
 <p>Destroys transform created with <a href="xmlsec-transforms.html#XMLSECTRANSFORMCREATE"><span class="TYPE">xmlSecTransformCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN15936"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15340"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15941"></a><h3>
-<a name="XMLSECTRANSFORMNODEREAD"></a>xmlSecTransformNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font> xmlSecTransformNodeRead  (<font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Reads transform from the <var class="PARAMETER">node</var> as follows:</p>
+<a name="XMLSECTRANSFORMNODEREAD"></a><h3>xmlSecTransformNodeRead ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformPtr</font>  xmlSecTransformNodeRead             (<font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Reads transform from the <code class="PARAMETER">node</code> as follows:</p>
 <p>   1) reads "Algorithm" attribute;</p>
 <p>   2) checks the lists of known and allowed transforms;</p>
 <p>   3) calls transform's create method;</p>
@@ -1485,510 +1392,489 @@ destroying returned tansform using <a href="xmlsec-transforms.html#XMLSECTRANSFO
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15959"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15362"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the transform's node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15964"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15367"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transform usage (signature, encryption, ...).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15969"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15372"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15974"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created transform or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15377"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created transform or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN15979"></a><h3>
-<a name="XMLSECTRANSFORMPUMP"></a>xmlSecTransformPump ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformPump             (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Pops data from <var class="PARAMETER">left</var> transform and pushes to <var class="PARAMETER">right</var> transform until
+<a name="XMLSECTRANSFORMPUMP"></a><h3>xmlSecTransformPump ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPump                 (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Pops data from <code class="PARAMETER">left</code> transform and pushes to <code class="PARAMETER">right</code> transform until
 no more data is available.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15994"><span style="white-space: nowrap"><var class="PARAMETER">left</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15396"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the source pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN15999"><span style="white-space: nowrap"><var class="PARAMETER">right</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15401"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the destination pumping transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16004"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15406"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16009"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15411"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16014"></a><h3>
-<a name="XMLSECTRANSFORMSETKEY"></a>xmlSecTransformSetKey ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformSetKey           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<a name="XMLSECTRANSFORMSETKEY"></a><h3>xmlSecTransformSetKey ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformSetKey               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
 <p>Sets the transform's key.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16026"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15427"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16031"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15432"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to key. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16036"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16041"></a><h3>
-<a name="XMLSECTRANSFORMSETKEYREQ"></a>xmlSecTransformSetKeyReq ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformSetKeyReq        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
-<p>Sets the key requirements for <var class="PARAMETER">transform</var> in the <var class="PARAMETER">keyReq</var>.</p>
+<a name="XMLSECTRANSFORMSETKEYREQ"></a><h3>xmlSecTransformSetKeyReq ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformSetKeyReq            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<p>Sets the key requirements for <code class="PARAMETER">transform</code> in the <code class="PARAMETER">keyReq</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16055"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15455"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16060"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15460"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys requirements object. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16065"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15465"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16070"></a><h3>
-<a name="XMLSECTRANSFORMVERIFY"></a>xmlSecTransformVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformVerify           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMVERIFY"></a><h3>xmlSecTransformVerify ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVerify               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Verifies the data with transform's processing results
 (for digest, HMAC and signature transforms). The verification
-result is stored in the <font><span class="TYPE">status</span></font> member of <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> object.</p>
+result is stored in the <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16088"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15487"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16093"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15492"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the binary data for verification.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16098"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15497"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16103"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15502"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15507"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16113"></a><h3>
-<a name="XMLSECTRANSFORMVERIFYNODECONTENT"></a>xmlSecTransformVerifyNodeContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformVerifyNodeContent
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Gets the <var class="PARAMETER">node</var> content, base64 decodes it and calls <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY"><span class="TYPE">xmlSecTransformVerify</span></a>
+<a name="XMLSECTRANSFORMVERIFYNODECONTENT"></a><h3>xmlSecTransformVerifyNodeContent ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVerifyNodeContent    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Gets the <code class="PARAMETER">node</code> content, base64 decodes it and calls <a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFY"><span class="TYPE">xmlSecTransformVerify</span></a>
 function to verify binary results.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16129"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15527"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16134"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15532"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16139"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15537"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16144"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15542"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16149"></a><h3>
-<a name="XMLSECTRANSFORMGETDATATYPE"></a>xmlSecTransformGetDataType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> xmlSecTransformGetDataType
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Gets transform input (<var class="PARAMETER">mode</var> is "push") or output (<var class="PARAMETER">mode</var> is "pop") data 
+<a name="XMLSECTRANSFORMGETDATATYPE"></a><h3>xmlSecTransformGetDataType ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  xmlSecTransformGetDataType     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Gets transform input (<code class="PARAMETER">mode</code> is "push") or output (<code class="PARAMETER">mode</code> is "pop") data 
 type (binary or XML).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16164"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15561"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16169"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15566"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data mode (push or pop).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16174"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15571"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16179"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the transform's data type for the <var class="PARAMETER">mode</var> operation.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15576"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the transform's data type for the <code class="PARAMETER">mode</code> operation.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16185"></a><h3>
-<a name="XMLSECTRANSFORMPUSHBIN"></a>xmlSecTransformPushBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformPushBin          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Process binary <var class="PARAMETER">data</var> and pushes results to next transform.</p>
+<a name="XMLSECTRANSFORMPUSHBIN"></a><h3>xmlSecTransformPushBin ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPushBin              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Process binary <code class="PARAMETER">data</code> and pushes results to next transform.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16201"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15597"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16206"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15602"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16211"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15607"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16216"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15612"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag: if set to 1 then it's the last
 		data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16221"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15617"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16226"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15622"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16231"></a><h3>
-<a name="XMLSECTRANSFORMPOPBIN"></a>xmlSecTransformPopBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformPopBin           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMPOPBIN"></a><h3>xmlSecTransformPopBin ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPopBin               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Pops data from previous transform in the chain, processes data and 
-returns result in the <var class="PARAMETER">data</var> buffer. The size of returned data is 
-placed in the <var class="PARAMETER">dataSize</var>.</p>
+returns result in the <code class="PARAMETER">data</code> buffer. The size of returned data is 
+placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16248"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15643"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16253"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15648"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16258"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>	the size of the buffer <font><span class="TYPE">data</span></font>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15653"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16265"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15660"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16270"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15665"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16275"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15670"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16280"></a><h3>
-<a name="XMLSECTRANSFORMPUSHXML"></a>xmlSecTransformPushXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformPushXml          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Processes <var class="PARAMETER">nodes</var> and pushes result to the next transform in the chain.</p>
+<a name="XMLSECTRANSFORMPUSHXML"></a><h3>xmlSecTransformPushXml ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPushXml              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Processes <code class="PARAMETER">nodes</code> and pushes result to the next transform in the chain.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16294"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15688"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16299"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15693"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16304"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15698"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16309"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16314"></a><h3>
-<a name="XMLSECTRANSFORMPOPXML"></a>xmlSecTransformPopXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformPopXml           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMPOPXML"></a><h3>xmlSecTransformPopXml ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformPopXml               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Pops data from previous transform in the chain, processes the data and 
-returns result in <var class="PARAMETER">nodes</var>.</p>
+returns result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16328"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15721"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16333"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15726"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16338"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15731"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16343"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15736"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16348"></a><h3>
-<a name="XMLSECTRANSFORMEXECUTE"></a>xmlSecTransformExecute ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformExecute          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>int</font> last,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMEXECUTE"></a><h3>xmlSecTransformExecute ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformExecute              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>int</font> last,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Executes transform (used by default popBin/pushBin/popXml/pushXml methods).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16361"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15753"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16366"><span style="white-space: nowrap"><var class="PARAMETER">last</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15758"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag: if set to 1 then it's the last data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16371"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15763"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16376"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15768"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16381"></a><h3>
-<a name="XMLSECTRANSFORMDEBUGDUMP"></a>xmlSecTransformDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformDebugDump        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints transform's debug information to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECTRANSFORMDEBUGDUMP"></a><h3>xmlSecTransformDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDebugDump            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints transform's debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16394"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15785"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16399"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15790"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16404"></a><h3>
-<a name="XMLSECTRANSFORMDEBUGXMLDUMP"></a>xmlSecTransformDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformDebugXmlDump     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints transform's debug information to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECTRANSFORMDEBUGXMLDUMP"></a><h3>xmlSecTransformDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformDebugXmlDump         (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints transform's debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16417"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15807"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16422"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15812"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16427"></a><h3>
-<a name="XMLSECTRANSFORMGETNAME"></a>xmlSecTransformGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformGetName(transform)</pre>
+<a name="XMLSECTRANSFORMGETNAME"></a><h3>xmlSecTransformGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformGetName(transform)</pre>
 <p>Macro. Returns transform name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16436"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15825"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16441"></a><h3>
-<a name="XMLSECTRANSFORMISVALID"></a>xmlSecTransformIsValid()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformIsValid(transform)</pre>
-<p>Macro. Returns 1 if the <var class="PARAMETER">transform</var> is valid or 0 otherwise.</p>
+<a name="XMLSECTRANSFORMISVALID"></a><h3>xmlSecTransformIsValid()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformIsValid(transform)</pre>
+<p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16451"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15839"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16456"></a><h3>
-<a name="XMLSECTRANSFORMCHECKTYPE"></a>xmlSecTransformCheckType()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformCheckType(transform, t)</pre>
-<p>Macro. Returns 1 if the <var class="PARAMETER">transform</var> is valid and has specified type <var class="PARAMETER">t</var> 
+<a name="XMLSECTRANSFORMCHECKTYPE"></a><h3>xmlSecTransformCheckType()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformCheckType(transform, t)</pre>
+<p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has specified type <code class="PARAMETER">t</code> 
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16467"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15854"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16472"><span style="white-space: nowrap"><var class="PARAMETER">t</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15859"><span style="white-space: nowrap"><code class="PARAMETER">t</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the transform type.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16477"></a><h3>
-<a name="XMLSECTRANSFORMCHECKID"></a>xmlSecTransformCheckId()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformCheckId(transform, i)</pre>
-<p>Macro. Returns 1 if the <var class="PARAMETER">transform</var> is valid and has specified id <var class="PARAMETER">i</var> 
+<a name="XMLSECTRANSFORMCHECKID"></a><h3>xmlSecTransformCheckId()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformCheckId(transform, i)</pre>
+<p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has specified id <code class="PARAMETER">i</code> 
 or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16488"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15874"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16493"><span style="white-space: nowrap"><var class="PARAMETER">i</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15879"><span style="white-space: nowrap"><code class="PARAMETER">i</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform id.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16498"></a><h3>
-<a name="XMLSECTRANSFORMCHECKSIZE"></a>xmlSecTransformCheckSize()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformCheckSize(transform, size)</pre>
-<p>Macro. Returns 1 if the <var class="PARAMETER">transform</var> is valid and has at least <var class="PARAMETER">size</var>
+<a name="XMLSECTRANSFORMCHECKSIZE"></a><h3>xmlSecTransformCheckSize()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformCheckSize(transform, size)</pre>
+<p>Macro. Returns 1 if the <code class="PARAMETER">transform</code> is valid and has at least <code class="PARAMETER">size</code>
 bytes or 0 otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16509"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15894"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16514"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15899"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transform object size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16519"></a><h3>
-<a name="XMLSECTRANSFORMCONNECT"></a>xmlSecTransformConnect ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformConnect          (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMCONNECT"></a><h3>xmlSecTransformConnect ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformConnect              (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> left,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> right,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>If the data object is a node-set and the next transform requires octets, 
 the signature application MUST attempt to convert the node-set to an octet 
 stream using Canonical XML [XML-C14N].  </p>
 <p>The story is different if the right transform is base64 decode
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-Base-64</span></font>):</p>
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-BASE-64"><span class="TYPE">sec-Base-64</span></gtkdoclink>):</p>
 <p>This transform requires an octet stream for input. If an XPath node-set 
 (or sufficiently functional alternative) is given as input, then it is 
 converted to an octet stream by performing operations logically equivalent 
-to 1) applying an XPath transform with expression self::<font><code class="FUNCTION">text()</code></font>, then 2) 
+to 1) applying an XPath transform with expression self::<gtkdoclink href="TEXT"><code class="FUNCTION">text()</code></gtkdoclink>, then 2) 
 taking the string-value of the node-set. Thus, if an XML element is 
 identified by a barename XPointer in the Reference URI, and its content 
 consists solely of base64 encoded character data, then this transform 
@@ -1999,649 +1885,621 @@ processing instructions. The output of this transform is an octet stream.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16538"><span style="white-space: nowrap"><var class="PARAMETER">left</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15922"><span style="white-space: nowrap"><code class="PARAMETER">left</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to left (prev) transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16543"><span style="white-space: nowrap"><var class="PARAMETER">right</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15927"><span style="white-space: nowrap"><code class="PARAMETER">right</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to right (next) transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16548"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15932"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16553"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs. </p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15937"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs. </p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16558"></a><h3>
-<a name="XMLSECTRANSFORMREMOVE"></a>xmlSecTransformRemove ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformRemove           (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
-<p>Removes <var class="PARAMETER">transform</var> from the chain.</p>
+<a name="XMLSECTRANSFORMREMOVE"></a><h3>xmlSecTransformRemove ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformRemove               (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<p>Removes <code class="PARAMETER">transform</code> from the chain.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16570"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15953"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> the pointer to <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16577"></a><h3>
-<a name="XMLSECTRANSFORMDEFAULTGETDATATYPE"></a>xmlSecTransformDefaultGetDataType ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> xmlSecTransformDefaultGetDataType
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Gets transform input (<var class="PARAMETER">mode</var> is "push") or output (<var class="PARAMETER">mode</var> is "pop") data 
+<a name="XMLSECTRANSFORMDEFAULTGETDATATYPE"></a><h3>xmlSecTransformDefaultGetDataType ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  xmlSecTransformDefaultGetDataType
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Gets transform input (<code class="PARAMETER">mode</code> is "push") or output (<code class="PARAMETER">mode</code> is "pop") data 
 type (binary or XML) by analyzing available pushBin/popBin/pushXml/popXml
 methods.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16592"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15974"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16597"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15979"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the data mode (push or pop).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16602"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN15984"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform's chaing processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16607"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the transform's data type for the <var class="PARAMETER">mode</var> operation.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN15989"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the transform's data type for the <code class="PARAMETER">mode</code> operation.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16613"></a><h3>
-<a name="XMLSECTRANSFORMDEFAULTPUSHBIN"></a>xmlSecTransformDefaultPushBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformDefaultPushBin   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Process binary <var class="PARAMETER">data</var> by calling transform's execute method and pushes 
+<a name="XMLSECTRANSFORMDEFAULTPUSHBIN"></a><h3>xmlSecTransformDefaultPushBin ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPushBin       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Process binary <code class="PARAMETER">data</code> by calling transform's execute method and pushes 
 results to next transform.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16629"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16010"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16634"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16015"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16639"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16020"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16644"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16025"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag: if set to 1 then it's the last
 		data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16649"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16030"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16654"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16659"></a><h3>
-<a name="XMLSECTRANSFORMDEFAULTPOPBIN"></a>xmlSecTransformDefaultPopBin ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformDefaultPopBin    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMDEFAULTPOPBIN"></a><h3>xmlSecTransformDefaultPopBin ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPopBin        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Pops data from previous transform in the chain, processes data by calling
-transform's execute method and returns result in the <var class="PARAMETER">data</var> buffer. The 
-size of returned data is placed in the <var class="PARAMETER">dataSize</var>.</p>
+transform's execute method and returns result in the <code class="PARAMETER">data</code> buffer. The 
+size of returned data is placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16676"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16056"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16681"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16061"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16686"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>	the size of the buffer <font><span class="TYPE">data</span></font>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16066"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the size of the buffer <gtkdoclink href="DATA"><span class="TYPE">data</span></gtkdoclink>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16693"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16073"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16698"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16078"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16703"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16083"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16708"></a><h3>
-<a name="XMLSECTRANSFORMDEFAULTPUSHXML"></a>xmlSecTransformDefaultPushXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformDefaultPushXml   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Processes <var class="PARAMETER">nodes</var> by calling transform's execute method and pushes 
+<a name="XMLSECTRANSFORMDEFAULTPUSHXML"></a><h3>xmlSecTransformDefaultPushXml ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPushXml       (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Processes <code class="PARAMETER">nodes</code> by calling transform's execute method and pushes 
 result to the next transform in the chain.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16722"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16101"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16727"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16106"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16732"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16111"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16737"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16116"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16742"></a><h3>
-<a name="XMLSECTRANSFORMDEFAULTPOPXML"></a>xmlSecTransformDefaultPopXml ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformDefaultPopXml    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMDEFAULTPOPXML"></a><h3>xmlSecTransformDefaultPopXml ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformDefaultPopXml        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Pops data from previous transform in the chain, processes the data 
-by calling transform's execute method and returns result in <var class="PARAMETER">nodes</var>.</p>
+by calling transform's execute method and returns result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16756"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16134"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16761"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16139"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16766"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16144"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16771"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16149"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16776"></a><h3>
-<a name="XMLSECTRANSFORMCREATEOUTPUTBUFFER"></a>xmlSecTransformCreateOutputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font> xmlSecTransformCreateOutputBuffer
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Creates output buffer to write data to <var class="PARAMETER">transform</var>.</p>
+<a name="XMLSECTRANSFORMCREATEOUTPUTBUFFER"></a><h3>xmlSecTransformCreateOutputBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlOutputBufferPtr</font>  xmlSecTransformCreateOutputBuffer   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Creates output buffer to write data to <code class="PARAMETER">transform</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16789"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16166"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16794"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16171"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16799"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to new output buffer or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16176"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to new output buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16804"></a><h3>
-<a name="XMLSECTRANSFORMCREATEINPUTBUFFER"></a>xmlSecTransformCreateInputBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlParserInputBufferPtr</font> xmlSecTransformCreateInputBuffer
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>Creates input buffer to read data from <var class="PARAMETER">transform</var>.</p>
+<a name="XMLSECTRANSFORMCREATEINPUTBUFFER"></a><h3>xmlSecTransformCreateInputBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlParserInputBufferPtr</font>  xmlSecTransformCreateInputBuffer
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>Creates input buffer to read data from <code class="PARAMETER">transform</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16817"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16193"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16822"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16198"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16827"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to new input buffer or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16203"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to new input buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16832"></a><h3>
-<a name="XMLSECTRANSFORMINITIALIZEMETHOD"></a>xmlSecTransformInitializeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformInitializeMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<a name="XMLSECTRANSFORMINITIALIZEMETHOD"></a><h3>xmlSecTransformInitializeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformInitializeMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
 <p>The transform specific initialization method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16843"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16218"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16848"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16223"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16853"></a><h3>
-<a name="XMLSECTRANSFORMFINALIZEMETHOD"></a>xmlSecTransformFinalizeMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        (*xmlSecTransformFinalizeMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
+<a name="XMLSECTRANSFORMFINALIZEMETHOD"></a><h3>xmlSecTransformFinalizeMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                (*xmlSecTransformFinalizeMethod)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform);</pre>
 <p>The transform specific destroy method.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN16864"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16238"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16869"></a><h3>
-<a name="XMLSECTRANSFORMGETDATATYPEMETHOD"></a>xmlSecTransformGetDataTypeMethod ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a> (*xmlSecTransformGetDataTypeMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMGETDATATYPEMETHOD"></a><h3>xmlSecTransformGetDataTypeMethod ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-transforms.html#XMLSECTRANSFORMDATATYPE">xmlSecTransformDataType</a>  (*xmlSecTransformGetDataTypeMethod)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMMODE">xmlSecTransformMode</a> mode,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The transform specific method to query information about transform
-data type in specified mode <var class="PARAMETER">mode</var>.</p>
+data type in specified mode <code class="PARAMETER">mode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16883"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16256"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16888"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16261"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16893"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16266"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16898"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>transform data type.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16271"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> transform data type.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16903"></a><h3>
-<a name="XMLSECTRANSFORMNODEREADMETHOD"></a>xmlSecTransformNodeReadMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformNodeReadMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMNODEREADMETHOD"></a><h3>xmlSecTransformNodeReadMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformNodeReadMethod)    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The transform specific method to read the transform data from 
-the <var class="PARAMETER">node</var>.</p>
+the <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16917"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16289"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16922"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16294"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16928"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16300"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16933"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16305"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16938"></a><h3>
-<a name="XMLSECTRANSFORMNODEWRITEMETHOD"></a>xmlSecTransformNodeWriteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformNodeWriteMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>The transform specific method to write transform information to an XML node <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECTRANSFORMNODEWRITEMETHOD"></a><h3>xmlSecTransformNodeWriteMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformNodeWriteMethod)   (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>The transform specific method to write transform information to an XML node <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16952"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16323"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16957"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16328"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Transform"; target="_top">&lt;dsig:Transform/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16963"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16334"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16968"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16339"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN16973"></a><h3>
-<a name="XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD"></a>xmlSecTransformSetKeyRequirementsMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformSetKeyRequirementsMethod)
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
+<a name="XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD"></a><h3>xmlSecTransformSetKeyRequirementsMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformSetKeyRequirementsMethod)
+                                                        (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEYREQ">xmlSecKeyReqPtr</a> keyReq);</pre>
 <p>Transform specific method to set transform's key requirements.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16985"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16355"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16990"><span style="white-space: nowrap"><var class="PARAMETER">keyReq</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16360"><span style="white-space: nowrap"><code class="PARAMETER">keyReq</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to key requirements structure.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN16995"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16365"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17000"></a><h3>
-<a name="XMLSECTRANSFORMSETKEYMETHOD"></a>xmlSecTransformSetKeyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformSetKeyMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
+<a name="XMLSECTRANSFORMSETKEYMETHOD"></a><h3>xmlSecTransformSetKeyMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformSetKeyMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> key);</pre>
 <p>The transform specific method to set the key for use.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17012"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16381"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17017"><span style="white-space: nowrap"><var class="PARAMETER">key</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16386"><span style="white-space: nowrap"><code class="PARAMETER">key</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 			the pointer to key.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17022"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16391"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17027"></a><h3>
-<a name="XMLSECTRANSFORMVERIFYMETHOD"></a>xmlSecTransformVerifyMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformVerifyMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMVERIFYMETHOD"></a><h3>xmlSecTransformVerifyMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformVerifyMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The transform specific method to verify transform processing results
-(used by digest and signature transforms). This method sets <var class="PARAMETER">status</var>
-member of the <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure to either <font><span class="TYPE">xmlSecTransformStatusOk</span></font>
-if verification succeeded or <font><span class="TYPE">xmlSecTransformStatusFail</span></font> otherwise.</p>
+(used by digest and signature transforms). This method sets <code class="PARAMETER">status</code>
+member of the <a href="xmlsec-transforms.html#XMLSECTRANSFORM"><span class="TYPE">xmlSecTransform</span></a> structure to either <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSOK"><span class="TYPE">xmlSecTransformStatusOk</span></a>
+if verification succeeded or <a href="xmlsec-transforms.html#XMLSECTRANSFORMSTATUSFAIL"><span class="TYPE">xmlSecTransformStatusFail</span></a> otherwise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17048"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16416"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17053"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16421"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17058"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>			the size of input buffer <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16426"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>			the size of input buffer <code class="PARAMETER">data</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17064"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16432"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17069"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16437"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17074"></a><h3>
-<a name="XMLSECTRANSFORMPUSHBINMETHOD"></a>xmlSecTransformPushBinMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformPushBinMethod) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
-                                             <font>int</font> final,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>The transform specific method to process data from <var class="PARAMETER">data</var> and push
+<a name="XMLSECTRANSFORMPUSHBINMETHOD"></a><h3>xmlSecTransformPushBinMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPushBinMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize,
+                                                         <font>int</font> final,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>The transform specific method to process data from <code class="PARAMETER">data</code> and push
 result to the next transform in the chain.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17090"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16457"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17095"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16462"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input binary data,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17100"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16467"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17105"><span style="white-space: nowrap"><var class="PARAMETER">final</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16472"><span style="white-space: nowrap"><code class="PARAMETER">final</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the flag: if set to 1 then it's the last
 			data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17110"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16477"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17115"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16482"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17120"></a><h3>
-<a name="XMLSECTRANSFORMPOPBINMETHOD"></a>xmlSecTransformPopBinMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformPopBinMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMPOPBINMETHOD"></a><h3>xmlSecTransformPopBinMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPopBinMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> maxDataSize,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> *dataSize,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The transform specific method to pop data from previous transform 
-in the chain and return result in the <var class="PARAMETER">data</var> buffer. The size of returned
-data is placed in the <var class="PARAMETER">dataSize</var>.</p>
+in the chain and return result in the <code class="PARAMETER">data</code> buffer. The size of returned
+data is placed in the <code class="PARAMETER">dataSize</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17137"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16503"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17142"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16508"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the buffer to store result data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17147"><span style="white-space: nowrap"><var class="PARAMETER">maxDataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the size of the buffer <var class="PARAMETER">data</var>.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16513"><span style="white-space: nowrap"><code class="PARAMETER">maxDataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the size of the buffer <code class="PARAMETER">data</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17153"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16519"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to returned data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17158"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16524"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17163"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16529"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17168"></a><h3>
-<a name="XMLSECTRANSFORMPUSHXMLMETHOD"></a>xmlSecTransformPushXmlMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformPushXmlMethod) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
-<p>The transform specific method to process <var class="PARAMETER">nodes</var> and push result to the next 
+<a name="XMLSECTRANSFORMPUSHXMLMETHOD"></a><h3>xmlSecTransformPushXmlMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPushXmlMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<p>The transform specific method to process <code class="PARAMETER">nodes</code> and push result to the next 
 transform in the chain.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17182"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16547"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17187"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16552"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the input nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17192"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16557"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17197"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17202"></a><h3>
-<a name="XMLSECTRANSFORMPOPXMLMETHOD"></a>xmlSecTransformPopXmlMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformPopXmlMethod)  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMPOPXMLMETHOD"></a><h3>xmlSecTransformPopXmlMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformPopXmlMethod)      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESET">xmlSecNodeSetPtr</a> *nodes,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>The transform specific method to pop data from previous transform in the chain,
-process the data and return result in <var class="PARAMETER">nodes</var>.</p>
+process the data and return result in <code class="PARAMETER">nodes</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17216"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16580"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17221"><span style="white-space: nowrap"><var class="PARAMETER">nodes</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16585"><span style="white-space: nowrap"><code class="PARAMETER">nodes</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to store popinter to result nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17226"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16590"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17231"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16595"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17236"></a><h3>
-<a name="XMLSECTRANSFORMEXECUTEMETHOD"></a>xmlSecTransformExecuteMethod ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         (*xmlSecTransformExecuteMethod) (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <font>int</font> last,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
+<a name="XMLSECTRANSFORMEXECUTEMETHOD"></a><h3>xmlSecTransformExecuteMethod ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 (*xmlSecTransformExecuteMethod)     (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <font>int</font> last,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtxPtr</a> transformCtx);</pre>
 <p>Transform specific method to process a chunk of data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17249"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16612"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to transform object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17254"><span style="white-space: nowrap"><var class="PARAMETER">last</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16617"><span style="white-space: nowrap"><code class="PARAMETER">last</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the flag: if set to 1 then it's the last data chunk.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17259"><span style="white-space: nowrap"><var class="PARAMETER">transformCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16622"><span style="white-space: nowrap"><code class="PARAMETER">transformCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform context object.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17264"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16627"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17269"></a><h3>
-<a name="XMLSECTRANSFORMKLASS"></a>struct xmlSecTransformKlass</h3>
+<a name="XMLSECTRANSFORMKLASS"></a><h3>struct xmlSecTransformKlass</h3>
 <pre class="PROGRAMLISTING">struct xmlSecTransformKlass {
-
     /* data */
     xmlSecSize				klassSize;
     xmlSecSize				objSize;
@@ -2678,272 +2536,256 @@ process the data and return result in <var class="PARAMETER">nodes</var>.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17278"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16640"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">klassSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform klass structure size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17284"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16646"><span style="white-space: nowrap"><a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> <code class="STRUCTFIELD">objSize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform object size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17290"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16652"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">name</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform's name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17296"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16658"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">href</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the transform's identification string (href).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17302"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> <code class="STRUCTFIELD">usage</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16664"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> <code class="STRUCTFIELD">usage</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the allowed transforms usages.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17308"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">xmlSecTransformInitializeMethod</a> <code class="STRUCTFIELD">initialize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16670"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMINITIALIZEMETHOD">xmlSecTransformInitializeMethod</a> <code class="STRUCTFIELD">initialize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the initialization method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17314"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">xmlSecTransformFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16676"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMFINALIZEMETHOD">xmlSecTransformFinalizeMethod</a> <code class="STRUCTFIELD">finalize</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the finmalization (destroy) function.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17320"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">xmlSecTransformNodeReadMethod</a> <code class="STRUCTFIELD">readNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16682"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEREADMETHOD">xmlSecTransformNodeReadMethod</a> <code class="STRUCTFIELD">readNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML node read method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17326"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">xmlSecTransformNodeWriteMethod</a> <code class="STRUCTFIELD">writeNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16688"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMNODEWRITEMETHOD">xmlSecTransformNodeWriteMethod</a> <code class="STRUCTFIELD">writeNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML node write method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17332"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">xmlSecTransformSetKeyRequirementsMethod</a> <code class="STRUCTFIELD">setKeyReq</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16694"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYREQUIREMENTSMETHOD">xmlSecTransformSetKeyRequirementsMethod</a> <code class="STRUCTFIELD">setKeyReq</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the set key requirements method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17338"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">xmlSecTransformSetKeyMethod</a> <code class="STRUCTFIELD">setKey</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16700"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMSETKEYMETHOD">xmlSecTransformSetKeyMethod</a> <code class="STRUCTFIELD">setKey</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the set key method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17344"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">xmlSecTransformVerifyMethod</a> <code class="STRUCTFIELD">verify</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16706"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMVERIFYMETHOD">xmlSecTransformVerifyMethod</a> <code class="STRUCTFIELD">verify</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the verify method (for digest and signature transforms).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17350"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">xmlSecTransformGetDataTypeMethod</a> <code class="STRUCTFIELD">getDataType</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16712"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMGETDATATYPEMETHOD">xmlSecTransformGetDataTypeMethod</a> <code class="STRUCTFIELD">getDataType</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the input/output data type query method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17356"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">xmlSecTransformPushBinMethod</a> <code class="STRUCTFIELD">pushBin</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16718"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHBINMETHOD">xmlSecTransformPushBinMethod</a> <code class="STRUCTFIELD">pushBin</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the binary data "push thru chain" processing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17362"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">xmlSecTransformPopBinMethod</a> <code class="STRUCTFIELD">popBin</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16724"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPBINMETHOD">xmlSecTransformPopBinMethod</a> <code class="STRUCTFIELD">popBin</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the binary data "pop from chain" procesing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17368"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">xmlSecTransformPushXmlMethod</a> <code class="STRUCTFIELD">pushXml</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16730"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPUSHXMLMETHOD">xmlSecTransformPushXmlMethod</a> <code class="STRUCTFIELD">pushXml</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML data "push thru chain" processing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17374"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">xmlSecTransformPopXmlMethod</a> <code class="STRUCTFIELD">popXml</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16736"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMPOPXMLMETHOD">xmlSecTransformPopXmlMethod</a> <code class="STRUCTFIELD">popXml</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML data "pop from chain" procesing method.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17380"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">xmlSecTransformExecuteMethod</a> <code class="STRUCTFIELD">execute</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16742"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMEXECUTEMETHOD">xmlSecTransformExecuteMethod</a> <code class="STRUCTFIELD">execute</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the low level data processing method used  by default
-			implementations of <var class="PARAMETER">pushBin</var>, <var class="PARAMETER">popBin</var>, <var class="PARAMETER">pushXml</var> and <var class="PARAMETER">popXml</var>.</p></td>
+			implementations of <code class="PARAMETER">pushBin</code>, <code class="PARAMETER">popBin</code>, <code class="PARAMETER">pushXml</code> and <code class="PARAMETER">popXml</code>.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17390"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16752"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17396"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16758"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17402"></a><h3>
-<a name="XMLSECTRANSFORMKLASSGETNAME"></a>xmlSecTransformKlassGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformKlassGetName(klass)</pre>
+<a name="XMLSECTRANSFORMKLASSGETNAME"></a><h3>xmlSecTransformKlassGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformKlassGetName(klass)</pre>
 <p>Macro. Returns transform klass name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17411"><span style="white-space: nowrap"><var class="PARAMETER">klass</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16772"><span style="white-space: nowrap"><code class="PARAMETER">klass</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the transofrm's klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17416"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTID"></a>xmlSecTransformIdListId</h3>
+<a name="XMLSECTRANSFORMIDLISTID"></a><h3>xmlSecTransformIdListId</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformIdListId	xmlSecTransformIdListGetKlass()</pre>
 <p>Transform klasses list klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17424"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTGETKLASS"></a>xmlSecTransformIdListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecTransformIdListGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMIDLISTGETKLASS"></a><h3>xmlSecTransformIdListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecTransformIdListGetKlass       (void);</pre>
 <p>The transform id list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17434"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the transform id list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16793"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the transform id list klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17439"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTFIND"></a>xmlSecTransformIdListFind ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformIdListFind       (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
-<p>Lookups <var class="PARAMETER">dataId</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECTRANSFORMIDLISTFIND"></a><h3>xmlSecTransformIdListFind ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformIdListFind           (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<p>Lookups <code class="PARAMETER">dataId</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17453"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16811"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17458"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16816"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17463"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if <var class="PARAMETER">dataId</var> is found in the <var class="PARAMETER">list</var>, 0 if not and a negative
+<td align="LEFT" valign="TOP"><a name="AEN16821"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">dataId</code> is found in the <code class="PARAMETER">list</code>, 0 if not and a negative
 value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17470"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTFINDBYHREF"></a>xmlSecTransformIdListFindByHref ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformIdListFindByHref
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *href,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
-<p>Lookups data klass in the list with given <var class="PARAMETER">href</var> and <var class="PARAMETER">usage</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECTRANSFORMIDLISTFINDBYHREF"></a><h3>xmlSecTransformIdListFindByHref ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformIdListFindByHref     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *href,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<p>Lookups data klass in the list with given <code class="PARAMETER">href</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17486"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16843"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17491"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16848"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform klass href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17496"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16853"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17501"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>transform klass is found and NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16858"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> transform klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17506"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTFINDBYNAME"></a>xmlSecTransformIdListFindByName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformIdListFindByName
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             const <font>xmlChar</font> *name,
-                                             <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
-<p>Lookups data klass in the list with given <var class="PARAMETER">name</var> and <var class="PARAMETER">usage</var> in <var class="PARAMETER">list</var>.</p>
+<a name="XMLSECTRANSFORMIDLISTFINDBYNAME"></a><h3>xmlSecTransformIdListFindByName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformIdListFindByName     (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         const <font>xmlChar</font> *name,
+                                                         <a href="xmlsec-transforms.html#XMLSECTRANSFORMUSAGE">xmlSecTransformUsage</a> usage);</pre>
+<p>Lookups data klass in the list with given <code class="PARAMETER">name</code> and <code class="PARAMETER">usage</code> in <code class="PARAMETER">list</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17522"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16878"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17527"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16883"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform klass name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17532"><span style="white-space: nowrap"><var class="PARAMETER">usage</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16888"><span style="white-space: nowrap"><code class="PARAMETER">usage</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the desired transform usage.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17537"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>transform klass is found and NULL otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16893"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> transform klass is found and NULL otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17542"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTDEBUGDUMP"></a>xmlSecTransformIdListDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformIdListDebugDump  (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary transform debug information to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECTRANSFORMIDLISTDEBUGDUMP"></a><h3>xmlSecTransformIdListDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdListDebugDump      (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary transform debug information to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17555"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16910"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17560"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16915"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17565"></a><h3>
-<a name="XMLSECTRANSFORMIDLISTDEBUGXMLDUMP"></a>xmlSecTransformIdListDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformIdListDebugXmlDump
-                                            (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints binary transform debug information to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECTRANSFORMIDLISTDEBUGXMLDUMP"></a><h3>xmlSecTransformIdListDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformIdListDebugXmlDump   (<a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> list,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints binary transform debug information to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17578"><span style="white-space: nowrap"><var class="PARAMETER">list</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16932"><span style="white-space: nowrap"><code class="PARAMETER">list</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to transform ids list.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17583"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16937"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17588"></a><h3>
-<a name="XMLSECTRANSFORMIDUNKNOWN"></a>xmlSecTransformIdUnknown</h3>
+<a name="XMLSECTRANSFORMIDUNKNOWN"></a><h3>xmlSecTransformIdUnknown</h3>
 <pre class="PROGRAMLISTING">#define xmlSecTransformIdUnknown			((xmlSecTransformId)NULL)</pre>
 <p>The "unknown" transform id (NULL).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17596"></a><h3>
-<a name="XMLSECTRANSFORMBASE64ID"></a>xmlSecTransformBase64Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformBase64Id</pre>
+<a name="XMLSECTRANSFORMBASE64ID"></a><h3>xmlSecTransformBase64Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformBase64Id</pre>
 <p>The base64 encode transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17604"></a><h3>
-<a name="XMLSECTRANSFORMBASE64GETKLASS"></a>xmlSecTransformBase64GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformBase64GetKlass
-                                            (void);</pre>
-<p>The Base64 transform klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-Base-64</span></font>).
+<a name="XMLSECTRANSFORMBASE64GETKLASS"></a><h3>xmlSecTransformBase64GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformBase64GetKlass       (void);</pre>
+<p>The Base64 transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-BASE-64"><span class="TYPE">sec-Base-64</span></gtkdoclink>).
 The normative specification for base64 decoding transforms is RFC 2045
 (http://www.ietf.org/rfc/rfc2045.txt). The base64 Transform element has 
 no content. The input is decoded by the algorithms. This transform is 
@@ -2952,184 +2794,164 @@ the encoded content of an element.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17616"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>base64 transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN16967"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> base64 transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17621"></a><h3>
-<a name="XMLSECTRANSFORMBASE64SETLINESIZE"></a>xmlSecTransformBase64SetLineSize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecTransformBase64SetLineSize
-                                            (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);</pre>
-<p>Sets the max line size to <var class="PARAMETER">lineSize</var>.</p>
+<a name="XMLSECTRANSFORMBASE64SETLINESIZE"></a><h3>xmlSecTransformBase64SetLineSize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecTransformBase64SetLineSize    (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> lineSize);</pre>
+<p>Sets the max line size to <code class="PARAMETER">lineSize</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17634"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16984"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to BASE64 encode transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17639"><span style="white-space: nowrap"><var class="PARAMETER">lineSize</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN16989"><span style="white-space: nowrap"><code class="PARAMETER">lineSize</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new max line size.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17644"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14NID"></a>xmlSecTransformInclC14NId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformInclC14NId</pre>
+<a name="XMLSECTRANSFORMINCLC14NID"></a><h3>xmlSecTransformInclC14NId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14NId</pre>
 <p>The regular (inclusive) C14N without comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17652"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14NGETKLASS"></a>xmlSecTransformInclC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformInclC14NGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMINCLC14NGETKLASS"></a><h3>xmlSecTransformInclC14NGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14NGetKlass     (void);</pre>
 <p>Inclusive (regular) canonicalization that omits comments transform klass
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-c14nAlg</span></font> and 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-C14NALG"><span class="TYPE">sec-c14nAlg</span></gtkdoclink> and 
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17664"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>c14n transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17012"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> c14n transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17669"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSID"></a>xmlSecTransformInclC14NWithCommentsId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformInclC14NWithCommentsId</pre>
+<a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSID"></a><h3>xmlSecTransformInclC14NWithCommentsId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14NWithCommentsId</pre>
 <p>The regular (inclusive) C14N with comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17677"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS"></a>xmlSecTransformInclC14NWithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformInclC14NWithCommentsGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMINCLC14NWITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformInclC14NWithCommentsGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14NWithCommentsGetKlass
+                                                        (void);</pre>
 <p>Inclusive (regular) canonicalization that includes comments transform klass
-(http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-c14nAlg</span></font> and 
+(http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-C14NALG"><span class="TYPE">sec-c14nAlg</span></gtkdoclink> and 
 http://www.w3.org/TR/2001/REC-xml-c14n-20010315).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17689"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>c14n with comments transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17035"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> c14n with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17694"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14N11ID"></a>xmlSecTransformInclC14N11Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformInclC14N11Id</pre>
+<a name="XMLSECTRANSFORMINCLC14N11ID"></a><h3>xmlSecTransformInclC14N11Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14N11Id</pre>
 <p>The regular (inclusive) C14N 1.1 without comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17702"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14N11GETKLASS"></a>xmlSecTransformInclC14N11GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformInclC14N11GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMINCLC14N11GETKLASS"></a><h3>xmlSecTransformInclC14N11GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14N11GetKlass   (void);</pre>
 <p>C14N version 1.1 (http://www.w3.org/TR/xml-c14n11)</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17712"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>c14n v1.1 transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17056"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> c14n v1.1 transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17717"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID"></a>xmlSecTransformInclC14N11WithCommentsId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformInclC14N11WithCommentsId</pre>
+<a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSID"></a><h3>xmlSecTransformInclC14N11WithCommentsId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformInclC14N11WithCommentsId</pre>
 <p>The regular (inclusive) C14N 1.1 with comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17725"></a><h3>
-<a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS"></a>xmlSecTransformInclC14N11WithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformInclC14N11WithCommentsGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMINCLC14N11WITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformInclC14N11WithCommentsGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformInclC14N11WithCommentsGetKlass
+                                                        (void);</pre>
 <p>C14N version 1.1 (http://www.w3.org/TR/xml-c14n11) with comments</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17735"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>c14n v1.1 with comments transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17077"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> c14n v1.1 with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17740"></a><h3>
-<a name="XMLSECTRANSFORMEXCLC14NID"></a>xmlSecTransformExclC14NId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformExclC14NId</pre>
+<a name="XMLSECTRANSFORMEXCLC14NID"></a><h3>xmlSecTransformExclC14NId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformExclC14NId</pre>
 <p>The exclusive C14N without comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17748"></a><h3>
-<a name="XMLSECTRANSFORMEXCLC14NGETKLASS"></a>xmlSecTransformExclC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformExclC14NGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMEXCLC14NGETKLASS"></a><h3>xmlSecTransformExclC14NGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformExclC14NGetKlass     (void);</pre>
 <p>Exclusive canoncicalization that ommits comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17758"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>exclusive c14n transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> exclusive c14n transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17763"></a><h3>
-<a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID"></a>xmlSecTransformExclC14NWithCommentsId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformExclC14NWithCommentsId</pre>
+<a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSID"></a><h3>xmlSecTransformExclC14NWithCommentsId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformExclC14NWithCommentsId</pre>
 <p>The exclusive C14N with comments transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17771"></a><h3>
-<a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS"></a>xmlSecTransformExclC14NWithCommentsGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformExclC14NWithCommentsGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMEXCLC14NWITHCOMMENTSGETKLASS"></a><h3>xmlSecTransformExclC14NWithCommentsGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformExclC14NWithCommentsGetKlass
+                                                        (void);</pre>
 <p>Exclusive canoncicalization that includes comments transform klass
 (http://www.w3.org/TR/xml-exc-c14n/).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17781"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>exclusive c14n with comments transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17119"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> exclusive c14n with comments transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17786"></a><h3>
-<a name="XMLSECTRANSFORMENVELOPEDID"></a>xmlSecTransformEnvelopedId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformEnvelopedId</pre>
+<a name="XMLSECTRANSFORMENVELOPEDID"></a><h3>xmlSecTransformEnvelopedId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformEnvelopedId</pre>
 <p>The "enveloped" transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17794"></a><h3>
-<a name="XMLSECTRANSFORMENVELOPEDGETKLASS"></a>xmlSecTransformEnvelopedGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformEnvelopedGetKlass
-                                            (void);</pre>
-<p>The enveloped transform klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-EnvelopedSignature</span></font>):</p>
+<a name="XMLSECTRANSFORMENVELOPEDGETKLASS"></a><h3>xmlSecTransformEnvelopedGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformEnvelopedGetKlass    (void);</pre>
+<p>The enveloped transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-ENVELOPEDSIGNATURE"><span class="TYPE">sec-EnvelopedSignature</span></gtkdoclink>):</p>
 <p>An enveloped signature transform T removes the whole Signature element 
 containing T from the digest calculation of the Reference element 
 containing T. The entire string of characters used by an XML processor 
@@ -3139,7 +2961,7 @@ result from replacing T with an XPath transform containing the following
 XPath parameter element:</p>
 <p>&lt;XPath xmlns:dsig="&amp;dsig;"&gt;
   count(ancestor-or-self::dsig:Signature |
-  <font><code class="FUNCTION">here()</code></font>/ancestor::dsig:Signature[1]) &gt;
+  <gtkdoclink href="HERE"><code class="FUNCTION">here()</code></gtkdoclink>/ancestor::dsig:Signature[1]) &gt;
   count(ancestor-or-self::dsig:Signature)&lt;/XPath&gt;
    
 The input and output requirements of this transform are identical to 
@@ -3151,128 +2973,115 @@ parameterized by the XPath expression above.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17810"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>enveloped transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17146"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> enveloped transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17815"></a><h3>
-<a name="XMLSECTRANSFORMXPATHID"></a>xmlSecTransformXPathId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformXPathId</pre>
+<a name="XMLSECTRANSFORMXPATHID"></a><h3>xmlSecTransformXPathId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformXPathId</pre>
 <p>The XPath transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17823"></a><h3>
-<a name="XMLSECTRANSFORMXPATHGETKLASS"></a>xmlSecTransformXPathGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformXPathGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMXPATHGETKLASS"></a><h3>xmlSecTransformXPathGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPathGetKlass        (void);</pre>
 <p>The XPath transform evaluates given XPath expression and 
 intersects the result with the previous nodes set. See 
-http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-XPath</span></font> for more details.</p>
+http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XPATH"><span class="TYPE">sec-XPath</span></gtkdoclink> for more details.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17835"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>XPath transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17169"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> XPath transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17840"></a><h3>
-<a name="XMLSECTRANSFORMXPATH2ID"></a>xmlSecTransformXPath2Id</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformXPath2Id</pre>
+<a name="XMLSECTRANSFORMXPATH2ID"></a><h3>xmlSecTransformXPath2Id</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformXPath2Id</pre>
 <p>The XPath2 transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17848"></a><h3>
-<a name="XMLSECTRANSFORMXPATH2GETKLASS"></a>xmlSecTransformXPath2GetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformXPath2GetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMXPATH2GETKLASS"></a><h3>xmlSecTransformXPath2GetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPath2GetKlass       (void);</pre>
 <p>The XPath2 transform (http://www.w3.org/TR/xmldsig-filter2/).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17858"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>XPath2 transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17190"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> XPath2 transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17863"></a><h3>
-<a name="XMLSECTRANSFORMXPOINTERID"></a>xmlSecTransformXPointerId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformXPointerId</pre>
+<a name="XMLSECTRANSFORMXPOINTERID"></a><h3>xmlSecTransformXPointerId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformXPointerId</pre>
 <p>The XPointer transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17871"></a><h3>
-<a name="XMLSECTRANSFORMXPOINTERGETKLASS"></a>xmlSecTransformXPointerGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformXPointerGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMXPOINTERGETKLASS"></a><h3>xmlSecTransformXPointerGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXPointerGetKlass     (void);</pre>
 <p>The XPointer transform klass 
 (http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17881"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>XPointer transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17211"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> XPointer transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17886"></a><h3>
-<a name="XMLSECTRANSFORMXPOINTERSETEXPR"></a>xmlSecTransformXPointerSetExpr ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformXPointerSetExpr  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *expr,
-                                             <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
-                                             <font>xmlNodePtr</font> hereNode);</pre>
-<p>Sets the XPointer expression for an XPointer <var class="PARAMETER">transform</var>.</p>
+<a name="XMLSECTRANSFORMXPOINTERSETEXPR"></a><h3>xmlSecTransformXPointerSetExpr ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformXPointerSetExpr      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *expr,
+                                                         <a href="xmlsec-nodeset.html#XMLSECNODESETTYPE">xmlSecNodeSetType</a> nodeSetType,
+                                                         <font>xmlNodePtr</font> hereNode);</pre>
+<p>Sets the XPointer expression for an XPointer <code class="PARAMETER">transform</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17901"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17230"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to XPointer transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17906"><span style="white-space: nowrap"><var class="PARAMETER">expr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17235"><span style="white-space: nowrap"><code class="PARAMETER">expr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the XPointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17911"><span style="white-space: nowrap"><var class="PARAMETER">nodeSetType</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17240"><span style="white-space: nowrap"><code class="PARAMETER">nodeSetType</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the type of evaluated XPointer expression.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17916"><span style="white-space: nowrap"><var class="PARAMETER">hereNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17245"><span style="white-space: nowrap"><code class="PARAMETER">hereNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to "here" node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN17921"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17250"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17926"></a><h3>
-<a name="XMLSECTRANSFORMXSLTID"></a>xmlSecTransformXsltId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformXsltId</pre>
+<a name="XMLSECTRANSFORMXSLTID"></a><h3>xmlSecTransformXsltId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformXsltId</pre>
 <p>The XSLT transform klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17934"></a><h3>
-<a name="XMLSECTRANSFORMXSLTGETKLASS"></a>xmlSecTransformXsltGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformXsltGetKlass
-                                            (void);</pre>
-<p>XSLT transform klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-XSLT</span></font>):</p>
+<a name="XMLSECTRANSFORMXSLTGETKLASS"></a><h3>xmlSecTransformXsltGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformXsltGetKlass         (void);</pre>
+<p>XSLT transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-XSLT"><span class="TYPE">sec-XSLT</span></gtkdoclink>):</p>
 <p>The normative specification for XSL Transformations is [XSLT]. 
 Specification of a namespace-qualified stylesheet element, which MUST be 
 the sole child of the Transform element, indicates that the specified style 
@@ -3298,29 +3107,27 @@ then the result of these steps is logically equivalent [XHTML].</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17949"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to XSLT transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17276"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to XSLT transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17954"></a><h3>
-<a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NID"></a>xmlSecTransformRemoveXmlTagsC14NId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformRemoveXmlTagsC14NId</pre>
+<a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NID"></a><h3>xmlSecTransformRemoveXmlTagsC14NId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformRemoveXmlTagsC14NId</pre>
 <p>The "remove all xml tags" transform klass (used before base64 transforms).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17962"></a><h3>
-<a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS"></a>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformRemoveXmlTagsC14NGetKlass
-                                            (void);</pre>
-<p>The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-Base-64</span></font>):
+<a name="XMLSECTRANSFORMREMOVEXMLTAGSC14NGETKLASS"></a><h3>xmlSecTransformRemoveXmlTagsC14NGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformRemoveXmlTagsC14NGetKlass
+                                                        (void);</pre>
+<p>The "remove xml tags" transform klass (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-BASE-64"><span class="TYPE">sec-Base-64</span></gtkdoclink>):
 Base64 transform requires an octet stream for input. If an XPath node-set 
 (or sufficiently functional alternative) is given as input, then it is 
 converted to an octet stream by performing operations logically equivalent 
-to 1) applying an XPath transform with expression self::<font><code class="FUNCTION">text()</code></font>, then 2) 
+to 1) applying an XPath transform with expression self::<gtkdoclink href="TEXT"><code class="FUNCTION">text()</code></gtkdoclink>, then 2) 
 taking the string-value of the node-set. Thus, if an XML element is 
 identified by a barename XPointer in the Reference URI, and its content 
 consists solely of base64 encoded character data, then this transform 
@@ -3330,15 +3137,14 @@ processing instructions. The output of this transform is an octet stream.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17976"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>"remove xml tags" transform id.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17301"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> "remove xml tags" transform id.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17981"></a><h3>
-<a name="XMLSECTRANSFORMVISA3DHACKID"></a>xmlSecTransformVisa3DHackId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecTransformVisa3DHackId</pre>
+<a name="XMLSECTRANSFORMVISA3DHACKID"></a><h3>xmlSecTransformVisa3DHackId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecTransformVisa3DHackId</pre>
 <p>Selects node subtree by given node id string. The only reason why we need this 
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows 
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate 
@@ -3347,10 +3153,8 @@ such expressions thru XPath/XPointer engine, we need to have this hack here.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN17989"></a><h3>
-<a name="XMLSECTRANSFORMVISA3DHACKGETKLASS"></a>xmlSecTransformVisa3DHackGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font> xmlSecTransformVisa3DHackGetKlass
-                                            (void);</pre>
+<a name="XMLSECTRANSFORMVISA3DHACKGETKLASS"></a><h3>xmlSecTransformVisa3DHackGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecTransformId</font>   xmlSecTransformVisa3DHackGetKlass   (void);</pre>
 <p>The Visa3DHack transform klass. The only reason why we need this 
 is Visa3D protocol. It doesn't follow XML/XPointer/XMLDSig specs and allows 
 invalid XPointer expressions in the URI attribute. Since we couldn't evaluate 
@@ -3358,38 +3162,37 @@ such expressions thru XPath/XPointer engine, we need to have this hack here.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN17999"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>Visa3DHack transform klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17322"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> Visa3DHack transform klass.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18004"></a><h3>
-<a name="XMLSECTRANSFORMVISA3DHACKSETID"></a>xmlSecTransformVisa3DHackSetID ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecTransformVisa3DHackSetID  (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
-                                             const <font>xmlChar</font> *id);</pre>
-<p>Sets the ID value for an Visa3DHack <var class="PARAMETER">transform</var>.</p>
+<a name="XMLSECTRANSFORMVISA3DHACKSETID"></a><h3>xmlSecTransformVisa3DHackSetID ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecTransformVisa3DHackSetID      (<a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> transform,
+                                                         const <font>xmlChar</font> *id);</pre>
+<p>Sets the ID value for an Visa3DHack <code class="PARAMETER">transform</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18017"><span style="white-space: nowrap"><var class="PARAMETER">transform</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17339"><span style="white-space: nowrap"><code class="PARAMETER">transform</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to Visa3DHack transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18022"><span style="white-space: nowrap"><var class="PARAMETER">id</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17344"><span style="white-space: nowrap"><code class="PARAMETER">id</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the ID value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18027"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17349"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-templates.html"><b>&lt;&lt;&lt;templates</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-version.html"><b>version&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-templates.html"><b>&lt;&lt;&lt; templates</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-version.html"><b>version &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-key.html b/docs/api/xmlsec-verify-with-key.html
index ab1c50e..a2cef10 100644
--- a/docs/api/xmlsec-verify-with-key.html
+++ b/docs/api/xmlsec-verify-with-key.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifying a signature with a single key.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Signing with X509 certificate." href="xmlsec-examples-sign-x509.html">
 <link rel="NEXT" title="Verifying a signature with keys manager." href="xmlsec-verify-with-keys-mngr.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -293,8 +292,8 @@ done:
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-examples-sign-x509.html"><b>&lt;&lt;&lt;Signing with X509 certificate.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-keys-mngr.html"><b>Verifying a signature with keys manager.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-examples-sign-x509.html"><b>&lt;&lt;&lt; Signing with X509 certificate.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-keys-mngr.html"><b>Verifying a signature with keys manager. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-keys-mngr.html b/docs/api/xmlsec-verify-with-keys-mngr.html
index 4250e5f..88f3b85 100644
--- a/docs/api/xmlsec-verify-with-keys-mngr.html
+++ b/docs/api/xmlsec-verify-with-keys-mngr.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifying a signature with keys manager.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Verifying a signature with a single key." href="xmlsec-verify-with-key.html">
 <link rel="NEXT" title="Verifying a signature with X509 certificates." href="xmlsec-verify-with-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -363,8 +362,8 @@ done:
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-key.html"><b>&lt;&lt;&lt;Verifying a signature with a single key.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-x509.html"><b>Verifying a signature with X509 certificates.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-key.html"><b>&lt;&lt;&lt; Verifying a signature with a single key.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-x509.html"><b>Verifying a signature with X509 certificates. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-restrictions.html b/docs/api/xmlsec-verify-with-restrictions.html
index b70318e..0350798 100644
--- a/docs/api/xmlsec-verify-with-restrictions.html
+++ b/docs/api/xmlsec-verify-with-restrictions.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifying a signature with additional restrictions.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Verifying a signature with X509 certificates." href="xmlsec-verify-with-x509.html">
 <link rel="NEXT" title="Encrypting data with a template file." href="xmlsec-encrypt-template-file.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -691,8 +690,8 @@ NJ2D&lt;/X509Certificate&gt;
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-x509.html"><b>&lt;&lt;&lt;Verifying a signature with X509 certificates.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-encrypt-template-file.html"><b>Encrypting data with a template file.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-x509.html"><b>&lt;&lt;&lt; Verifying a signature with X509 certificates.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-encrypt-template-file.html"><b>Encrypting data with a template file. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-verify-with-x509.html b/docs/api/xmlsec-verify-with-x509.html
index 4cb2294..5dbd2e0 100644
--- a/docs/api/xmlsec-verify-with-x509.html
+++ b/docs/api/xmlsec-verify-with-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Verifying a signature with X509 certificates.</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="Examples." href="xmlsec-examples.html">
 <link rel="PREVIOUS" title="Verifying a signature with keys manager." href="xmlsec-verify-with-keys-mngr.html">
 <link rel="NEXT" title="Verifying a signature with additional restrictions." href="xmlsec-verify-with-restrictions.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -345,8 +344,8 @@ done:
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-verify-with-keys-mngr.html"><b>&lt;&lt;&lt;Verifying a signature with keys manager.</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-verify-with-restrictions.html"><b>Verifying a signature with additional restrictions.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-verify-with-keys-mngr.html"><b>&lt;&lt;&lt; Verifying a signature with keys manager.</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-verify-with-restrictions.html"><b>Verifying a signature with additional restrictions. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-version.html b/docs/api/xmlsec-version.html
index 231fcf7..19cf308 100644
--- a/docs/api/xmlsec-version.html
+++ b/docs/api/xmlsec-version.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>version</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="transforms" href="xmlsec-transforms.html">
 <link rel="NEXT" title="xmldsig" href="xmlsec-xmldsig.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,26 +87,23 @@
 <h1>
 <a name="XMLSEC-VERSION"></a>version</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18037"></a><h2>Name</h2>version--Version macros.</div>
+<a name="AEN17359"></a><h2>Name</h2>version -- Version macros.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN18040"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-version.html#XMLSEC-VERSION-CAPS">XMLSEC_VERSION</a>
-#define     <a href="xmlsec-version.html#XMLSEC-VERSION-MAJOR-CAPS">XMLSEC_VERSION_MAJOR</a>
-#define     <a href="xmlsec-version.html#XMLSEC-VERSION-MINOR-CAPS">XMLSEC_VERSION_MINOR</a>
-#define     <a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR-CAPS">XMLSEC_VERSION_SUBMINOR</a>
-#define     <a href="xmlsec-version.html#XMLSEC-VERSION-INFO-CAPS">XMLSEC_VERSION_INFO</a></pre>
+<a name="XMLSEC-VERSION.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-version.html#XMLSEC-VERSION--CAPS">XMLSEC_VERSION</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MAJOR--CAPS">XMLSEC_VERSION_MAJOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-MINOR--CAPS">XMLSEC_VERSION_MINOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-SUBMINOR--CAPS">XMLSEC_VERSION_SUBMINOR</a>
+#define             <a href="xmlsec-version.html#XMLSEC-VERSION-INFO--CAPS">XMLSEC_VERSION_INFO</a></pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN18048"></a><h2>Description</h2>
+<a name="XMLSEC-VERSION.DESCRIPTION"></a><h2>Description</h2>
 <p>Version macros.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN18051"></a><h2>Details</h2>
+<a name="XMLSEC-VERSION.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN18053"></a><h3>
-<a name="XMLSEC-VERSION-CAPS"></a>XMLSEC_VERSION</h3>
+<a name="XMLSEC-VERSION--CAPS"></a><h3>XMLSEC_VERSION</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION			"1.2.13"</pre>
 <p>The library version string in the format
 "&lt;major-number&gt;.&lt;minor-number&gt;.&lt;sub-minor-number&gt;".</p>
@@ -115,32 +111,28 @@
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18061"></a><h3>
-<a name="XMLSEC-VERSION-MAJOR-CAPS"></a>XMLSEC_VERSION_MAJOR</h3>
+<a name="XMLSEC-VERSION-MAJOR--CAPS"></a><h3>XMLSEC_VERSION_MAJOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_MAJOR		1</pre>
 <p>The library major version number.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18069"></a><h3>
-<a name="XMLSEC-VERSION-MINOR-CAPS"></a>XMLSEC_VERSION_MINOR</h3>
+<a name="XMLSEC-VERSION-MINOR--CAPS"></a><h3>XMLSEC_VERSION_MINOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_MINOR		2</pre>
 <p>The library minor version number.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18077"></a><h3>
-<a name="XMLSEC-VERSION-SUBMINOR-CAPS"></a>XMLSEC_VERSION_SUBMINOR</h3>
+<a name="XMLSEC-VERSION-SUBMINOR--CAPS"></a><h3>XMLSEC_VERSION_SUBMINOR</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_SUBMINOR		13</pre>
 <p>The library sub-minor version number.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18085"></a><h3>
-<a name="XMLSEC-VERSION-INFO-CAPS"></a>XMLSEC_VERSION_INFO</h3>
+<a name="XMLSEC-VERSION-INFO--CAPS"></a><h3>XMLSEC_VERSION_INFO</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_VERSION_INFO		"3:13: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>
@@ -148,8 +140,8 @@
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-transforms.html"><b>&lt;&lt;&lt;transforms</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmldsig.html"><b>xmldsig&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-transforms.html"><b>&lt;&lt;&lt; transforms</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmldsig.html"><b>xmldsig &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-x509.html b/docs/api/xmlsec-x509.html
index a499978..eb9444c 100644
--- a/docs/api/xmlsec-x509.html
+++ b/docs/api/xmlsec-x509.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>x509</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="xmltree" href="xmlsec-xmltree.html">
 <link rel="NEXT" title="XML Security Library for OpenSLL API Reference." href="xmlsec-openssl-ref.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,110 +87,101 @@
 <h1>
 <a name="XMLSEC-X509"></a>x509</h1>
 <div class="REFNAMEDIV">
-<a name="AEN21764"></a><h2>Name</h2>x509--<a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</div>
+<a name="AEN21007"></a><h2>Name</h2>x509 -- <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN21768"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</a>
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</a>
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</a>
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE-CAPS">XMLSEC_X509DATA_SKI_NODE</a>
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE-CAPS">XMLSEC_X509DATA_CRL_NODE</a>
-#define     <a href="xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT-CAPS">XMLSEC_X509DATA_DEFAULT</a>
-<font>int</font>         <a href="xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">xmlSecX509DataGetNodeContent</a>    (<font>xmlNodePtr</font> node,
-                                             <font>int</font> deleteChildren,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSEC-X509.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS">XMLSEC_X509DATA_CERTIFICATE_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS">XMLSEC_X509DATA_SUBJECTNAME_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS">XMLSEC_X509DATA_ISSUERSERIAL_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-SKI-NODE--CAPS">XMLSEC_X509DATA_SKI_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-CRL-NODE--CAPS">XMLSEC_X509DATA_CRL_NODE</a>
+#define             <a href="xmlsec-x509.html#XMLSEC-X509DATA-DEFAULT--CAPS">XMLSEC_X509DATA_DEFAULT</a>
+<font>int</font>                 <a href="xmlsec-x509.html#XMLSECX509DATAGETNODECONTENT">xmlSecX509DataGetNodeContent</a>        (<font>xmlNodePtr</font> node,
+                                                         <font>int</font> deleteChildren,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN21782"></a><h2>Description</h2>
+<a name="XMLSEC-X509.DESCRIPTION"></a><h2>Description</h2>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node parser.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN21786"></a><h2>Details</h2>
+<a name="XMLSEC-X509.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN21788"></a><h3>
-<a name="XMLSEC-X509DATA-CERTIFICATE-NODE-CAPS"></a>XMLSEC_X509DATA_CERTIFICATE_NODE</h3>
+<a name="XMLSEC-X509DATA-CERTIFICATE-NODE--CAPS"></a><h3>XMLSEC_X509DATA_CERTIFICATE_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_CERTIFICATE_NODE			0x00000001</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Certificate"; target="_top">&lt;dsig:X509Certificate/&gt;</a> node found or would be written back.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21797"></a><h3>
-<a name="XMLSEC-X509DATA-SUBJECTNAME-NODE-CAPS"></a>XMLSEC_X509DATA_SUBJECTNAME_NODE</h3>
+<a name="XMLSEC-X509DATA-SUBJECTNAME-NODE--CAPS"></a><h3>XMLSEC_X509DATA_SUBJECTNAME_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_SUBJECTNAME_NODE			0x00000002</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509SubjectName"; target="_top">&lt;dsig:X509SubjectName/&gt;</a> node found or would be written back.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21806"></a><h3>
-<a name="XMLSEC-X509DATA-ISSUERSERIAL-NODE-CAPS"></a>XMLSEC_X509DATA_ISSUERSERIAL_NODE</h3>
+<a name="XMLSEC-X509DATA-ISSUERSERIAL-NODE--CAPS"></a><h3>XMLSEC_X509DATA_ISSUERSERIAL_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_ISSUERSERIAL_NODE			0x00000004</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509IssuerSerial"; target="_top">&lt;dsig:X509IssuerSerial/&gt;</a> node found or would be written back.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21815"></a><h3>
-<a name="XMLSEC-X509DATA-SKI-NODE-CAPS"></a>XMLSEC_X509DATA_SKI_NODE</h3>
+<a name="XMLSEC-X509DATA-SKI-NODE--CAPS"></a><h3>XMLSEC_X509DATA_SKI_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_SKI_NODE				0x00000008</pre>
 <p>&lt;dsig:/X509SKI&gt; node found or would be written back.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21823"></a><h3>
-<a name="XMLSEC-X509DATA-CRL-NODE-CAPS"></a>XMLSEC_X509DATA_CRL_NODE</h3>
+<a name="XMLSEC-X509DATA-CRL-NODE--CAPS"></a><h3>XMLSEC_X509DATA_CRL_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_X509DATA_CRL_NODE				0x00000010</pre>
 <p><a href="http://www.w3.org/TR/xmldsig-core/#sec-X509CRL"; target="_top">&lt;dsig:X509CRL/&gt;</a> node found or would be written back.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21832"></a><h3>
-<a name="XMLSEC-X509DATA-DEFAULT-CAPS"></a>XMLSEC_X509DATA_DEFAULT</h3>
-<pre class="PROGRAMLISTING">#define     XMLSEC_X509DATA_DEFAULT</pre>
+<a name="XMLSEC-X509DATA-DEFAULT--CAPS"></a><h3>XMLSEC_X509DATA_DEFAULT</h3>
+<pre class="PROGRAMLISTING">#define             XMLSEC_X509DATA_DEFAULT</pre>
 <p>Default set of nodes to write in case of empty
 <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node template.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21841"></a><h3>
-<a name="XMLSECX509DATAGETNODECONTENT"></a>xmlSecX509DataGetNodeContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecX509DataGetNodeContent    (<font>xmlNodePtr</font> node,
-                                             <font>int</font> deleteChildren,
-                                             <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
+<a name="XMLSECX509DATAGETNODECONTENT"></a><h3>xmlSecX509DataGetNodeContent ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecX509DataGetNodeContent        (<font>xmlNodePtr</font> node,
+                                                         <font>int</font> deleteChildren,
+                                                         <a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtxPtr</a> keyInfoCtx);</pre>
 <p>Reads the contents of <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node and returns it as
 a bits mask.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21855"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21091"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21861"><span style="white-space: nowrap"><var class="PARAMETER">deleteChildren</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21097"><span style="white-space: nowrap"><code class="PARAMETER">deleteChildren</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the flag that indicates whether to remove node children after reading.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21866"><span style="white-space: nowrap"><var class="PARAMETER">keyInfoCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN21102"><span style="white-space: nowrap"><code class="PARAMETER">keyInfoCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21872"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the bit mask representing the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node content
+<td align="LEFT" valign="TOP"><a name="AEN21108"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the bit mask representing the <a href="http://www.w3.org/TR/xmldsig-core/#sec-X509Data"; target="_top">&lt;dsig:X509Data/&gt;</a> node content
 or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmltree.html"><b>&lt;&lt;&lt;xmltree</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-openssl-ref.html"><b>XML Security Library for OpenSLL API Reference.&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmltree.html"><b>&lt;&lt;&lt; xmltree</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-openssl-ref.html"><b>XML Security Library for OpenSLL API Reference. &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmldsig.html b/docs/api/xmlsec-xmldsig.html
index 04cd386..59d2e30 100644
--- a/docs/api/xmlsec-xmldsig.html
+++ b/docs/api/xmlsec-xmldsig.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>xmldsig</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="version" href="xmlsec-version.html">
 <link rel="NEXT" title="xmlenc" href="xmlsec-xmlenc.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,73 +87,64 @@
 <h1>
 <a name="XMLSEC-XMLDSIG"></a>xmldsig</h1>
 <div class="REFNAMEDIV">
-<a name="AEN18098"></a><h2>Name</h2>xmldsig--XML Digital Signature support.</div>
+<a name="AEN17415"></a><h2>Name</h2>xmldsig -- XML Digital Signature support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN18101"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-enum        <a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a>;
-#define     <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</a>
-#define     <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</a>
-#define     <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</a>
-#define     <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</a>
-#define     <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</a>
-struct      <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtx</a>;
-<font>xmlSecDSigCtxPtr</font> <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE">xmlSecDSigCtxCreate</a>        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY">xmlSecDSigCtxDestroy</a>            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE">xmlSecDSigCtxInitialize</a>         (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE">xmlSecDSigCtxFinalize</a>           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">xmlSecDSigCtxSign</a>               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlNodePtr</font> tmpl);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">xmlSecDSigCtxVerify</a>             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlNodePtr</font> node);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLEREFERENCETRANSFORM">xmlSecDSigCtxEnableReferenceTransform</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlSecTransformId</font> transformId);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLESIGNATURETRANSFORM">xmlSecDSigCtxEnableSignatureTransform</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlSecTransformId</font> transformId);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXGETPRESIGNBUFFER">xmlSecDSigCtxGetPreSignBuffer</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGDUMP">xmlSecDSigCtxDebugDump</a>          (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGXMLDUMP">xmlSecDSigCtxDebugXmlDump</a>       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>FILE</font> *output);
-enum        <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a>;
-struct      <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtx</a>;
-<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">xmlSecDSigReferenceCtxCreate</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY">xmlSecDSigReferenceCtxDestroy</a>   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE">xmlSecDSigReferenceCtxInitialize</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE">xmlSecDSigReferenceCtxFinalize</a>  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>int</font>         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXPROCESSNODE">xmlSecDSigReferenceCtxProcessNode</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>xmlNodePtr</font> node);
-<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER">xmlSecDSigReferenceCtxGetPreDigestBuffer</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">xmlSecDSigReferenceCtxDebugDump</a> (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">xmlSecDSigReferenceCtxDebugXmlDump</a>
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>FILE</font> *output);
-#define     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTID">xmlSecDSigReferenceCtxListId</a>
-<font>xmlSecPtrListId</font> <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTGETKLASS">xmlSecDSigReferenceCtxListGetKlass</a>
-                                            (void);</pre>
+<a name="XMLSEC-XMLDSIG.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">enum                <a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a>;
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS">XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</a>
+#define             <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS">XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</a>
+struct              <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtx</a>;
+<font>xmlSecDSigCtxPtr</font>    <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE">xmlSecDSigCtxCreate</a>                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY">xmlSecDSigCtxDestroy</a>                (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE">xmlSecDSigCtxInitialize</a>             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE">xmlSecDSigCtxFinalize</a>               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN">xmlSecDSigCtxSign</a>                   (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlNodePtr</font> tmpl);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY">xmlSecDSigCtxVerify</a>                 (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlNodePtr</font> node);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLEREFERENCETRANSFORM">xmlSecDSigCtxEnableReferenceTransform</a>
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXENABLESIGNATURETRANSFORM">xmlSecDSigCtxEnableSignatureTransform</a>
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlSecTransformId</font> transformId);
+<font>xmlSecBufferPtr</font>     <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXGETPRESIGNBUFFER">xmlSecDSigCtxGetPreSignBuffer</a>       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGDUMP">xmlSecDSigCtxDebugDump</a>              (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDEBUGXMLDUMP">xmlSecDSigCtxDebugXmlDump</a>           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>FILE</font> *output);
+enum                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a>;
+struct              <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtx</a>;
+<font>xmlSecDSigReferenceCtxPtr</font>  <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE">xmlSecDSigReferenceCtxCreate</a> (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY">xmlSecDSigReferenceCtxDestroy</a>       (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE">xmlSecDSigReferenceCtxInitialize</a>    (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE">xmlSecDSigReferenceCtxFinalize</a>      (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
+<font>int</font>                 <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXPROCESSNODE">xmlSecDSigReferenceCtxProcessNode</a>   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>xmlNodePtr</font> node);
+<a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER">xmlSecDSigReferenceCtxGetPreDigestBuffer</a>
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGDUMP">xmlSecDSigReferenceCtxDebugDump</a>     (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDEBUGXMLDUMP">xmlSecDSigReferenceCtxDebugXmlDump</a>  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>FILE</font> *output);
+#define             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTID">xmlSecDSigReferenceCtxListId</a>
+<font>xmlSecPtrListId</font>     <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXLISTGETKLASS">xmlSecDSigReferenceCtxListGetKlass</a>  (void);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN18186"></a><h2>Description</h2>
+<a name="XMLSEC-XMLDSIG.DESCRIPTION"></a><h2>Description</h2>
 <p>XML Digital Signature support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN18189"></a><h2>Details</h2>
+<a name="XMLSEC-XMLDSIG.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN18191"></a><h3>
-<a name="XMLSECDSIGSTATUS"></a>enum xmlSecDSigStatus</h3>
+<a name="XMLSECDSIGSTATUS"></a><h3>enum xmlSecDSigStatus</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlSecDSigStatusUnknown = 0,
     xmlSecDSigStatusSucceeded,
@@ -165,31 +155,29 @@ struct      <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigRefer
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18200"><span style="white-space: nowrap"><var class="LITERAL">xmlSecDSigStatusUnknown</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSUNKNOWN"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusUnknown</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	the status is unknow.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18205"><span style="white-space: nowrap"><var class="LITERAL">xmlSecDSigStatusSucceeded</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSSUCCEEDED"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusSucceeded</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the processing succeeded.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18210"><span style="white-space: nowrap"><var class="LITERAL">xmlSecDSigStatusInvalid</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECDSIGSTATUSINVALID"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigStatusInvalid</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the processing failed.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18215"></a><h3>
-<a name="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS-CAPS"></a>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</h3>
+<a name="XMLSEC-DSIG-FLAGS-IGNORE-MANIFESTS--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_IGNORE_MANIFESTS			0x00000001</pre>
 <p>If this flag is set then <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifests"; target="_top">&lt;dsig:Manifests/&gt;</a> nodes will not be processed.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18224"></a><h3>
-<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS"></a>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES		0x00000002</pre>
 <p>If this flag is set then pre-digest buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;dsig:KeyInfo/&gt;</a> element will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
@@ -197,8 +185,7 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-KeyInfo"; target="_top">&lt;ds
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18236"></a><h3>
-<a name="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS"></a>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES		0x00000004</pre>
 <p>If this flag is set then pre-digest buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> child
 of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> element will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
@@ -206,8 +193,7 @@ of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;d
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18248"></a><h3>
-<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS"></a>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</h3>
+<a name="XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_STORE_SIGNATURE			0x00000008</pre>
 <p>If this flag is set then pre-signature buffer for <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a>
 element processing will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"><span class="TYPE">xmlSecDSigCtx</span></a>.</p>
@@ -215,8 +201,7 @@ element processing will be stored in <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX"
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18259"></a><h3>
-<a name="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK-CAPS"></a>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</h3>
+<a name="XMLSEC-DSIG-FLAGS-USE-VISA3D-HACK--CAPS"></a><h3>XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_DSIG_FLAGS_USE_VISA3D_HACK			0x00000010</pre>
 <p>If this flag is set then URI ID references are resolved directly
 without using XPointers. This allows one to sign/verify Visa3D
@@ -225,10 +210,8 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18267"></a><h3>
-<a name="XMLSECDSIGCTX"></a>struct xmlSecDSigCtx</h3>
+<a name="XMLSECDSIGCTX"></a><h3>struct xmlSecDSigCtx</h3>
 <pre class="PROGRAMLISTING">struct xmlSecDSigCtx {
-
     /* these data user can set before performing the operation */
     void*			userData;
     unsigned int		flags;
@@ -259,122 +242,121 @@ documents that don't follow XML, XPointer and XML DSig specifications.</p>
     /* reserved for future */
     void*			reserved0;
     void*			reserved1;    
-};						</pre>
+};</pre>
 <p>XML DSig processing context.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18276"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17586"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18282"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17592"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML Digital Signature processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18288"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17598"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML Digital Signature processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18294"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17604"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the reading key context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18300"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17610"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the writing key context (not used for signature verification).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18306"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17616"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18313"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledReferenceUris</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17623"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMURITYPE">xmlSecTransformUriType</a> <code class="STRUCTFIELD">enabledReferenceUris</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the URI types allowed for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18320"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">enabledReferenceTransforms</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17630"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrListPtr</a> <code class="STRUCTFIELD">enabledReferenceTransforms</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the list of transforms allowed in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18327"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">referencePreExecuteCallback</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17637"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTXPREEXECUTECALLBACK">xmlSecTransformCtxPreExecuteCallback</a> <code class="STRUCTFIELD">referencePreExecuteCallback</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>the callback for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node processing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18334"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defSignMethodId</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17644"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defSignMethodId</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the default signing method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18340"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defC14NMethodId</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17650"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defC14NMethodId</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the default c14n method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18346"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defDigestMethodId</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17656"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defDigestMethodId</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the default digest method klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18352"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">signKey</code></span></a></td>
-<td align="LEFT" valign="TOP"><p>			the signature key; application may set <font><span class="TYPE">signKey</span></font>
+<td align="LEFT" valign="TOP"><a name="AEN17662"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">signKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>			the signature key; application may set <gtkdoclink href="SIGNKEY"><span class="TYPE">signKey</span></gtkdoclink>
 			before calling <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXSIGN"><span class="TYPE">xmlSecDSigCtxSign</span></a> or <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXVERIFY"><span class="TYPE">xmlSecDSigCtxVerify</span></a>
 			functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18364"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17674"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the operation: sign or verify.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18370"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17680"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to signature (not valid for signature verificaction).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18376"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17686"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signatuire"; target="_top">&lt;dsig:Signatuire/&gt;</a> procesisng status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18383"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">signMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17693"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">signMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to signature transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18389"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">c14nMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17699"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">c14nMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to c14n transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18395"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preSignMemBufMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17705"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preSignMemBufMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to binary buffer right before signature
-			(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> flag is set).</p></td>
+			(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> flag is set).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18403"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">signValueNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17713"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">signValueNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignatureValue"; target="_top">&lt;dsig:SignatureValue/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18410"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17720"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>				the pointer to Id attribute of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18417"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">signedInfoReferences</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17727"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">signedInfoReferences</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> node.		</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18424"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">manifestReferences</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17734"><span style="white-space: nowrap"><a href="xmlsec-list.html#XMLSECPTRLIST">xmlSecPtrList</a> <code class="STRUCTFIELD">manifestReferences</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the list of references in <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18431"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17741"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18437"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17747"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18443"></a><h3>
-<a name="XMLSECDSIGCTXCREATE"></a>xmlSecDSigCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecDSigCtxPtr</font> xmlSecDSigCtxCreate        (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECDSIGCTXCREATE"></a><h3>xmlSecDSigCtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecDSigCtxPtr</font>    xmlSecDSigCtxCreate                 (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> element processing context.
 The caller is responsible for destroying returend object by calling 
 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXDESTROY"><span class="TYPE">xmlSecDSigCtxDestroy</span></a> function.</p>
@@ -382,35 +364,33 @@ The caller is responsible for destroying returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18457"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17766"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18462"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated context object or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN17771"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18467"></a><h3>
-<a name="XMLSECDSIGCTXDESTROY"></a>xmlSecDSigCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigCtxDestroy            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<a name="XMLSECDSIGCTXDESTROY"></a><h3>xmlSecDSigCtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDestroy                (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXCREATE"><span class="TYPE">xmlSecDSigCtxCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18480"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17788"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18486"></a><h3>
-<a name="XMLSECDSIGCTXINITIALIZE"></a>xmlSecDSigCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigCtxInitialize         (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECDSIGCTXINITIALIZE"></a><h3>xmlSecDSigCtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxInitialize             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> element processing context.
 The caller is responsible for cleaing up returend object by calling 
 <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXFINALIZE"><span class="TYPE">xmlSecDSigCtxFinalize</span></a> function.</p>
@@ -418,198 +398,188 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18501"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17808"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18507"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17814"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18512"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17819"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18517"></a><h3>
-<a name="XMLSECDSIGCTXFINALIZE"></a>xmlSecDSigCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigCtxFinalize           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
-<p>Cleans up <var class="PARAMETER">dsigCtx</var> object initialized with <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE"><span class="TYPE">xmlSecDSigCtxInitialize</span></a> function.</p>
+<a name="XMLSECDSIGCTXFINALIZE"></a><h3>xmlSecDSigCtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxFinalize               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<p>Cleans up <code class="PARAMETER">dsigCtx</code> object initialized with <a href="xmlsec-xmldsig.html#XMLSECDSIGCTXINITIALIZE"><span class="TYPE">xmlSecDSigCtxInitialize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18531"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17837"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18537"></a><h3>
-<a name="XMLSECDSIGCTXSIGN"></a>xmlSecDSigCtxSign ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigCtxSign               (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlNodePtr</font> tmpl);</pre>
-<p>Signs the data as described in <var class="PARAMETER">tmpl</var> node.</p>
+<a name="XMLSECDSIGCTXSIGN"></a><h3>xmlSecDSigCtxSign ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxSign                   (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlNodePtr</font> tmpl);</pre>
+<p>Signs the data as described in <code class="PARAMETER">tmpl</code> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18550"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17855"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18556"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17861"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node with signature template.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18562"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17867"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18567"></a><h3>
-<a name="XMLSECDSIGCTXVERIFY"></a>xmlSecDSigCtxVerify ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigCtxVerify             (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>Vaidates signature in the <var class="PARAMETER">node</var>. The verification result is returned
-in <font><span class="TYPE">status</span></font> member of the <var class="PARAMETER">dsigCtx</var> object.</p>
+<a name="XMLSECDSIGCTXVERIFY"></a><h3>xmlSecDSigCtxVerify ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxVerify                 (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>Vaidates signature in the <code class="PARAMETER">node</code>. The verification result is returned
+in <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of the <code class="PARAMETER">dsigCtx</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18583"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17887"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18589"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17893"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer with <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18595"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success (check <font><span class="TYPE">status</span></font> member of <var class="PARAMETER">dsigCtx</var> to get 
+<td align="LEFT" valign="TOP"><a name="AEN17899"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success (check <gtkdoclink href="STATUS"><span class="TYPE">status</span></gtkdoclink> member of <code class="PARAMETER">dsigCtx</code> to get 
 signature verification result) or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18603"></a><h3>
-<a name="XMLSECDSIGCTXENABLEREFERENCETRANSFORM"></a>xmlSecDSigCtxEnableReferenceTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigCtxEnableReferenceTransform
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
-<p>Enables <var class="PARAMETER">transformId</var> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> elements processing.</p>
+<a name="XMLSECDSIGCTXENABLEREFERENCETRANSFORM"></a><h3>xmlSecDSigCtxEnableReferenceTransform ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxEnableReferenceTransform
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<p>Enables <code class="PARAMETER">transformId</code> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> elements processing.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18617"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17920"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18623"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17926"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18628"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17931"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18633"></a><h3>
-<a name="XMLSECDSIGCTXENABLESIGNATURETRANSFORM"></a>xmlSecDSigCtxEnableSignatureTransform ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigCtxEnableSignatureTransform
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>xmlSecTransformId</font> transformId);</pre>
-<p>Enables <var class="PARAMETER">transformId</var> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> element processing.</p>
+<a name="XMLSECDSIGCTXENABLESIGNATURETRANSFORM"></a><h3>xmlSecDSigCtxEnableSignatureTransform ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigCtxEnableSignatureTransform
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>xmlSecTransformId</font> transformId);</pre>
+<p>Enables <code class="PARAMETER">transformId</code> for <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> element processing.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18647"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17949"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18653"><span style="white-space: nowrap"><var class="PARAMETER">transformId</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17955"><span style="white-space: nowrap"><code class="PARAMETER">transformId</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the transform klass.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18658"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17960"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18663"></a><h3>
-<a name="XMLSECDSIGCTXGETPRESIGNBUFFER"></a>xmlSecDSigCtxGetPreSignBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> xmlSecDSigCtxGetPreSignBuffer
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
+<a name="XMLSECDSIGCTXGETPRESIGNBUFFER"></a><h3>xmlSecDSigCtxGetPreSignBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecDSigCtxGetPreSignBuffer       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx);</pre>
 <p>Gets pointer to the buffer with serialized <a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> element
 just before signature claculation (valid if and only if 
-<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> context flag is set.</p>
+<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNATURE--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNATURE</span></a> context flag is set.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18677"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN17978"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18683"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN17984"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18688"></a><h3>
-<a name="XMLSECDSIGCTXDEBUGDUMP"></a>xmlSecDSigCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigCtxDebugDump          (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the debug information about <var class="PARAMETER">dsigCtx</var> to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECDSIGCTXDEBUGDUMP"></a><h3>xmlSecDSigCtxDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDebugDump              (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the debug information about <code class="PARAMETER">dsigCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18702"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18002"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18708"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18008"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18713"></a><h3>
-<a name="XMLSECDSIGCTXDEBUGXMLDUMP"></a>xmlSecDSigCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigCtxDebugXmlDump       (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the debug information about <var class="PARAMETER">dsigCtx</var> to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECDSIGCTXDEBUGXMLDUMP"></a><h3>xmlSecDSigCtxDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigCtxDebugXmlDump           (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the debug information about <code class="PARAMETER">dsigCtx</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18727"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18026"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18733"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18032"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18738"></a><h3>
-<a name="XMLSECDSIGREFERENCEORIGIN"></a>enum xmlSecDSigReferenceOrigin</h3>
+<a name="XMLSECDSIGREFERENCEORIGIN"></a><h3>enum xmlSecDSigReferenceOrigin</h3>
 <pre class="PROGRAMLISTING">typedef enum  {
     xmlSecDSigReferenceOriginSignedInfo,
     xmlSecDSigReferenceOriginManifest
@@ -620,21 +590,19 @@ node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target=
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18750"><span style="white-space: nowrap"><var class="LITERAL">xmlSecDSigReferenceOriginSignedInfo</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECDSIGREFERENCEORIGINSIGNEDINFO"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigReferenceOriginSignedInfo</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>reference in &lt;dsig:SignedInfo&gt; node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18755"><span style="white-space: nowrap"><var class="LITERAL">xmlSecDSigReferenceOriginManifest</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECDSIGREFERENCEORIGINMANIFEST"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecDSigReferenceOriginManifest</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p> 	reference &lt;dsig:Manifest&gt; node.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18760"></a><h3>
-<a name="XMLSECDSIGREFERENCECTX"></a>struct xmlSecDSigReferenceCtx</h3>
+<a name="XMLSECDSIGREFERENCECTX"></a><h3>struct xmlSecDSigReferenceCtx</h3>
 <pre class="PROGRAMLISTING">struct xmlSecDSigReferenceCtx {
-
     void*			userData;
     xmlSecDSigCtxPtr		dsigCtx;
     xmlSecDSigReferenceOrigin	origin;
@@ -657,70 +625,68 @@ node or in the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target=
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18770"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18067"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18776"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> <code class="STRUCTFIELD">dsigCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18073"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> <code class="STRUCTFIELD">dsigCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to "parent" <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18783"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> <code class="STRUCTFIELD">origin</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18080"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> <code class="STRUCTFIELD">origin</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the signature origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a>).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18791"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18088"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the reference processing transforms context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18797"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">digestMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18094"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">digestMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to digest transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18803"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18100"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to digest result.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18809"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18106"><span style="white-space: nowrap"><a href="xmlsec-xmldsig.html#XMLSECDSIGSTATUS">xmlSecDSigStatus</a> <code class="STRUCTFIELD">status</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the reference processing status.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18815"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preDigestMemBufMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18112"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">preDigestMemBufMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the pointer to binary buffer right before digest
 			(valid only if either
-			<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
-			<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flags are set).</p></td>
+			<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
+			<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flags are set).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18825"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18122"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>				the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node ID attribute. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18832"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18129"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">uri</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node URI attribute. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18839"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18136"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node Type attribute. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18846"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18143"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved0</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18852"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18149"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18858"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXCREATE"></a>xmlSecDSigReferenceCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> xmlSecDSigReferenceCtxCreate
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
+<a name="XMLSECDSIGREFERENCECTXCREATE"></a><h3>xmlSecDSigReferenceCtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecDSigReferenceCtxPtr</font>  xmlSecDSigReferenceCtxCreate (<a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
 <p>Creates new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context. Caller is responsible
 for destroying the returned context by calling <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXDESTROY"><span class="TYPE">xmlSecDSigReferenceCtxDestroy</span></a>
 function.</p>
@@ -728,40 +694,37 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18873"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18169"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18879"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18175"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18886"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly created context or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18182"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly created context or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18891"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXDESTROY"></a>xmlSecDSigReferenceCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigReferenceCtxDestroy   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<a name="XMLSECDSIGREFERENCECTXDESTROY"></a><h3>xmlSecDSigReferenceCtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDestroy       (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXCREATE"><span class="TYPE">xmlSecDSigReferenceCtxCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18904"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18199"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18910"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXINITIALIZE"></a>xmlSecDSigReferenceCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigReferenceCtxInitialize
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
-                                             <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
+<a name="XMLSECDSIGREFERENCECTXINITIALIZE"></a><h3>xmlSecDSigReferenceCtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigReferenceCtxInitialize    (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGCTX">xmlSecDSigCtxPtr</a> dsigCtx,
+                                                         <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCEORIGIN">xmlSecDSigReferenceOrigin</a> origin);</pre>
 <p>Initializes new <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context. Caller is responsible
 for cleaning up the returned context by calling <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXFINALIZE"><span class="TYPE">xmlSecDSigReferenceCtxFinalize</span></a>
 function.</p>
@@ -769,44 +732,41 @@ function.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18926"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18220"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18932"><span style="white-space: nowrap"><var class="PARAMETER">dsigCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18226"><span style="white-space: nowrap"><code class="PARAMETER">dsigCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to parent <a href="http://www.w3.org/TR/xmldsig-core/#sec-Signature"; target="_top">&lt;dsig:Signature/&gt;</a> node processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18938"><span style="white-space: nowrap"><var class="PARAMETER">origin</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18232"><span style="white-space: nowrap"><code class="PARAMETER">origin</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the reference origin (<a href="http://www.w3.org/TR/xmldsig-core/#sec-SignedInfo"; target="_top">&lt;dsig:SignedInfo/&gt;</a> or <a href="http://www.w3.org/TR/xmldsig-core/#sec-Manifest"; target="_top">&lt;dsig:Manifest/&gt;</a> node).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18945"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on succes or aa negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18239"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on succes or aa negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18950"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXFINALIZE"></a>xmlSecDSigReferenceCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigReferenceCtxFinalize  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<a name="XMLSECDSIGREFERENCECTXFINALIZE"></a><h3>xmlSecDSigReferenceCtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxFinalize      (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
 <p>Cleans up context object created with <a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTXINITIALIZE"><span class="TYPE">xmlSecDSigReferenceCtxInitialize</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN18963"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18256"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN18969"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXPROCESSNODE"></a>xmlSecDSigReferenceCtxProcessNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecDSigReferenceCtxProcessNode
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>The Reference Element (http://www.w3.org/TR/xmldsig-core/<font><span class="TYPE">sec-Reference</span></font>)</p>
+<a name="XMLSECDSIGREFERENCECTXPROCESSNODE"></a><h3>xmlSecDSigReferenceCtxProcessNode ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecDSigReferenceCtxProcessNode   (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>The Reference Element (http://www.w3.org/TR/xmldsig-core/<gtkdoclink href="SEC-REFERENCE"><span class="TYPE">sec-Reference</span></gtkdoclink>)</p>
 <p>Reference is an element that may occur one or more times. It specifies 
 a digest algorithm and digest value, and optionally an identifier of the 
 object being signed, the type of the object, and/or a list of transforms 
@@ -821,109 +781,102 @@ from elsewhere.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18984"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18276"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18990"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18282"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN18996"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on succes or aa negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18288"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on succes or aa negative value otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19001"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER"></a>xmlSecDSigReferenceCtxGetPreDigestBuffer ()</h3>
-<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> xmlSecDSigReferenceCtxGetPreDigestBuffer
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
+<a name="XMLSECDSIGREFERENCECTXGETPREDIGESTBUFFER"></a><h3>xmlSecDSigReferenceCtxGetPreDigestBuffer ()</h3>
+<pre class="PROGRAMLISTING"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a>     xmlSecDSigReferenceCtxGetPreDigestBuffer
+                                                        (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx);</pre>
 <p>Gets the results of <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> node processing just before digesting
-(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
-<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES-CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flas of signature context
+(valid only if <a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-SIGNEDINFO-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_SIGNEDINFO_REFERENCES</span></a> or
+<a href="xmlsec-xmldsig.html#XMLSEC-DSIG-FLAGS-STORE-MANIFEST-REFERENCES--CAPS"><span class="TYPE">XMLSEC_DSIG_FLAGS_STORE_MANIFEST_REFERENCES</span></a> flas of signature context
 is set).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19017"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18308"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19023"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the buffer or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18314"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the buffer or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19028"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXDEBUGDUMP"></a>xmlSecDSigReferenceCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigReferenceCtxDebugDump (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">dsigRefCtx</var> to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECDSIGREFERENCECTXDEBUGDUMP"></a><h3>xmlSecDSigReferenceCtxDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDebugDump     (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">dsigRefCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19042"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18332"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19048"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18338"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19053"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXDEBUGXMLDUMP"></a>xmlSecDSigReferenceCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecDSigReferenceCtxDebugXmlDump
-                                            (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">dsigRefCtx</var> to <var class="PARAMETER">output</var> in output format.</p>
+<a name="XMLSECDSIGREFERENCECTXDEBUGXMLDUMP"></a><h3>xmlSecDSigReferenceCtxDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecDSigReferenceCtxDebugXmlDump  (<a href="xmlsec-xmldsig.html#XMLSECDSIGREFERENCECTX">xmlSecDSigReferenceCtxPtr</a> dsigRefCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">dsigRefCtx</code> to <code class="PARAMETER">output</code> in output format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19067"><span style="white-space: nowrap"><var class="PARAMETER">dsigRefCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18356"><span style="white-space: nowrap"><code class="PARAMETER">dsigRefCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19073"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18362"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19078"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXLISTID"></a>xmlSecDSigReferenceCtxListId</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecDSigReferenceCtxListId</pre>
+<a name="XMLSECDSIGREFERENCECTXLISTID"></a><h3>xmlSecDSigReferenceCtxListId</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecDSigReferenceCtxListId</pre>
 <p>The references list klass.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19086"></a><h3>
-<a name="XMLSECDSIGREFERENCECTXLISTGETKLASS"></a>xmlSecDSigReferenceCtxListGetKlass ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font> xmlSecDSigReferenceCtxListGetKlass
-                                            (void);</pre>
+<a name="XMLSECDSIGREFERENCECTXLISTGETKLASS"></a><h3>xmlSecDSigReferenceCtxListGetKlass ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecPtrListId</font>     xmlSecDSigReferenceCtxListGetKlass  (void);</pre>
 <p>The <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing contexts list klass.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19097"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p><a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context list klass.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18384"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> <a href="http://www.w3.org/TR/xmldsig-core/#sec-Reference"; target="_top">&lt;dsig:Reference/&gt;</a> element processing context list klass.</p></td>
 </tr></tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-version.html"><b>&lt;&lt;&lt;version</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmlenc.html"><b>xmlenc&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-version.html"><b>&lt;&lt;&lt; version</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmlenc.html"><b>xmlenc &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmlenc.html b/docs/api/xmlsec-xmlenc.html
index 0fafacc..5996660 100644
--- a/docs/api/xmlsec-xmlenc.html
+++ b/docs/api/xmlsec-xmlenc.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>xmlenc</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="xmldsig" href="xmlsec-xmldsig.html">
 <link rel="NEXT" title="xmlsec" href="xmlsec-xmlsec.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,50 +87,47 @@
 <h1>
 <a name="XMLSEC-XMLENC"></a>xmlenc</h1>
 <div class="REFNAMEDIV">
-<a name="AEN19108"></a><h2>Name</h2>xmlenc--XML Encryption support.</div>
+<a name="AEN18395"></a><h2>Name</h2>xmlenc -- XML Encryption support.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN19111"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-enum        <a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a>;
-#define     <a href="xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</a>
-struct      <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
-<font>xmlSecEncCtxPtr</font> <a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE">xmlSecEncCtxCreate</a>          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY">xmlSecEncCtxDestroy</a>             (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXINITIALIZE">xmlSecEncCtxInitialize</a>          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
-<font>void</font>        <a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE">xmlSecEncCtxFinalize</a>            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXCOPYUSERPREF">xmlSecEncCtxCopyUserPref</a>        (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
-                                             <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);
-<font>void</font>        <a href="xmlsec-xmlenc.html#XMLSECENCCTXRESET">xmlSecEncCtxReset</a>               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXBINARYENCRYPT">xmlSecEncCtxBinaryEncrypt</a>       (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">xmlSecEncCtxXmlEncrypt</a>          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             <font>xmlNodePtr</font> node);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">xmlSecEncCtxUriEncrypt</a>          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             const <font>xmlChar</font> *uri);
-<font>int</font>         <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPT">xmlSecEncCtxDecrypt</a>             (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> node);
-<font>xmlSecBufferPtr</font> <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPTTOBUFFER">xmlSecEncCtxDecryptToBuffer</a> (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> node);
-<font>void</font>        <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGDUMP">xmlSecEncCtxDebugDump</a>           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGXMLDUMP">xmlSecEncCtxDebugXmlDump</a>        (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSEC-XMLENC.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">enum                <a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a>;
+#define             <a href="xmlsec-xmlenc.html#XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS">XMLSEC_ENC_RETURN_REPLACED_NODE</a>
+struct              <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
+<font>xmlSecEncCtxPtr</font>     <a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE">xmlSecEncCtxCreate</a>                  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY">xmlSecEncCtxDestroy</a>                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXINITIALIZE">xmlSecEncCtxInitialize</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);
+<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE">xmlSecEncCtxFinalize</a>                (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXCOPYUSERPREF">xmlSecEncCtxCopyUserPref</a>            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
+                                                         <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);
+<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXRESET">xmlSecEncCtxReset</a>                   (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXBINARYENCRYPT">xmlSecEncCtxBinaryEncrypt</a>           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXXMLENCRYPT">xmlSecEncCtxXmlEncrypt</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         <font>xmlNodePtr</font> node);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXURIENCRYPT">xmlSecEncCtxUriEncrypt</a>              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         const <font>xmlChar</font> *uri);
+<font>int</font>                 <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPT">xmlSecEncCtxDecrypt</a>                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> node);
+<font>xmlSecBufferPtr</font>     <a href="xmlsec-xmlenc.html#XMLSECENCCTXDECRYPTTOBUFFER">xmlSecEncCtxDecryptToBuffer</a>         (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> node);
+<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGDUMP">xmlSecEncCtxDebugDump</a>               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-xmlenc.html#XMLSECENCCTXDEBUGXMLDUMP">xmlSecEncCtxDebugXmlDump</a>            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>FILE</font> *output);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN19169"></a><h2>Description</h2>
+<a name="XMLSEC-XMLENC.DESCRIPTION"></a><h2>Description</h2>
 <p>XML Encryption support.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN19172"></a><h2>Details</h2>
+<a name="XMLSEC-XMLENC.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN19174"></a><h3>
-<a name="XMLENCCTXMODE"></a>enum xmlEncCtxMode</h3>
+<a name="XMLENCCTXMODE"></a><h3>enum xmlEncCtxMode</h3>
 <pre class="PROGRAMLISTING">typedef enum {
     xmlEncCtxModeEncryptedData = 0,
     xmlEncCtxModeEncryptedKey
@@ -141,29 +137,26 @@ struct      <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19185"><span style="white-space: nowrap"><var class="LITERAL">xmlEncCtxModeEncryptedData</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLENCCTXMODEENCRYPTEDDATA"><span style="white-space: nowrap"><tt class="LITERAL">xmlEncCtxModeEncryptedData</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element procesing.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19191"><span style="white-space: nowrap"><var class="LITERAL">xmlEncCtxModeEncryptedKey</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLENCCTXMODEENCRYPTEDKEY"><span style="white-space: nowrap"><tt class="LITERAL">xmlEncCtxModeEncryptedKey</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> element processing.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19197"></a><h3>
-<a name="XMLSEC-ENC-RETURN-REPLACED-NODE-CAPS"></a>XMLSEC_ENC_RETURN_REPLACED_NODE</h3>
+<a name="XMLSEC-ENC-RETURN-REPLACED-NODE--CAPS"></a><h3>XMLSEC_ENC_RETURN_REPLACED_NODE</h3>
 <pre class="PROGRAMLISTING">#define XMLSEC_ENC_RETURN_REPLACED_NODE			0x00000001</pre>
 <p>If this flag is set, then the replaced node will be returned in the replacedNodeList</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19205"></a><h3>
-<a name="XMLSECENCCTX"></a>struct xmlSecEncCtx</h3>
+<a name="XMLSECENCCTX"></a><h3>struct xmlSecEncCtx</h3>
 <pre class="PROGRAMLISTING">struct xmlSecEncCtx {
-
     /* these data user can set before performing the operation */
     void*			userData;
     unsigned int		flags;
@@ -204,125 +197,124 @@ struct      <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtx</a>;
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19214"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18498"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">userData</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to user data (xmlsec and xmlsec-crypto libraries
 			never touches this).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19220"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18504"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML Encryption processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19226"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18510"><span style="white-space: nowrap">unsigned <font>int</font> <code class="STRUCTFIELD">flags2</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the XML Encryption processing flags.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19232"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a> <code class="STRUCTFIELD">mode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18516"><span style="white-space: nowrap"><a href="xmlsec-xmlenc.html#XMLENCCTXMODE">xmlEncCtxMode</a> <code class="STRUCTFIELD">mode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19238"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18522"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoReadCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the reading key context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19244"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18528"><span style="white-space: nowrap"><a href="xmlsec-keyinfo.html#XMLSECKEYINFOCTX">xmlSecKeyInfoCtx</a> <code class="STRUCTFIELD">keyInfoWriteCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the writing key context (not used for signature verification).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19250"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18534"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMCTX">xmlSecTransformCtx</a> <code class="STRUCTFIELD">transformCtx</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the transforms processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19256"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defEncMethodId</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18540"><span style="white-space: nowrap"><font>xmlSecTransformId</font> <code class="STRUCTFIELD">defEncMethodId</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the default encryption method (used if
 			<a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod"; target="_top">&lt;enc:EncryptionMethod/&gt;</a> node is not present).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19263"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">encKey</code></span></a></td>
-<td align="LEFT" valign="TOP"><p>			the signature key; application may set <font><span class="TYPE">encKey</span></font>
+<td align="LEFT" valign="TOP"><a name="AEN18547"><span style="white-space: nowrap"><a href="xmlsec-keys.html#XMLSECKEY">xmlSecKeyPtr</a> <code class="STRUCTFIELD">encKey</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>			the signature key; application may set <gtkdoclink href="ENCKEY"><span class="TYPE">encKey</span></gtkdoclink>
 			before calling encryption/decryption functions.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19271"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18555"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORMOPERATION">xmlSecTransformOperation</a> <code class="STRUCTFIELD">operation</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the operation: encrypt or decrypt.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19277"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18561"><span style="white-space: nowrap"><a href="xmlsec-buffer.html#XMLSECBUFFER">xmlSecBufferPtr</a> <code class="STRUCTFIELD">result</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to signature (not valid for signature verificaction).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19283"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultBase64Encoded</code></span></a></td>
-<td align="LEFT" valign="TOP"><p>	the flag: if set then result in <font><span class="TYPE">result</span></font> is base64 encoded.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18567"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultBase64Encoded</code>;</span></a></td>
+<td align="LEFT" valign="TOP"><p>	the flag: if set then result in <gtkdoclink href="RESULT"><span class="TYPE">result</span></gtkdoclink> is base64 encoded.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19291"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultReplaced</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18575"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">resultReplaced</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the flag: if set then resulted <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node is added to the document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19299"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">encMethod</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18583"><span style="white-space: nowrap"><a href="xmlsec-transforms.html#XMLSECTRANSFORM">xmlSecTransformPtr</a> <code class="STRUCTFIELD">encMethod</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the pointer to encryption transform.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19305"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18589"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">id</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>				the ID attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19313"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18597"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">type</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the Type attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19321"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">mimeType</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18605"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">mimeType</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the MimeType attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19329"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">encoding</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18613"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">encoding</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the Encoding attributeof <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19337"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">recipient</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18621"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">recipient</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the Recipient attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node..</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19344"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">carriedKeyName</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18628"><span style="white-space: nowrap"><font>xmlChar</font> *<code class="STRUCTFIELD">carriedKeyName</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the CarriedKeyName attribute of <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19351"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encDataNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18635"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encDataNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a>
 			or <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedKey"; target="_top">&lt;enc:EncryptedKey/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19359"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encMethodNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18643"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">encMethodNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptionMethod"; target="_top">&lt;enc:EncryptionMethod/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19366"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">keyInfoNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18650"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">keyInfoNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-KeyInfo"; target="_top">&lt;enc:KeyInfo/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19373"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">cipherValueNode</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18657"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">cipherValueNode</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-CipherValue"; target="_top">&lt;enc:CipherValue/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19380"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">replacedNodeList</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18664"><span style="white-space: nowrap"><font>xmlNodePtr</font> <code class="STRUCTFIELD">replacedNodeList</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p> the first node of the list of replaced nodes depending on the nodeReplacementMode</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19386"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18670"><span style="white-space: nowrap"><font>void</font> *<code class="STRUCTFIELD">reserved1</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>			reserved for the future.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19392"></a><h3>
-<a name="XMLSECENCCTXCREATE"></a>xmlSecEncCtxCreate ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecEncCtxPtr</font> xmlSecEncCtxCreate          (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECENCCTXCREATE"></a><h3>xmlSecEncCtxCreate ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecEncCtxPtr</font>     xmlSecEncCtxCreate                  (<a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Creates <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element processing context.
 The caller is responsible for destroying returend object by calling 
 <a href="xmlsec-xmlenc.html#XMLSECENCCTXDESTROY"><span class="TYPE">xmlSecEncCtxDestroy</span></a> function.</p>
@@ -330,35 +322,33 @@ The caller is responsible for destroying returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19406"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18689"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19411"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated context object or NULL if an error
+<td align="LEFT" valign="TOP"><a name="AEN18694"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated context object or NULL if an error
 occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19416"></a><h3>
-<a name="XMLSECENCCTXDESTROY"></a>xmlSecEncCtxDestroy ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecEncCtxDestroy             (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<a name="XMLSECENCCTXDESTROY"></a><h3>xmlSecEncCtxDestroy ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDestroy                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
 <p>Destroy context object created with <a href="xmlsec-xmlenc.html#XMLSECENCCTXCREATE"><span class="TYPE">xmlSecEncCtxCreate</span></a> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19429"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18711"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19435"></a><h3>
-<a name="XMLSECENCCTXINITIALIZE"></a>xmlSecEncCtxInitialize ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxInitialize          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
+<a name="XMLSECENCCTXINITIALIZE"></a><h3>xmlSecEncCtxInitialize ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxInitialize              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <a href="xmlsec-keysmngr.html#XMLSECKEYSMNGR">xmlSecKeysMngrPtr</a> keysMngr);</pre>
 <p>Initializes <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> element processing context.
 The caller is responsible for cleaing up returend object by calling 
 <a href="xmlsec-xmlenc.html#XMLSECENCCTXFINALIZE"><span class="TYPE">xmlSecEncCtxFinalize</span></a> function.</p>
@@ -366,254 +356,244 @@ The caller is responsible for cleaing up returend object by calling
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19450"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18731"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19456"><span style="white-space: nowrap"><var class="PARAMETER">keysMngr</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18737"><span style="white-space: nowrap"><code class="PARAMETER">keysMngr</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to keys manager.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19461"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18742"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19466"></a><h3>
-<a name="XMLSECENCCTXFINALIZE"></a>xmlSecEncCtxFinalize ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecEncCtxFinalize            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
-<p>Cleans up <var class="PARAMETER">encCtx</var> object.</p>
+<a name="XMLSECENCCTXFINALIZE"></a><h3>xmlSecEncCtxFinalize ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxFinalize                (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<p>Cleans up <code class="PARAMETER">encCtx</code> object.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19478"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18758"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19484"></a><h3>
-<a name="XMLSECENCCTXCOPYUSERPREF"></a>xmlSecEncCtxCopyUserPref ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxCopyUserPref        (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
-                                             <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);</pre>
-<p>Copies user preference from <var class="PARAMETER">src</var> context to <var class="PARAMETER">dst</var>.</p>
+<a name="XMLSECENCCTXCOPYUSERPREF"></a><h3>xmlSecEncCtxCopyUserPref ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxCopyUserPref            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> dst,
+                                                         <a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> src);</pre>
+<p>Copies user preference from <code class="PARAMETER">src</code> context to <code class="PARAMETER">dst</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19498"><span style="white-space: nowrap"><var class="PARAMETER">dst</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18777"><span style="white-space: nowrap"><code class="PARAMETER">dst</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to destination context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19503"><span style="white-space: nowrap"><var class="PARAMETER">src</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18782"><span style="white-space: nowrap"><code class="PARAMETER">src</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to source context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19508"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18787"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19513"></a><h3>
-<a name="XMLSECENCCTXRESET"></a>xmlSecEncCtxReset ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecEncCtxReset               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
-<p>Resets <var class="PARAMETER">encCtx</var> object, user settings are not touched.</p>
+<a name="XMLSECENCCTXRESET"></a><h3>xmlSecEncCtxReset ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxReset                   (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx);</pre>
+<p>Resets <code class="PARAMETER">encCtx</code> object, user settings are not touched.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19525"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18803"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19531"></a><h3>
-<a name="XMLSECENCCTXBINARYENCRYPT"></a>xmlSecEncCtxBinaryEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxBinaryEncrypt       (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
-<p>Encrypts <var class="PARAMETER">data</var> according to template <var class="PARAMETER">tmpl</var>.</p>
+<a name="XMLSECENCCTXBINARYENCRYPT"></a><h3>xmlSecEncCtxBinaryEncrypt ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxBinaryEncrypt           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *data,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> dataSize);</pre>
+<p>Encrypts <code class="PARAMETER">data</code> according to template <code class="PARAMETER">tmpl</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19547"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18824"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19553"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18830"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19559"><span style="white-space: nowrap"><var class="PARAMETER">data</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18836"><span style="white-space: nowrap"><code class="PARAMETER">data</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer for binary buffer.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19564"><span style="white-space: nowrap"><var class="PARAMETER">dataSize</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p>		the <var class="PARAMETER">data</var> buffer size.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18841"><span style="white-space: nowrap"><code class="PARAMETER">dataSize</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>		the <code class="PARAMETER">data</code> buffer size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19570"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18847"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19575"></a><h3>
-<a name="XMLSECENCCTXXMLENCRYPT"></a>xmlSecEncCtxXmlEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxXmlEncrypt          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>Encrypts <var class="PARAMETER">node</var> according to template <var class="PARAMETER">tmpl</var>. If requested, <var class="PARAMETER">node</var> is replaced
+<a name="XMLSECENCCTXXMLENCRYPT"></a><h3>xmlSecEncCtxXmlEncrypt ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxXmlEncrypt              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>Encrypts <code class="PARAMETER">node</code> according to template <code class="PARAMETER">tmpl</code>. If requested, <code class="PARAMETER">node</code> is replaced
 with result <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19592"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18868"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19598"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18874"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19604"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18880"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node for encryption.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19609"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18885"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19614"></a><h3>
-<a name="XMLSECENCCTXURIENCRYPT"></a>xmlSecEncCtxUriEncrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxUriEncrypt          (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> tmpl,
-                                             const <font>xmlChar</font> *uri);</pre>
-<p>Encrypts data from <var class="PARAMETER">uri</var> according to template <var class="PARAMETER">tmpl</var>.</p>
+<a name="XMLSECENCCTXURIENCRYPT"></a><h3>xmlSecEncCtxUriEncrypt ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxUriEncrypt              (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> tmpl,
+                                                         const <font>xmlChar</font> *uri);</pre>
+<p>Encrypts data from <code class="PARAMETER">uri</code> according to template <code class="PARAMETER">tmpl</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19629"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18904"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19635"><span style="white-space: nowrap"><var class="PARAMETER">tmpl</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18910"><span style="white-space: nowrap"><code class="PARAMETER">tmpl</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> template node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19641"><span style="white-space: nowrap"><var class="PARAMETER">uri</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18916"><span style="white-space: nowrap"><code class="PARAMETER">uri</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the URI.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19646"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18921"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19651"></a><h3>
-<a name="XMLSECENCCTXDECRYPT"></a>xmlSecEncCtxDecrypt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecEncCtxDecrypt             (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>Decrypts <var class="PARAMETER">node</var> and if necessary replaces <var class="PARAMETER">node</var> with decrypted data.</p>
+<a name="XMLSECENCCTXDECRYPT"></a><h3>xmlSecEncCtxDecrypt ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecEncCtxDecrypt                 (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>Decrypts <code class="PARAMETER">node</code> and if necessary replaces <code class="PARAMETER">node</code> with decrypted data.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19665"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18939"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19671"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18945"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19677"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18951"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19682"></a><h3>
-<a name="XMLSECENCCTXDECRYPTTOBUFFER"></a>xmlSecEncCtxDecryptToBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font> xmlSecEncCtxDecryptToBuffer (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>xmlNodePtr</font> node);</pre>
-<p>Decrypts <var class="PARAMETER">node</var> data to the <var class="PARAMETER">encCtx</var> buffer.</p>
+<a name="XMLSECENCCTXDECRYPTTOBUFFER"></a><h3>xmlSecEncCtxDecryptToBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecBufferPtr</font>     xmlSecEncCtxDecryptToBuffer         (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>xmlNodePtr</font> node);</pre>
+<p>Decrypts <code class="PARAMETER">node</code> data to the <code class="PARAMETER">encCtx</code> buffer.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19696"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18969"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19702"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18975"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19708"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN18981"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19713"></a><h3>
-<a name="XMLSECENCCTXDEBUGDUMP"></a>xmlSecEncCtxDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecEncCtxDebugDump           (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the debug information about <var class="PARAMETER">encCtx</var> to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECENCCTXDEBUGDUMP"></a><h3>xmlSecEncCtxDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDebugDump               (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the debug information about <code class="PARAMETER">encCtx</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19727"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN18999"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19733"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19005"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19738"></a><h3>
-<a name="XMLSECENCCTXDEBUGXMLDUMP"></a>xmlSecEncCtxDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecEncCtxDebugXmlDump        (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints the debug information about <var class="PARAMETER">encCtx</var> to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECENCCTXDEBUGXMLDUMP"></a><h3>xmlSecEncCtxDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecEncCtxDebugXmlDump            (<a href="xmlsec-xmlenc.html#XMLSECENCCTX">xmlSecEncCtxPtr</a> encCtx,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints the debug information about <code class="PARAMETER">encCtx</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19752"><span style="white-space: nowrap"><var class="PARAMETER">encCtx</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19023"><span style="white-space: nowrap"><code class="PARAMETER">encCtx</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to <a href="http://www.w3.org/TR/xmlenc-core/#sec-EncryptedData"; target="_top">&lt;enc:EncryptedData/&gt;</a> processing context.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19758"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19029"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmldsig.html"><b>&lt;&lt;&lt;xmldsig</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmlsec.html"><b>xmlsec&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmldsig.html"><b>&lt;&lt;&lt; xmldsig</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmlsec.html"><b>xmlsec &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmlsec.html b/docs/api/xmlsec-xmlsec.html
index 3700286..b6720d6 100644
--- a/docs/api/xmlsec-xmlsec.html
+++ b/docs/api/xmlsec-xmlsec.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>xmlsec</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="xmlenc" href="xmlsec-xmlenc.html">
 <link rel="NEXT" title="xmltree" href="xmlsec-xmltree.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,51 +87,46 @@
 <h1>
 <a name="XMLSEC-XMLSEC"></a>xmlsec</h1>
 <div class="REFNAMEDIV">
-<a name="AEN19768"></a><h2>Name</h2>xmlsec--Utility functions.</div>
+<a name="AEN19039"></a><h2>Name</h2>xmlsec -- Utility functions.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN19771"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-typedef     <font>xmlSecPtr</font>;
-#define     <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>
-#define     <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>
-<font>int</font>         <a href="xmlsec-xmlsec.html#XMLSECINIT">xmlSecInit</a>                      (void);
-<font>int</font>         <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN">xmlSecShutdown</a>                  (void);
-#define     <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXACT">xmlSecCheckVersionExact</a>         ()
-#define     <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSION">xmlSecCheckVersion</a>              ()
-enum        <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a>;
-<font>int</font>         <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXT">xmlSecCheckVersionExt</a>           (<font>int</font> major,
-                                             <font>int</font> minor,
-                                             <font>int</font> subminor,
-                                             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);
-#define     <a href="xmlsec-xmlsec.html#ATTRIBUTE-UNUSED-CAPS">ATTRIBUTE_UNUSED</a></pre>
+<a name="XMLSEC-XMLSEC.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">typedef             <font>xmlSecPtr</font>;
+#define             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a>
+#define             <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a>
+<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECINIT">xmlSecInit</a>                          (void);
+<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECSHUTDOWN">xmlSecShutdown</a>                      (void);
+#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXACT">xmlSecCheckVersionExact</a>             ()
+#define             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSION">xmlSecCheckVersion</a>                  ()
+enum                <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a>;
+<font>int</font>                 <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONEXT">xmlSecCheckVersionExt</a>               (<font>int</font> major,
+                                                         <font>int</font> minor,
+                                                         <font>int</font> subminor,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);
+#define             <a href="xmlsec-xmlsec.html#ATTRIBUTE-UNUSED--CAPS">ATTRIBUTE_UNUSED</a></pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN19791"></a><h2>Description</h2>
+<a name="XMLSEC-XMLSEC.DESCRIPTION"></a><h2>Description</h2>
 <p>Utility functions.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN19794"></a><h2>Details</h2>
+<a name="XMLSEC-XMLSEC.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN19796"></a><h3>
-<a name="XMLSECPTR"></a>xmlSecPtr</h3>
+<a name="XMLSECPTR"></a><h3>xmlSecPtr</h3>
 <pre class="PROGRAMLISTING">typedef void*					xmlSecPtr;</pre>
 <p>Void pointer.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19804"></a><h3>
-<a name="XMLSECSIZE"></a>xmlSecSize</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecSize</pre>
+<a name="XMLSECSIZE"></a><h3>xmlSecSize</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecSize</pre>
 <p>Size of something. Should be typedef instead of define
 but it will break ABI (todo).</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19812"></a><h3>
-<a name="XMLSECBYTE"></a>xmlSecByte</h3>
+<a name="XMLSECBYTE"></a><h3>xmlSecByte</h3>
 <pre class="PROGRAMLISTING">#define xmlSecByte				unsigned char</pre>
 <p>One byte. Should be typedef instead of define
 but it will break ABI (todo).</p>
@@ -140,36 +134,33 @@ but it will break ABI (todo).</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19820"></a><h3>
-<a name="XMLSECINIT"></a>xmlSecInit ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecInit                      (void);</pre>
+<a name="XMLSECINIT"></a><h3>xmlSecInit ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecInit                          (void);</pre>
 <p>Initializes XML Security Library. The depended libraries
 (LibXML and LibXSLT) must be initialized before.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19830"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19097"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19835"></a><h3>
-<a name="XMLSECSHUTDOWN"></a>xmlSecShutdown ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecShutdown                  (void);</pre>
+<a name="XMLSECSHUTDOWN"></a><h3>xmlSecShutdown ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecShutdown                      (void);</pre>
 <p>Clean ups the XML Security Library.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN19845"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19111"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value otherwise.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19850"></a><h3>
-<a name="XMLSECCHECKVERSIONEXACT"></a>xmlSecCheckVersionExact()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecCheckVersionExact()</pre>
+<a name="XMLSECCHECKVERSIONEXACT"></a><h3>xmlSecCheckVersionExact()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecCheckVersionExact()</pre>
 <p>Macro. Returns 1 if the loaded xmlsec library version exactly matches 
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</p>
@@ -177,9 +168,8 @@ value if an error occurs.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19858"></a><h3>
-<a name="XMLSECCHECKVERSION"></a>xmlSecCheckVersion()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecCheckVersion()</pre>
+<a name="XMLSECCHECKVERSION"></a><h3>xmlSecCheckVersion()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecCheckVersion()</pre>
 <p>Macro. Returns 1 if the loaded xmlsec library version ABI compatible with
 the one used to compile the caller, 0 if it does not or a negative
 value if an error occurs.</p>
@@ -187,10 +177,9 @@ value if an error occurs.</p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19866"></a><h3>
-<a name="XMLSECCHECKVERSIONMODE"></a>enum xmlSecCheckVersionMode</h3>
+<a name="XMLSECCHECKVERSIONMODE"></a><h3>enum xmlSecCheckVersionMode</h3>
 <pre class="PROGRAMLISTING">typedef enum {
-    xmlSecCheckVersionExact = 0,
+    xmlSecCheckVersionExactMatch = 0,
     xmlSecCheckVersionABICompatible
 } xmlSecCheckVersionMode;</pre>
 <p>The xmlsec library version mode.</p>
@@ -198,62 +187,60 @@ value if an error occurs.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19875"><span style="white-space: nowrap"><var class="LITERAL">xmlSecCheckVersionExact</var></span></a></td>
-<td align="LEFT" valign="TOP"><p>		the version should match exactly.</p></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECCHECKVERSIONEXACTMATCH"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecCheckVersionExactMatch</tt></span></a></td>
+<td align="LEFT" valign="TOP"><p>	the version should match exactly.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19880"><span style="white-space: nowrap"><var class="LITERAL">xmlSecCheckVersionABICompatible</var></span></a></td>
+<td align="LEFT" valign="TOP"><a name="XMLSECCHECKVERSIONABICOMPATIBLE"><span style="white-space: nowrap"><tt class="LITERAL">xmlSecCheckVersionABICompatible</tt></span></a></td>
 <td align="LEFT" valign="TOP"><p>	the version should be ABI compatible.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19885"></a><h3>
-<a name="XMLSECCHECKVERSIONEXT"></a>xmlSecCheckVersionExt ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCheckVersionExt           (<font>int</font> major,
-                                             <font>int</font> minor,
-                                             <font>int</font> subminor,
-                                             <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);</pre>
+<a name="XMLSECCHECKVERSIONEXT"></a><h3>xmlSecCheckVersionExt ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCheckVersionExt               (<font>int</font> major,
+                                                         <font>int</font> minor,
+                                                         <font>int</font> subminor,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECCHECKVERSIONMODE">xmlSecCheckVersionMode</a> mode);</pre>
 <p>Checks if the loaded version of xmlsec library could be used.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19899"><span style="white-space: nowrap"><var class="PARAMETER">major</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19161"><span style="white-space: nowrap"><code class="PARAMETER">major</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the major version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19904"><span style="white-space: nowrap"><var class="PARAMETER">minor</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19166"><span style="white-space: nowrap"><code class="PARAMETER">minor</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the minor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19909"><span style="white-space: nowrap"><var class="PARAMETER">subminor</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19171"><span style="white-space: nowrap"><code class="PARAMETER">subminor</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the subminor version number.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19914"><span style="white-space: nowrap"><var class="PARAMETER">mode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19176"><span style="white-space: nowrap"><code class="PARAMETER">mode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the version check mode.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN19919"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if the loaded xmlsec library version is OK to use
+<td align="LEFT" valign="TOP"><a name="AEN19181"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if the loaded xmlsec library version is OK to use
 0 if it is not or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN19924"></a><h3>
-<a name="ATTRIBUTE-UNUSED-CAPS"></a>ATTRIBUTE_UNUSED</h3>
-<pre class="PROGRAMLISTING">#define     ATTRIBUTE_UNUSED</pre>
+<a name="ATTRIBUTE-UNUSED--CAPS"></a><h3>ATTRIBUTE_UNUSED</h3>
+<pre class="PROGRAMLISTING">#define             ATTRIBUTE_UNUSED</pre>
 <p>Macro used to signal to GCC unused function parameters</p>
 <p></p>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmlenc.html"><b>&lt;&lt;&lt;xmlenc</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-xmltree.html"><b>xmltree&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmlenc.html"><b>&lt;&lt;&lt; xmlenc</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-xmltree.html"><b>xmltree &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/api/xmlsec-xmltree.html b/docs/api/xmlsec-xmltree.html
index 3fde223..2c87412 100644
--- a/docs/api/xmlsec-xmltree.html
+++ b/docs/api/xmlsec-xmltree.html
@@ -2,12 +2,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>xmltree</title>
-<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.7">
+<meta name="GENERATOR" content="Modular DocBook HTML Stylesheet Version 1.79">
 <link rel="HOME" title="XML Security Library Reference Manual" href="index.html">
 <link rel="UP" title="XML Security Core Library API Reference." href="xmlsec-ref.html">
 <link rel="PREVIOUS" title="xmlsec" href="xmlsec-xmlsec.html">
 <link rel="NEXT" title="x509" href="xmlsec-x509.html">
-<meta name="GENERATOR" content="GTK-Doc V1.2 (SGML mode)">
 <style type="text/css">.synopsis, .classsynopsis {
     background: #eeeeee;
     border: solid 1px #aaaaaa;
@@ -88,860 +87,842 @@
 <h1>
 <a name="XMLSEC-XMLTREE"></a>xmltree</h1>
 <div class="REFNAMEDIV">
-<a name="AEN19937"></a><h2>Name</h2>xmltree--XML tree operations.</div>
+<a name="AEN19198"></a><h2>Name</h2>xmltree -- XML tree operations.</div>
 <div class="REFSYNOPSISDIV">
-<a name="AEN19940"></a><h2>Synopsis</h2>
-<pre class="SYNOPSIS">
-
-#define     <a href="xmlsec-xmltree.html#XMLSECNODEGETNAME">xmlSecNodeGetName</a>               (node)
-const <font>xmlChar</font>* <a href="xmlsec-xmltree.html#XMLSECGETNODENSHREF">xmlSecGetNodeNsHref</a>          (const <font>xmlNodePtr</font> cur);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECCHECKNODENAME">xmlSecCheckNodeName</a>             (const <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECGETNEXTELEMENTNODE">xmlSecGetNextElementNode</a>        (<font>xmlNodePtr</font> cur);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECFINDCHILD">xmlSecFindChild</a>                 (const <font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECFINDPARENT">xmlSecFindParent</a>                (const <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECFINDNODE">xmlSecFindNode</a>                  (const <font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECADDCHILD">xmlSecAddChild</a>                  (<font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECADDCHILDNODE">xmlSecAddChildNode</a>              (<font>xmlNodePtr</font> parent,
-                                             <font>xmlNodePtr</font> child);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECADDNEXTSIBLING">xmlSecAddNextSibling</a>            (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>xmlNodePtr</font>  <a href="xmlsec-xmltree.html#XMLSECADDPREVSIBLING">xmlSecAddPrevSibling</a>            (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACENODE">xmlSecReplaceNode</a>               (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACENODEANDRETURN">xmlSecReplaceNodeAndReturn</a>      (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode,
-                                             <font>xmlNodePtr</font> *replaced);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENT">xmlSecReplaceContent</a>            (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENTANDRETURN">xmlSecReplaceContentAndReturn</a>   (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode,
-                                             <font>xmlNodePtr</font> *replaced);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFER">xmlSecReplaceNodeBuffer</a>         (<font>xmlNodePtr</font> node,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFERANDRETURN">xmlSecReplaceNodeBufferAndReturn</a>
-                                            (<font>xmlNodePtr</font> node,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                             <font>xmlNodePtr</font> *replaced);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">xmlSecNodeEncodeAndSetContent</a>   (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *buffer);
-<font>void</font>        <a href="xmlsec-xmltree.html#XMLSECADDIDS">xmlSecAddIDs</a>                    (<font>xmlDocPtr</font> doc,
-                                             <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> **ids);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECGENERATEANDADDID">xmlSecGenerateAndAddID</a>          (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             const <font>xmlChar</font> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
-<font>xmlChar</font>*    <a href="xmlsec-xmltree.html#XMLSECGENERATEID">xmlSecGenerateID</a>                (const <font>xmlChar</font> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
-<font>xmlDocPtr</font>   <a href="xmlsec-xmltree.html#XMLSECCREATETREE">xmlSecCreateTree</a>                (const <font>xmlChar</font> *rootNodeName,
-                                             const <font>xmlChar</font> *rootNodeNs);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECISEMPTYNODE">xmlSecIsEmptyNode</a>               (<font>xmlNodePtr</font> node);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECISEMPTYSTRING">xmlSecIsEmptyString</a>             (const <font>xmlChar</font> *str);
-<font>xmlChar</font>*    <a href="xmlsec-xmltree.html#XMLSECGETQNAME">xmlSecGetQName</a>                  (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *href,
-                                             const <font>xmlChar</font> *local);
-#define     <a href="xmlsec-xmltree.html#XMLSECISHEX">xmlSecIsHex</a>                     (c)
-#define     <a href="xmlsec-xmltree.html#XMLSECGETHEX">xmlSecGetHex</a>                    (c)
-typedef     <font>xmlSecQName2IntegerInfoConstPtr</font>;
-struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERINFO">xmlSecQName2IntegerInfo</a>;
-<font>xmlSecQName2IntegerInfoConstPtr</font> <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINFO">xmlSecQName2IntegerGetInfo</a>
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGER">xmlSecQName2IntegerGetInteger</a>   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             const <font>xmlChar</font> *qnameHref,
-                                             const <font>xmlChar</font> *qnameLocalPart,
-                                             <font>int</font> *intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGERFROMSTRING">xmlSecQName2IntegerGetIntegerFromString</a>
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *qname,
-                                             <font>int</font> *intValue);
-<font>xmlChar</font>*    <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER">xmlSecQName2IntegerGetStringFromInteger</a>
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEREAD">xmlSecQName2IntegerNodeRead</a>     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> *intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEWRITE">xmlSecQName2IntegerNodeWrite</a>    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <font>int</font> intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEREAD">xmlSecQName2IntegerAttributeRead</a>
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             <font>int</font> *intValue);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEWRITE">xmlSecQName2IntegerAttributeWrite</a>
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             <font>int</font> intValue);
-<font>void</font>        <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGDUMP">xmlSecQName2IntegerDebugDump</a>    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGXMLDUMP">xmlSecQName2IntegerDebugXmlDump</a> (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);
-typedef     <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a>;
-typedef     <font>xmlSecQName2BitMaskInfoConstPtr</font>;
-struct      <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2BitMaskInfo</a>;
-<font>xmlSecQName2BitMaskInfoConstPtr</font> <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETINFO">xmlSecQName2BitMaskGetInfo</a>
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASK">xmlSecQName2BitMaskGetBitMask</a>   (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             const <font>xmlChar</font> *qnameLocalPart,
-                                             const <font>xmlChar</font> *qnameHref,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESREAD">xmlSecQName2BitMaskNodesRead</a>    (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> *node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <font>int</font> stopOnUnknown,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">xmlSecQName2BitMaskGetBitMaskFromString</a>
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *qname,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
-<font>xmlChar</font>*    <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK">xmlSecQName2BitMaskGetStringFromBitMask</a>
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>int</font>         <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESWRITE">xmlSecQName2BitMaskNodesWrite</a>   (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
-<font>void</font>        <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">xmlSecQName2BitMaskDebugDump</a>    (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);
-<font>void</font>        <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">xmlSecQName2BitMaskDebugXmlDump</a> (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);</pre>
+<a name="XMLSEC-XMLTREE.SYNOPSIS"></a><h2>Synopsis</h2>
+<pre class="SYNOPSIS">#define             <a href="xmlsec-xmltree.html#XMLSECNODEGETNAME">xmlSecNodeGetName</a>                   (node)
+const <font>xmlChar</font>*      <a href="xmlsec-xmltree.html#XMLSECGETNODENSHREF">xmlSecGetNodeNsHref</a>                 (const <font>xmlNodePtr</font> cur);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECCHECKNODENAME">xmlSecCheckNodeName</a>                 (const <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECGETNEXTELEMENTNODE">xmlSecGetNextElementNode</a>            (<font>xmlNodePtr</font> cur);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDCHILD">xmlSecFindChild</a>                     (const <font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDPARENT">xmlSecFindParent</a>                    (const <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECFINDNODE">xmlSecFindNode</a>                      (const <font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDCHILD">xmlSecAddChild</a>                      (<font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDCHILDNODE">xmlSecAddChildNode</a>                  (<font>xmlNodePtr</font> parent,
+                                                         <font>xmlNodePtr</font> child);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDNEXTSIBLING">xmlSecAddNextSibling</a>                (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>xmlNodePtr</font>          <a href="xmlsec-xmltree.html#XMLSECADDPREVSIBLING">xmlSecAddPrevSibling</a>                (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODE">xmlSecReplaceNode</a>                   (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEANDRETURN">xmlSecReplaceNodeAndReturn</a>          (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode,
+                                                         <font>xmlNodePtr</font> *replaced);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENT">xmlSecReplaceContent</a>                (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACECONTENTANDRETURN">xmlSecReplaceContentAndReturn</a>       (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode,
+                                                         <font>xmlNodePtr</font> *replaced);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFER">xmlSecReplaceNodeBuffer</a>             (<font>xmlNodePtr</font> node,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECREPLACENODEBUFFERANDRETURN">xmlSecReplaceNodeBufferAndReturn</a>    (<font>xmlNodePtr</font> node,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
+                                                         <font>xmlNodePtr</font> *replaced);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECNODEENCODEANDSETCONTENT">xmlSecNodeEncodeAndSetContent</a>       (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *buffer);
+<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECADDIDS">xmlSecAddIDs</a>                        (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> **ids);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECGENERATEANDADDID">xmlSecGenerateAndAddID</a>              (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         const <font>xmlChar</font> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
+<font>xmlChar</font>*            <a href="xmlsec-xmltree.html#XMLSECGENERATEID">xmlSecGenerateID</a>                    (const <font>xmlChar</font> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);
+<font>xmlDocPtr</font>           <a href="xmlsec-xmltree.html#XMLSECCREATETREE">xmlSecCreateTree</a>                    (const <font>xmlChar</font> *rootNodeName,
+                                                         const <font>xmlChar</font> *rootNodeNs);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECISEMPTYNODE">xmlSecIsEmptyNode</a>                   (<font>xmlNodePtr</font> node);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECISEMPTYSTRING">xmlSecIsEmptyString</a>                 (const <font>xmlChar</font> *str);
+<font>xmlChar</font>*            <a href="xmlsec-xmltree.html#XMLSECGETQNAME">xmlSecGetQName</a>                      (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *href,
+                                                         const <font>xmlChar</font> *local);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECPRINTXMLSTRING">xmlSecPrintXmlString</a>                (<font>FILE</font> *fd,
+                                                         const <font>xmlChar</font> *str);
+#define             <a href="xmlsec-xmltree.html#XMLSECISHEX">xmlSecIsHex</a>                         (c)
+#define             <a href="xmlsec-xmltree.html#XMLSECGETHEX">xmlSecGetHex</a>                        (c)
+struct              <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERINFO">xmlSecQName2IntegerInfo</a>;
+typedef             <font>xmlSecQName2IntegerInfoConstPtr</font>;
+<font>xmlSecQName2IntegerInfoConstPtr</font>  <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINFO">xmlSecQName2IntegerGetInfo</a>
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGER">xmlSecQName2IntegerGetInteger</a>       (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         const <font>xmlChar</font> *qnameHref,
+                                                         const <font>xmlChar</font> *qnameLocalPart,
+                                                         <font>int</font> *intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETINTEGERFROMSTRING">xmlSecQName2IntegerGetIntegerFromString</a>
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *qname,
+                                                         <font>int</font> *intValue);
+<font>xmlChar</font> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER">xmlSecQName2IntegerGetStringFromInteger</a>
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEREAD">xmlSecQName2IntegerNodeRead</a>         (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> *intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERNODEWRITE">xmlSecQName2IntegerNodeWrite</a>        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <font>int</font> intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEREAD">xmlSecQName2IntegerAttributeRead</a>    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         <font>int</font> *intValue);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERATTRIBUTEWRITE">xmlSecQName2IntegerAttributeWrite</a>   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         <font>int</font> intValue);
+<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGDUMP">xmlSecQName2IntegerDebugDump</a>        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2INTEGERDEBUGXMLDUMP">xmlSecQName2IntegerDebugXmlDump</a>     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);
+typedef             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a>;
+struct              <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKINFO">xmlSecQName2BitMaskInfo</a>;
+typedef             <font>xmlSecQName2BitMaskInfoConstPtr</font>;
+<font>xmlSecQName2BitMaskInfoConstPtr</font>  <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETINFO">xmlSecQName2BitMaskGetInfo</a>
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASK">xmlSecQName2BitMaskGetBitMask</a>       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         const <font>xmlChar</font> *qnameLocalPart,
+                                                         const <font>xmlChar</font> *qnameHref,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESREAD">xmlSecQName2BitMaskNodesRead</a>        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> *node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <font>int</font> stopOnUnknown,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETBITMASKFROMSTRING">xmlSecQName2BitMaskGetBitMaskFromString</a>
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *qname,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);
+<font>xmlChar</font> *           <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK">xmlSecQName2BitMaskGetStringFromBitMask</a>
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
+<font>int</font>                 <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKNODESWRITE">xmlSecQName2BitMaskNodesWrite</a>       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);
+<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGDUMP">xmlSecQName2BitMaskDebugDump</a>        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);
+<font>void</font>                <a href="xmlsec-xmltree.html#XMLSECQNAME2BITMASKDEBUGXMLDUMP">xmlSecQName2BitMaskDebugXmlDump</a>     (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);</pre>
 </div>
 <div class="REFSECT1">
-<a name="AEN20164"></a><h2>Description</h2>
+<a name="XMLSEC-XMLTREE.DESCRIPTION"></a><h2>Description</h2>
 <p>XML tree operations.</p>
 </div>
 <div class="REFSECT1">
-<a name="AEN20167"></a><h2>Details</h2>
+<a name="XMLSEC-XMLTREE.DETAILS"></a><h2>Details</h2>
 <div class="REFSECT2">
-<a name="AEN20169"></a><h3>
-<a name="XMLSECNODEGETNAME"></a>xmlSecNodeGetName()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecNodeGetName(node)</pre>
+<a name="XMLSECNODEGETNAME"></a><h3>xmlSecNodeGetName()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecNodeGetName(node)</pre>
 <p>Macro. Returns node's name.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN20178"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19442"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20183"></a><h3>
-<a name="XMLSECGETNODENSHREF"></a>xmlSecGetNodeNsHref ()</h3>
-<pre class="PROGRAMLISTING">const <font>xmlChar</font>* xmlSecGetNodeNsHref          (const <font>xmlNodePtr</font> cur);</pre>
+<a name="XMLSECGETNODENSHREF"></a><h3>xmlSecGetNodeNsHref ()</h3>
+<pre class="PROGRAMLISTING">const <font>xmlChar</font>*      xmlSecGetNodeNsHref                 (const <font>xmlNodePtr</font> cur);</pre>
 <p>Get's node's namespace href.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20194"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19457"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20199"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>node's namespace href.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19462"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> node's namespace href.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20204"></a><h3>
-<a name="XMLSECCHECKNODENAME"></a>xmlSecCheckNodeName ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecCheckNodeName             (const <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
+<a name="XMLSECCHECKNODENAME"></a><h3>xmlSecCheckNodeName ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecCheckNodeName                 (const <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
 <p>Checks that the node has a given name and a given namespace href.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20217"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19479"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20222"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19484"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name,</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20227"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19489"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20232"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if the node matches or 0 otherwise.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19494"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if the node matches or 0 otherwise.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20237"></a><h3>
-<a name="XMLSECGETNEXTELEMENTNODE"></a>xmlSecGetNextElementNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecGetNextElementNode        (<font>xmlNodePtr</font> cur);</pre>
+<a name="XMLSECGETNEXTELEMENTNODE"></a><h3>xmlSecGetNextElementNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecGetNextElementNode            (<font>xmlNodePtr</font> cur);</pre>
 <p>Seraches for the next element node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20248"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19509"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20253"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to next element node or NULL if it is not found.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19514"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to next element node or NULL if it is not found.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20258"></a><h3>
-<a name="XMLSECFINDCHILD"></a>xmlSecFindChild ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecFindChild                 (const <font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Searches a direct child of the <var class="PARAMETER">parent</var> node having given name and 
+<a name="XMLSECFINDCHILD"></a><h3>xmlSecFindChild ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindChild                     (const <font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Searches a direct child of the <code class="PARAMETER">parent</code> node having given name and 
 namespace href.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20272"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19532"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20277"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19537"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20282"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19542"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20287"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the found node or NULL if an error occurs or 
+<td align="LEFT" valign="TOP"><a name="AEN19547"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or 
 node is not found.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20292"></a><h3>
-<a name="XMLSECFINDPARENT"></a>xmlSecFindParent ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecFindParent                (const <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Searches the ancestors axis of the <var class="PARAMETER">cur</var> node for a node having given name 
+<a name="XMLSECFINDPARENT"></a><h3>xmlSecFindParent ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindParent                    (const <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Searches the ancestors axis of the <code class="PARAMETER">cur</code> node for a node having given name 
 and namespace href.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20306"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19565"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20311"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19570"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20316"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19575"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20321"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the found node or NULL if an error occurs or 
+<td align="LEFT" valign="TOP"><a name="AEN19580"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or 
 node is not found.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20326"></a><h3>
-<a name="XMLSECFINDNODE"></a>xmlSecFindNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecFindNode                  (const <font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Searches all children of the <var class="PARAMETER">parent</var> node having given name and 
+<a name="XMLSECFINDNODE"></a><h3>xmlSecFindNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecFindNode                      (const <font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Searches all children of the <code class="PARAMETER">parent</code> node having given name and 
 namespace href.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20340"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19598"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20345"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19603"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20350"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19608"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the namespace href (may be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20355"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the pointer to the found node or NULL if an error occurs or 
+<td align="LEFT" valign="TOP"><a name="AEN19613"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the pointer to the found node or NULL if an error occurs or 
 node is not found.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20360"></a><h3>
-<a name="XMLSECADDCHILD"></a>xmlSecAddChild ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecAddChild                  (<font>xmlNodePtr</font> parent,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Adds a child to the node <var class="PARAMETER">parent</var> with given <var class="PARAMETER">name</var> and namespace <var class="PARAMETER">ns</var>.</p>
+<a name="XMLSECADDCHILD"></a><h3>xmlSecAddChild ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddChild                      (<font>xmlNodePtr</font> parent,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Adds a child to the node <code class="PARAMETER">parent</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20376"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19633"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20381"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19638"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20386"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19643"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20391"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the new node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19648"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20396"></a><h3>
-<a name="XMLSECADDCHILDNODE"></a>xmlSecAddChildNode ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecAddChildNode              (<font>xmlNodePtr</font> parent,
-                                             <font>xmlNodePtr</font> child);</pre>
-<p>Adds <var class="PARAMETER">child</var> node to the <var class="PARAMETER">parent</var> node.</p>
+<a name="XMLSECADDCHILDNODE"></a><h3>xmlSecAddChildNode ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddChildNode                  (<font>xmlNodePtr</font> parent,
+                                                         <font>xmlNodePtr</font> child);</pre>
+<p>Adds <code class="PARAMETER">child</code> node to the <code class="PARAMETER">parent</code> node.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20410"><span style="white-space: nowrap"><var class="PARAMETER">parent</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19666"><span style="white-space: nowrap"><code class="PARAMETER">parent</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20415"><span style="white-space: nowrap"><var class="PARAMETER">child</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19671"><span style="white-space: nowrap"><code class="PARAMETER">child</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20420"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the new node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19676"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20425"></a><h3>
-<a name="XMLSECADDNEXTSIBLING"></a>xmlSecAddNextSibling ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecAddNextSibling            (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Adds next sibling to the node <var class="PARAMETER">node</var> with given <var class="PARAMETER">name</var> and namespace <var class="PARAMETER">ns</var>.</p>
+<a name="XMLSECADDNEXTSIBLING"></a><h3>xmlSecAddNextSibling ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddNextSibling                (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Adds next sibling to the node <code class="PARAMETER">node</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20441"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19696"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20446"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19701"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20451"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19706"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20456"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the new node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19711"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20461"></a><h3>
-<a name="XMLSECADDPREVSIBLING"></a>xmlSecAddPrevSibling ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>  xmlSecAddPrevSibling            (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *name,
-                                             const <font>xmlChar</font> *ns);</pre>
-<p>Adds prev sibling to the node <var class="PARAMETER">node</var> with given <var class="PARAMETER">name</var> and namespace <var class="PARAMETER">ns</var>.</p>
+<a name="XMLSECADDPREVSIBLING"></a><h3>xmlSecAddPrevSibling ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlNodePtr</font>          xmlSecAddPrevSibling                (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *name,
+                                                         const <font>xmlChar</font> *ns);</pre>
+<p>Adds prev sibling to the node <code class="PARAMETER">node</code> with given <code class="PARAMETER">name</code> and namespace <code class="PARAMETER">ns</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20477"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19731"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20482"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19736"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20487"><span style="white-space: nowrap"><var class="PARAMETER">ns</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19741"><span style="white-space: nowrap"><code class="PARAMETER">ns</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20492"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the new node or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19746"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the new node or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20497"></a><h3>
-<a name="XMLSECREPLACENODE"></a>xmlSecReplaceNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceNode               (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode);</pre>
-<p>Swaps the <var class="PARAMETER">node</var> and <var class="PARAMETER">newNode</var> in the XML tree.</p>
+<a name="XMLSECREPLACENODE"></a><h3>xmlSecReplaceNode ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNode                   (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode);</pre>
+<p>Swaps the <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code> in the XML tree.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20511"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19764"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20516"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19769"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20521"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19774"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20526"></a><h3>
-<a name="XMLSECREPLACENODEANDRETURN"></a>xmlSecReplaceNodeAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceNodeAndReturn      (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode,
-                                             <font>xmlNodePtr</font> *replaced);</pre>
-<p>Swaps the <var class="PARAMETER">node</var> and <var class="PARAMETER">newNode</var> in the XML tree.</p>
+<a name="XMLSECREPLACENODEANDRETURN"></a><h3>xmlSecReplaceNodeAndReturn ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeAndReturn          (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode,
+                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<p>Swaps the <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code> in the XML tree.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20541"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19793"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20546"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19798"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20551"><span style="white-space: nowrap"><var class="PARAMETER">replaced</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19803"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>   	the replaced node, or release it if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20556"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19808"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20561"></a><h3>
-<a name="XMLSECREPLACECONTENT"></a>xmlSecReplaceContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceContent            (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode);</pre>
-<p>Swaps the content of <var class="PARAMETER">node</var> and <var class="PARAMETER">newNode</var>.</p>
+<a name="XMLSECREPLACECONTENT"></a><h3>xmlSecReplaceContent ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceContent                (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode);</pre>
+<p>Swaps the content of <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20575"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19826"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20580"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19831"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20585"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19836"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20590"></a><h3>
-<a name="XMLSECREPLACECONTENTANDRETURN"></a>xmlSecReplaceContentAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceContentAndReturn   (<font>xmlNodePtr</font> node,
-                                             <font>xmlNodePtr</font> newNode,
-                                             <font>xmlNodePtr</font> *replaced);</pre>
-<p>Swaps the content of <var class="PARAMETER">node</var> and <var class="PARAMETER">newNode</var>.</p>
+<a name="XMLSECREPLACECONTENTANDRETURN"></a><h3>xmlSecReplaceContentAndReturn ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceContentAndReturn       (<font>xmlNodePtr</font> node,
+                                                         <font>xmlNodePtr</font> newNode,
+                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<p>Swaps the content of <code class="PARAMETER">node</code> and <code class="PARAMETER">newNode</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20605"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19855"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20610"><span style="white-space: nowrap"><var class="PARAMETER">newNode</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19860"><span style="white-space: nowrap"><code class="PARAMETER">newNode</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the new node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20615"><span style="white-space: nowrap"><var class="PARAMETER">replaced</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19865"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>   	the replaced nodes, or release them if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20620"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19870"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20625"></a><h3>
-<a name="XMLSECREPLACENODEBUFFER"></a>xmlSecReplaceNodeBuffer ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceNodeBuffer         (<font>xmlNodePtr</font> node,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
-<p>Swaps the <var class="PARAMETER">node</var> and the parsed XML data from the <var class="PARAMETER">buffer</var> in the XML tree.</p>
+<a name="XMLSECREPLACENODEBUFFER"></a><h3>xmlSecReplaceNodeBuffer ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeBuffer             (<font>xmlNodePtr</font> node,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size);</pre>
+<p>Swaps the <code class="PARAMETER">node</code> and the parsed XML data from the <code class="PARAMETER">buffer</code> in the XML tree.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20640"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19889"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20645"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19894"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20650"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19899"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20655"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19904"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20660"></a><h3>
-<a name="XMLSECREPLACENODEBUFFERANDRETURN"></a>xmlSecReplaceNodeBufferAndReturn ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecReplaceNodeBufferAndReturn
-                                            (<font>xmlNodePtr</font> node,
-                                             const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
-                                             <font>xmlNodePtr</font> *replaced);</pre>
-<p>Swaps the <var class="PARAMETER">node</var> and the parsed XML data from the <var class="PARAMETER">buffer</var> in the XML tree.</p>
+<a name="XMLSECREPLACENODEBUFFERANDRETURN"></a><h3>xmlSecReplaceNodeBufferAndReturn ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecReplaceNodeBufferAndReturn    (<font>xmlNodePtr</font> node,
+                                                         const <a href="xmlsec-xmlsec.html#XMLSECBYTE">xmlSecByte</a> *buffer,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> size,
+                                                         <font>xmlNodePtr</font> *replaced);</pre>
+<p>Swaps the <code class="PARAMETER">node</code> and the parsed XML data from the <code class="PARAMETER">buffer</code> in the XML tree.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20676"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19924"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the current node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20681"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19929"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20686"><span style="white-space: nowrap"><var class="PARAMETER">size</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19934"><span style="white-space: nowrap"><code class="PARAMETER">size</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the XML data size.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20691"><span style="white-space: nowrap"><var class="PARAMETER">replaced</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19939"><span style="white-space: nowrap"><code class="PARAMETER">replaced</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the replaced nodes, or release them if NULL is given</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20696"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19944"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20701"></a><h3>
-<a name="XMLSECNODEENCODEANDSETCONTENT"></a>xmlSecNodeEncodeAndSetContent ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecNodeEncodeAndSetContent   (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *buffer);</pre>
-<p>Encodes "special" characters in the <var class="PARAMETER">buffer</var> and sets the result
+<a name="XMLSECNODEENCODEANDSETCONTENT"></a><h3>xmlSecNodeEncodeAndSetContent ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecNodeEncodeAndSetContent       (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *buffer);</pre>
+<p>Encodes "special" characters in the <code class="PARAMETER">buffer</code> and sets the result
 as the node content.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20714"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19961"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		    the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20719"><span style="white-space: nowrap"><var class="PARAMETER">buffer</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19966"><span style="white-space: nowrap"><code class="PARAMETER">buffer</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to the node content.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20724"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN19971"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20729"></a><h3>
-<a name="XMLSECADDIDS"></a>xmlSecAddIDs ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecAddIDs                    (<font>xmlDocPtr</font> doc,
-                                             <font>xmlNodePtr</font> cur,
-                                             const <font>xmlChar</font> **ids);</pre>
-<p>Walks thru all children of the <var class="PARAMETER">cur</var> node and adds all attributes 
-from the <var class="PARAMETER">ids</var> list to the <var class="PARAMETER">doc</var> document IDs attributes hash.</p>
+<a name="XMLSECADDIDS"></a><h3>xmlSecAddIDs ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecAddIDs                        (<font>xmlDocPtr</font> doc,
+                                                         <font>xmlNodePtr</font> cur,
+                                                         const <font>xmlChar</font> **ids);</pre>
+<p>Walks thru all children of the <code class="PARAMETER">cur</code> node and adds all attributes 
+from the <code class="PARAMETER">ids</code> list to the <code class="PARAMETER">doc</code> document IDs attributes hash.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20745"><span style="white-space: nowrap"><var class="PARAMETER">doc</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19991"><span style="white-space: nowrap"><code class="PARAMETER">doc</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML document.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20750"><span style="white-space: nowrap"><var class="PARAMETER">cur</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN19996"><span style="white-space: nowrap"><code class="PARAMETER">cur</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to an XML node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20755"><span style="white-space: nowrap"><var class="PARAMETER">ids</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20001"><span style="white-space: nowrap"><code class="PARAMETER">ids</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the pointer to a NULL terminated list of ID attributes.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20760"></a><h3>
-<a name="XMLSECGENERATEANDADDID"></a>xmlSecGenerateAndAddID ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecGenerateAndAddID          (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             const <font>xmlChar</font> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
-<p>Generates a unique ID in the format &lt;<var class="PARAMETER">prefix</var>&gt;base64-encoded(<var class="PARAMETER">len</var> random bytes)
-and puts it in the attribute <var class="PARAMETER">attrName</var>.</p>
+<a name="XMLSECGENERATEANDADDID"></a><h3>xmlSecGenerateAndAddID ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecGenerateAndAddID              (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         const <font>xmlChar</font> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<p>Generates a unique ID in the format &lt;<code class="PARAMETER">prefix</code>&gt;base64-encoded(<code class="PARAMETER">len</code> random bytes)
+and puts it in the attribute <code class="PARAMETER">attrName</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20777"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20022"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the node to ID attr to.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20782"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20027"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the ID attr name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20787"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20032"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the prefix to add to the generated ID (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20792"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20037"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the length of ID.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20797"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20042"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20802"></a><h3>
-<a name="XMLSECGENERATEID"></a>xmlSecGenerateID ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecGenerateID                (const <font>xmlChar</font> *prefix,
-                                             <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
-<p>Generates a unique ID in the format &lt;<var class="PARAMETER">prefix</var>&gt;base64-encoded(<var class="PARAMETER">len</var> random bytes).
-The caller is responsible for freeing returned string using <var class="PARAMETER">xmlFree</var> function.</p>
+<a name="XMLSECGENERATEID"></a><h3>xmlSecGenerateID ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecGenerateID                    (const <font>xmlChar</font> *prefix,
+                                                         <a href="xmlsec-xmlsec.html#XMLSECSIZE">xmlSecSize</a> len);</pre>
+<p>Generates a unique ID in the format &lt;<code class="PARAMETER">prefix</code>&gt;base64-encoded(<code class="PARAMETER">len</code> random bytes).
+The caller is responsible for freeing returned string using <code class="PARAMETER">xmlFree</code> function.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20817"><span style="white-space: nowrap"><var class="PARAMETER">prefix</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20061"><span style="white-space: nowrap"><code class="PARAMETER">prefix</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the prefix to add to the generated ID (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20822"><span style="white-space: nowrap"><var class="PARAMETER">len</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20066"><span style="white-space: nowrap"><code class="PARAMETER">len</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>			the length of ID.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20827"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to generated ID string or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20071"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to generated ID string or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20832"></a><h3>
-<a name="XMLSECCREATETREE"></a>xmlSecCreateTree ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>   xmlSecCreateTree                (const <font>xmlChar</font> *rootNodeName,
-                                             const <font>xmlChar</font> *rootNodeNs);</pre>
-<p>Creates a new XML tree with one root node <var class="PARAMETER">rootNodeName</var>.</p>
+<a name="XMLSECCREATETREE"></a><h3>xmlSecCreateTree ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlDocPtr</font>           xmlSecCreateTree                    (const <font>xmlChar</font> *rootNodeName,
+                                                         const <font>xmlChar</font> *rootNodeNs);</pre>
+<p>Creates a new XML tree with one root node <code class="PARAMETER">rootNodeName</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20845"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20088"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the root node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20850"><span style="white-space: nowrap"><var class="PARAMETER">rootNodeNs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20093"><span style="white-space: nowrap"><code class="PARAMETER">rootNodeNs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the root node namespace (otpional).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20855"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the newly created tree or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20098"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the newly created tree or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20860"></a><h3>
-<a name="XMLSECISEMPTYNODE"></a>xmlSecIsEmptyNode ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecIsEmptyNode               (<font>xmlNodePtr</font> node);</pre>
-<p>Checks whethere the <var class="PARAMETER">node</var> is empty (i.e. has only whitespaces children).</p>
+<a name="XMLSECISEMPTYNODE"></a><h3>xmlSecIsEmptyNode ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIsEmptyNode                   (<font>xmlNodePtr</font> node);</pre>
+<p>Checks whethere the <code class="PARAMETER">node</code> is empty (i.e. has only whitespaces children).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20872"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20114"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the node to check</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20877"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if <var class="PARAMETER">node</var> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20119"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">node</code> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20883"></a><h3>
-<a name="XMLSECISEMPTYSTRING"></a>xmlSecIsEmptyString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecIsEmptyString             (const <font>xmlChar</font> *str);</pre>
-<p>Checks whethere the <var class="PARAMETER">str</var> is empty (i.e. has only whitespaces children).</p>
+<a name="XMLSECISEMPTYSTRING"></a><h3>xmlSecIsEmptyString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecIsEmptyString                 (const <font>xmlChar</font> *str);</pre>
+<p>Checks whethere the <code class="PARAMETER">str</code> is empty (i.e. has only whitespaces children).</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20895"><span style="white-space: nowrap"><var class="PARAMETER">str</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20136"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the string to check</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20900"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>1 if <var class="PARAMETER">str</var> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20141"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 1 if <code class="PARAMETER">str</code> is empty, 0 otherwise or a negative value if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20906"></a><h3>
-<a name="XMLSECGETQNAME"></a>xmlSecGetQName ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecGetQName                  (<font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *href,
-                                             const <font>xmlChar</font> *local);</pre>
-<p>Creates QName (prefix:local) from <var class="PARAMETER">href</var> and <var class="PARAMETER">local</var> in the context of the <var class="PARAMETER">node</var>.
+<a name="XMLSECGETQNAME"></a><h3>xmlSecGetQName ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font>*            xmlSecGetQName                      (<font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *href,
+                                                         const <font>xmlChar</font> *local);</pre>
+<p>Creates QName (prefix:local) from <code class="PARAMETER">href</code> and <code class="PARAMETER">local</code> in the context of the <code class="PARAMETER">node</code>.
 Caller is responsible for freeing returned string with xmlFree.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20922"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20162"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the context node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20927"><span style="white-space: nowrap"><var class="PARAMETER">href</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20167"><span style="white-space: nowrap"><code class="PARAMETER">href</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the QName href (can be NULL).</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20932"><span style="white-space: nowrap"><var class="PARAMETER">local</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20172"><span style="white-space: nowrap"><code class="PARAMETER">local</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the QName local part.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20937"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>qname or NULL if an error occurs.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20177"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> qname or NULL if an error occurs.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20942"></a><h3>
-<a name="XMLSECISHEX"></a>xmlSecIsHex()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecIsHex(c)</pre>
-<p>Macro. Returns 1 if <var class="PARAMETER">c</var> is a hex digit or 0 other wise.</p>
+<a name="XMLSECPRINTXMLSTRING"></a><h3>xmlSecPrintXmlString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecPrintXmlString                (<font>FILE</font> *fd,
+                                                         const <font>xmlChar</font> *str);</pre>
+<p>Encodes the <code class="PARAMETER">str</code> (e.g. replaces '&amp;' with '&amp;amp;') and writes it to <code class="PARAMETER">fd</code>.</p>
 <p></p>
 <p></p>
-<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN20952"><span style="white-space: nowrap"><var class="PARAMETER">c</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 			the character.</p></td>
-</tr></tbody></table>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN20195"><span style="white-space: nowrap"><code class="PARAMETER">fd</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>                the file descriptor to write the XML string to</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN20200"><span style="white-space: nowrap"><code class="PARAMETER">str</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p>               the string</p></td>
+</tr>
+<tr>
+<td align="LEFT" valign="TOP"><a name="AEN20205"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> he number of bytes transmitted or a negative value if an error occurs.</p></td>
+</tr>
+</tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20957"></a><h3>
-<a name="XMLSECGETHEX"></a>xmlSecGetHex()</h3>
-<pre class="PROGRAMLISTING">#define     xmlSecGetHex(c)</pre>
-<p>Macro. Returns the hex value of the <var class="PARAMETER">c</var>.</p>
+<a name="XMLSECISHEX"></a><h3>xmlSecIsHex()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecIsHex(c)</pre>
+<p>Macro. Returns 1 if <code class="PARAMETER">c</code> is a hex digit or 0 other wise.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
-<td align="LEFT" valign="TOP"><a name="AEN20967"><span style="white-space: nowrap"><var class="PARAMETER">c</var>:</span></a></td>
-<td align="LEFT" valign="TOP"><p> 			the character,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20219"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 			the character.</p></td>
 </tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20972"></a><h3>
-<a name="XMLSECQNAME2INTEGERINFOCONSTPTR"></a>xmlSecQName2IntegerInfoConstPtr</h3>
-<pre class="PROGRAMLISTING">typedef const xmlSecQName2IntegerInfo *		xmlSecQName2IntegerInfoConstPtr;</pre>
-<p>Pointer to constant QName &lt;-&gt; Integer conversion definition.</p>
+<a name="XMLSECGETHEX"></a><h3>xmlSecGetHex()</h3>
+<pre class="PROGRAMLISTING">#define             xmlSecGetHex(c)</pre>
+<p>Macro. Returns the hex value of the <code class="PARAMETER">c</code>.</p>
 <p></p>
+<p></p>
+<table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody><tr>
+<td align="LEFT" valign="TOP"><a name="AEN20233"><span style="white-space: nowrap"><code class="PARAMETER">c</code> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 			the character,</p></td>
+</tr></tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN20980"></a><h3>
-<a name="XMLSECQNAME2INTEGERINFO"></a>struct xmlSecQName2IntegerInfo</h3>
+<a name="XMLSECQNAME2INTEGERINFO"></a><h3>struct xmlSecQName2IntegerInfo</h3>
 <pre class="PROGRAMLISTING">struct xmlSecQName2IntegerInfo {
-
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     int       		intValue;
@@ -951,368 +932,352 @@ Caller is responsible for freeing returned string with xmlFree.</p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20989"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20246"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the QName href</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN20995"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20252"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the QName local</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21001"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">intValue</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20258"><span style="white-space: nowrap"><font>int</font> <code class="STRUCTFIELD">intValue</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the integer value</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21007"></a><h3>
-<a name="XMLSECQNAME2INTEGERGETINFO"></a>xmlSecQName2IntegerGetInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecQName2IntegerInfoConstPtr</font> xmlSecQName2IntegerGetInfo
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue);</pre>
-<p>Maps integer <var class="PARAMETER">intValue</var> to a QName prefix.</p>
+<a name="XMLSECQNAME2INTEGERINFOCONSTPTR"></a><h3>xmlSecQName2IntegerInfoConstPtr</h3>
+<pre class="PROGRAMLISTING">typedef const xmlSecQName2IntegerInfo *		xmlSecQName2IntegerInfoConstPtr;</pre>
+<p>Pointer to constant QName &lt;-&gt; Integer conversion definition.</p>
+<p></p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECQNAME2INTEGERGETINFO"></a><h3>xmlSecQName2IntegerGetInfo ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecQName2IntegerInfoConstPtr</font>  xmlSecQName2IntegerGetInfo
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue);</pre>
+<p>Maps integer <code class="PARAMETER">intValue</code> to a QName prefix.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21020"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20283"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21025"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20288"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21030"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>the QName info that is mapped to <var class="PARAMETER">intValue</var> or NULL if such value
+<td align="LEFT" valign="TOP"><a name="AEN20293"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> the QName info that is mapped to <code class="PARAMETER">intValue</code> or NULL if such value
 is not found.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21036"></a><h3>
-<a name="XMLSECQNAME2INTEGERGETINTEGER"></a>xmlSecQName2IntegerGetInteger ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerGetInteger   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             const <font>xmlChar</font> *qnameHref,
-                                             const <font>xmlChar</font> *qnameLocalPart,
-                                             <font>int</font> *intValue);</pre>
-<p>Maps qname qname to an integer and returns it in <var class="PARAMETER">intValue</var>.</p>
+<a name="XMLSECQNAME2INTEGERGETINTEGER"></a><h3>xmlSecQName2IntegerGetInteger ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerGetInteger       (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         const <font>xmlChar</font> *qnameHref,
+                                                         const <font>xmlChar</font> *qnameLocalPart,
+                                                         <font>int</font> *intValue);</pre>
+<p>Maps qname qname to an integer and returns it in <code class="PARAMETER">intValue</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21051"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20313"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21056"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20318"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>          the qname href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21061"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20323"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the qname local part value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21066"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20328"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21071"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20333"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21076"></a><h3>
-<a name="XMLSECQNAME2INTEGERGETINTEGERFROMSTRING"></a>xmlSecQName2IntegerGetIntegerFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerGetIntegerFromString
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *qname,
-                                             <font>int</font> *intValue);</pre>
-<p>Converts <var class="PARAMETER">qname</var> into integer in context of <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECQNAME2INTEGERGETINTEGERFROMSTRING"></a><h3>xmlSecQName2IntegerGetIntegerFromString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerGetIntegerFromString
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *qname,
+                                                         <font>int</font> *intValue);</pre>
+<p>Converts <code class="PARAMETER">qname</code> into integer in context of <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21092"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20353"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21097"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20358"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21102"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20363"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the qname string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21107"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20368"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21112"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20373"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21117"></a><h3>
-<a name="XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER"></a>xmlSecQName2IntegerGetStringFromInteger ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecQName2IntegerGetStringFromInteger
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> intValue);</pre>
-<p>Creates qname string for <var class="PARAMETER">intValue</var> in context of given <var class="PARAMETER">node</var>. Caller
-is responsible for freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
+<a name="XMLSECQNAME2INTEGERGETSTRINGFROMINTEGER"></a><h3>xmlSecQName2IntegerGetStringFromInteger ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font> *           xmlSecQName2IntegerGetStringFromInteger
+                                                        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> intValue);</pre>
+<p>Creates qname string for <code class="PARAMETER">intValue</code> in context of given <code class="PARAMETER">node</code>. Caller
+is responsible for freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21133"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20393"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21138"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20398"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21143"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20403"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21148"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated string on success or NULL if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20408"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated string on success or NULL if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21153"></a><h3>
-<a name="XMLSECQNAME2INTEGERNODEREAD"></a>xmlSecQName2IntegerNodeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerNodeRead     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <font>int</font> *intValue);</pre>
-<p>Reads the content of <var class="PARAMETER">node</var> and converts it to an integer using mapping 
-from <var class="PARAMETER">info</var>.</p>
+<a name="XMLSECQNAME2INTEGERNODEREAD"></a><h3>xmlSecQName2IntegerNodeRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerNodeRead         (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <font>int</font> *intValue);</pre>
+<p>Reads the content of <code class="PARAMETER">node</code> and converts it to an integer using mapping 
+from <code class="PARAMETER">info</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21168"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20427"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21173"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20432"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21178"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20437"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21183"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20442"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21188"></a><h3>
-<a name="XMLSECQNAME2INTEGERNODEWRITE"></a>xmlSecQName2IntegerNodeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerNodeWrite    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <font>int</font> intValue);</pre>
-<p>Creates new child node in <var class="PARAMETER">node</var> and sets its value to <var class="PARAMETER">intValue</var>.</p>
+<a name="XMLSECQNAME2INTEGERNODEWRITE"></a><h3>xmlSecQName2IntegerNodeWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerNodeWrite        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <font>int</font> intValue);</pre>
+<p>Creates new child node in <code class="PARAMETER">node</code> and sets its value to <code class="PARAMETER">intValue</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21205"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20463"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21210"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20468"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21215"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20473"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the child node name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21220"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20478"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the child node namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21225"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20483"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21230"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20488"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21235"></a><h3>
-<a name="XMLSECQNAME2INTEGERATTRIBUTEREAD"></a>xmlSecQName2IntegerAttributeRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerAttributeRead
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             <font>int</font> *intValue);</pre>
-<p>Gets the value of <var class="PARAMETER">attrName</var> atrtibute from <var class="PARAMETER">node</var> and converts it to integer
-according to <var class="PARAMETER">info</var>.</p>
+<a name="XMLSECQNAME2INTEGERATTRIBUTEREAD"></a><h3>xmlSecQName2IntegerAttributeRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerAttributeRead    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         <font>int</font> *intValue);</pre>
+<p>Gets the value of <code class="PARAMETER">attrName</code> atrtibute from <code class="PARAMETER">node</code> and converts it to integer
+according to <code class="PARAMETER">info</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21252"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20509"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21257"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20514"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the element node. </p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21262"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20519"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the attribute name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21267"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20524"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the pointer to result integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21272"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20529"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21277"></a><h3>
-<a name="XMLSECQNAME2INTEGERATTRIBUTEWRITE"></a>xmlSecQName2IntegerAttributeWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2IntegerAttributeWrite
-                                            (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *attrName,
-                                             <font>int</font> intValue);</pre>
-<p>Converts <var class="PARAMETER">intValue</var> to a qname and sets it to the value of 
-attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECQNAME2INTEGERATTRIBUTEWRITE"></a><h3>xmlSecQName2IntegerAttributeWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2IntegerAttributeWrite   (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *attrName,
+                                                         <font>int</font> intValue);</pre>
+<p>Converts <code class="PARAMETER">intValue</code> to a qname and sets it to the value of 
+attribute <code class="PARAMETER">attrName</code> in <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21294"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20550"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21299"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20555"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the parent node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21304"><span style="white-space: nowrap"><var class="PARAMETER">attrName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20560"><span style="white-space: nowrap"><code class="PARAMETER">attrName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the name of attribute.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21309"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20565"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21314"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20570"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21319"></a><h3>
-<a name="XMLSECQNAME2INTEGERDEBUGDUMP"></a>xmlSecQName2IntegerDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecQName2IntegerDebugDump    (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints <var class="PARAMETER">intValue</var> into <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECQNAME2INTEGERDEBUGDUMP"></a><h3>xmlSecQName2IntegerDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2IntegerDebugDump        (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints <code class="PARAMETER">intValue</code> into <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21335"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20590"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21340"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20595"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21345"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20600"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21350"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20605"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21355"></a><h3>
-<a name="XMLSECQNAME2INTEGERDEBUGXMLDUMP"></a>xmlSecQName2IntegerDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecQName2IntegerDebugXmlDump (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
-                                             <font>int</font> intValue,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints <var class="PARAMETER">intValue</var> into <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECQNAME2INTEGERDEBUGXMLDUMP"></a><h3>xmlSecQName2IntegerDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2IntegerDebugXmlDump     (<font>xmlSecQName2IntegerInfoConstPtr</font> info,
+                                                         <font>int</font> intValue,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints <code class="PARAMETER">intValue</code> into <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21371"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20625"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21376"><span style="white-space: nowrap"><var class="PARAMETER">intValue</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20630"><span style="white-space: nowrap"><code class="PARAMETER">intValue</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the integer value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21381"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20635"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21386"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20640"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21391"></a><h3>
-<a name="XMLSECBITMASK"></a>xmlSecBitMask</h3>
+<a name="XMLSECBITMASK"></a><h3>xmlSecBitMask</h3>
 <pre class="PROGRAMLISTING">typedef unsigned int                            	xmlSecBitMask;</pre>
 <p>Bitmask datatype.</p>
 <p></p>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21399"></a><h3>
-<a name="XMLSECQNAME2BITMASKINFOCONSTPTR"></a>xmlSecQName2BitMaskInfoConstPtr</h3>
-<pre class="PROGRAMLISTING">typedef const xmlSecQName2BitMaskInfo*		xmlSecQName2BitMaskInfoConstPtr;</pre>
-<p>Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</p>
-<p></p>
-</div>
-<hr>
-<div class="REFSECT2">
-<a name="AEN21407"></a><h3>
-<a name="XMLSECQNAME2BITMASKINFO"></a>struct xmlSecQName2BitMaskInfo</h3>
+<a name="XMLSECQNAME2BITMASKINFO"></a><h3>struct xmlSecQName2BitMaskInfo</h3>
 <pre class="PROGRAMLISTING">struct xmlSecQName2BitMaskInfo {
-
     const xmlChar*      qnameHref;
     const xmlChar*      qnameLocalPart;
     xmlSecBitMask       mask;
@@ -1322,294 +1287,293 @@ attribute <var class="PARAMETER">attrName</var> in <var class="PARAMETER">node</
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21416"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20660"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameHref</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the QName href</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21422"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20666"><span style="white-space: nowrap">const <font>xmlChar</font> *<code class="STRUCTFIELD">qnameLocalPart</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>	the QName local</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21428"><span style="white-space: nowrap"><a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> <code class="STRUCTFIELD">mask</code></span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20672"><span style="white-space: nowrap"><a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> <code class="STRUCTFIELD">mask</code>;</span></a></td>
 <td align="LEFT" valign="TOP"><p>		the bitmask value</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21434"></a><h3>
-<a name="XMLSECQNAME2BITMASKGETINFO"></a>xmlSecQName2BitMaskGetInfo ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlSecQName2BitMaskInfoConstPtr</font> xmlSecQName2BitMaskGetInfo
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
-<p>Converts <var class="PARAMETER">mask</var> to qname.</p>
+<a name="XMLSECQNAME2BITMASKINFOCONSTPTR"></a><h3>xmlSecQName2BitMaskInfoConstPtr</h3>
+<pre class="PROGRAMLISTING">typedef const xmlSecQName2BitMaskInfo*		xmlSecQName2BitMaskInfoConstPtr;</pre>
+<p>Pointer to constant QName &lt;-&gt; Bitmask conversion definition.</p>
+<p></p>
+</div>
+<hr>
+<div class="REFSECT2">
+<a name="XMLSECQNAME2BITMASKGETINFO"></a><h3>xmlSecQName2BitMaskGetInfo ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlSecQName2BitMaskInfoConstPtr</font>  xmlSecQName2BitMaskGetInfo
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<p>Converts <code class="PARAMETER">mask</code> to qname.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21447"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20697"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21452"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20702"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21457"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to the qname info for <var class="PARAMETER">mask</var> or NULL if mask is unknown.</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20707"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to the qname info for <code class="PARAMETER">mask</code> or NULL if mask is unknown.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21463"></a><h3>
-<a name="XMLSECQNAME2BITMASKGETBITMASK"></a>xmlSecQName2BitMaskGetBitMask ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2BitMaskGetBitMask   (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             const <font>xmlChar</font> *qnameLocalPart,
-                                             const <font>xmlChar</font> *qnameHref,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
-<p>Converts <var class="PARAMETER">qnameLocalPart</var> to <var class="PARAMETER">mask</var>.</p>
+<a name="XMLSECQNAME2BITMASKGETBITMASK"></a><h3>xmlSecQName2BitMaskGetBitMask ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskGetBitMask       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         const <font>xmlChar</font> *qnameLocalPart,
+                                                         const <font>xmlChar</font> *qnameHref,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<p>Converts <code class="PARAMETER">qnameLocalPart</code> to <code class="PARAMETER">mask</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21479"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20728"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21484"><span style="white-space: nowrap"><var class="PARAMETER">qnameLocalPart</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20733"><span style="white-space: nowrap"><code class="PARAMETER">qnameLocalPart</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>     the qname LocalPart value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21489"><span style="white-space: nowrap"><var class="PARAMETER">qnameHref</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20738"><span style="white-space: nowrap"><code class="PARAMETER">qnameHref</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>          the qname Href value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21494"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20743"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21499"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20748"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21504"></a><h3>
-<a name="XMLSECQNAME2BITMASKNODESREAD"></a>xmlSecQName2BitMaskNodesRead ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2BitMaskNodesRead    (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> *node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <font>int</font> stopOnUnknown,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
-<p>Reads &lt;<var class="PARAMETER">nodeNs</var>:<var class="PARAMETER">nodeName</var>&gt; elements and puts the result bit mask
-into <var class="PARAMETER">mask</var>. When function exits, <var class="PARAMETER">node</var> points to the first element node
-after all the &lt;<var class="PARAMETER">nodeNs</var>:<var class="PARAMETER">nodeName</var>&gt; elements.</p>
+<a name="XMLSECQNAME2BITMASKNODESREAD"></a><h3>xmlSecQName2BitMaskNodesRead ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskNodesRead        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> *node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <font>int</font> stopOnUnknown,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<p>Reads &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elements and puts the result bit mask
+into <code class="PARAMETER">mask</code>. When function exits, <code class="PARAMETER">node</code> points to the first element node
+after all the &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elements.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21526"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20774"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21531"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20779"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the start.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21536"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20784"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21541"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20789"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21546"><span style="white-space: nowrap"><var class="PARAMETER">stopOnUnknown</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20794"><span style="white-space: nowrap"><code class="PARAMETER">stopOnUnknown</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>	if this flag is set then function exits if unknown
 		value was found.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21551"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20799"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to result mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21556"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20804"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21561"></a><h3>
-<a name="XMLSECQNAME2BITMASKGETBITMASKFROMSTRING"></a>xmlSecQName2BitMaskGetBitMaskFromString ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2BitMaskGetBitMaskFromString
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *qname,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
-<p>Converts <var class="PARAMETER">qname</var> into integer in context of <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECQNAME2BITMASKGETBITMASKFROMSTRING"></a><h3>xmlSecQName2BitMaskGetBitMaskFromString ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskGetBitMaskFromString
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *qname,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> *mask);</pre>
+<p>Converts <code class="PARAMETER">qname</code> into integer in context of <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21577"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20824"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21582"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20829"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21587"><span style="white-space: nowrap"><var class="PARAMETER">qname</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20834"><span style="white-space: nowrap"><code class="PARAMETER">qname</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>              the qname string.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21592"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20839"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to result msk value.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21597"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20844"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21602"></a><h3>
-<a name="XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK"></a>xmlSecQName2BitMaskGetStringFromBitMask ()</h3>
-<pre class="PROGRAMLISTING"><font>xmlChar</font>*    xmlSecQName2BitMaskGetStringFromBitMask
-                                            (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
-<p>Creates qname string for <var class="PARAMETER">mask</var> in context of given <var class="PARAMETER">node</var>. Caller
-is responsible for freeing returned string with <var class="PARAMETER">xmlFree</var>.</p>
+<a name="XMLSECQNAME2BITMASKGETSTRINGFROMBITMASK"></a><h3>xmlSecQName2BitMaskGetStringFromBitMask ()</h3>
+<pre class="PROGRAMLISTING"><font>xmlChar</font> *           xmlSecQName2BitMaskGetStringFromBitMask
+                                                        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<p>Creates qname string for <code class="PARAMETER">mask</code> in context of given <code class="PARAMETER">node</code>. Caller
+is responsible for freeing returned string with <code class="PARAMETER">xmlFree</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21618"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20864"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;integer mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21623"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20869"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the pointer to node.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21628"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20874"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21633"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>pointer to newly allocated string on success or NULL if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20879"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> pointer to newly allocated string on success or NULL if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21638"></a><h3>
-<a name="XMLSECQNAME2BITMASKNODESWRITE"></a>xmlSecQName2BitMaskNodesWrite ()</h3>
-<pre class="PROGRAMLISTING"><font>int</font>         xmlSecQName2BitMaskNodesWrite   (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <font>xmlNodePtr</font> node,
-                                             const <font>xmlChar</font> *nodeName,
-                                             const <font>xmlChar</font> *nodeNs,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
-<p>Writes &lt;<var class="PARAMETER">nodeNs</var>:<var class="PARAMETER">nodeName</var>&gt; elemnts with values from <var class="PARAMETER">mask</var> to <var class="PARAMETER">node</var>.</p>
+<a name="XMLSECQNAME2BITMASKNODESWRITE"></a><h3>xmlSecQName2BitMaskNodesWrite ()</h3>
+<pre class="PROGRAMLISTING"><font>int</font>                 xmlSecQName2BitMaskNodesWrite       (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <font>xmlNodePtr</font> node,
+                                                         const <font>xmlChar</font> *nodeName,
+                                                         const <font>xmlChar</font> *nodeNs,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask);</pre>
+<p>Writes &lt;<code class="PARAMETER">nodeNs</code>:<code class="PARAMETER">nodeName</code>&gt; elemnts with values from <code class="PARAMETER">mask</code> to <code class="PARAMETER">node</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21657"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20902"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21662"><span style="white-space: nowrap"><var class="PARAMETER">node</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20907"><span style="white-space: nowrap"><code class="PARAMETER">node</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the parent element for mask nodes.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21667"><span style="white-space: nowrap"><var class="PARAMETER">nodeName</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20912"><span style="white-space: nowrap"><code class="PARAMETER">nodeName</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>           the mask nodes name.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21672"><span style="white-space: nowrap"><var class="PARAMETER">nodeNs</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20917"><span style="white-space: nowrap"><code class="PARAMETER">nodeNs</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the mask nodes namespace.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21677"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20922"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21682"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
-<td align="LEFT" valign="TOP"><p>0 on success or a negative value if an error occurs,</p></td>
+<td align="LEFT" valign="TOP"><a name="AEN20927"><span style="white-space: nowrap"><span class="emphasis"><i class="EMPHASIS">Returns</i></span> :</span></a></td>
+<td align="LEFT" valign="TOP"><p> 0 on success or a negative value if an error occurs,</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21687"></a><h3>
-<a name="XMLSECQNAME2BITMASKDEBUGDUMP"></a>xmlSecQName2BitMaskDebugDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecQName2BitMaskDebugDump    (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">mask</var> to <var class="PARAMETER">output</var>.</p>
+<a name="XMLSECQNAME2BITMASKDEBUGDUMP"></a><h3>xmlSecQName2BitMaskDebugDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2BitMaskDebugDump        (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">mask</code> to <code class="PARAMETER">output</code>.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21703"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20947"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21708"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20952"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21713"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20957"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21718"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20962"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 <hr>
 <div class="REFSECT2">
-<a name="AEN21723"></a><h3>
-<a name="XMLSECQNAME2BITMASKDEBUGXMLDUMP"></a>xmlSecQName2BitMaskDebugXmlDump ()</h3>
-<pre class="PROGRAMLISTING"><font>void</font>        xmlSecQName2BitMaskDebugXmlDump (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
-                                             <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
-                                             const <font>xmlChar</font> *name,
-                                             <font>FILE</font> *output);</pre>
-<p>Prints debug information about <var class="PARAMETER">mask</var> to <var class="PARAMETER">output</var> in XML format.</p>
+<a name="XMLSECQNAME2BITMASKDEBUGXMLDUMP"></a><h3>xmlSecQName2BitMaskDebugXmlDump ()</h3>
+<pre class="PROGRAMLISTING"><font>void</font>                xmlSecQName2BitMaskDebugXmlDump     (<font>xmlSecQName2BitMaskInfoConstPtr</font> info,
+                                                         <a href="xmlsec-xmltree.html#XMLSECBITMASK">xmlSecBitMask</a> mask,
+                                                         const <font>xmlChar</font> *name,
+                                                         <font>FILE</font> *output);</pre>
+<p>Prints debug information about <code class="PARAMETER">mask</code> to <code class="PARAMETER">output</code> in XML format.</p>
 <p></p>
 <p></p>
 <table class="variablelist" border="0" cellspacing="0" cellpadding="4"><tbody>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21739"><span style="white-space: nowrap"><var class="PARAMETER">info</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20982"><span style="white-space: nowrap"><code class="PARAMETER">info</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the qname&lt;-&gt;bit mask mapping information.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21744"><span style="white-space: nowrap"><var class="PARAMETER">mask</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20987"><span style="white-space: nowrap"><code class="PARAMETER">mask</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>               the bit mask.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21749"><span style="white-space: nowrap"><var class="PARAMETER">name</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20992"><span style="white-space: nowrap"><code class="PARAMETER">name</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p> 		the value name to print.</p></td>
 </tr>
 <tr>
-<td align="LEFT" valign="TOP"><a name="AEN21754"><span style="white-space: nowrap"><var class="PARAMETER">output</var>:</span></a></td>
+<td align="LEFT" valign="TOP"><a name="AEN20997"><span style="white-space: nowrap"><code class="PARAMETER">output</code> :</span></a></td>
 <td align="LEFT" valign="TOP"><p>             the pointer to output FILE.</p></td>
 </tr>
 </tbody></table>
 </div>
 </div>
 <table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td align="left"><a accesskey="p" href="xmlsec-xmlsec.html"><b>&lt;&lt;&lt;xmlsec</b></a></td>
-<td align="right"><a accesskey="n" href="xmlsec-x509.html"><b>x509&gt;&gt;&gt;</b></a></td>
+<td align="left"><a accesskey="p" href="xmlsec-xmlsec.html"><b>&lt;&lt;&lt; xmlsec</b></a></td>
+<td align="right"><a accesskey="n" href="xmlsec-x509.html"><b>x509 &gt;&gt;&gt;</b></a></td>
 </tr></table>
 </td></tr></table></td>
 </tr></table></body>
diff --git a/docs/download.html b/docs/download.html
index 0952d89..cf19ef3 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -47,10 +47,10 @@
       <h1>Download</h1>
       </div>
 <h2>Stable releases.</h2>
-<p>The latest stable XML Security Library version is <b>1.2.13</b>:</p>
+<p>The latest stable XML Security Library version is <b>1.2.14</b>:</p>
 <ul>
 <li>
-        <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.13.tar.gz";>Sources 
+        <a href="http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.14.tar.gz";>Sources 
 	for latest version</a>.
     </li>
     <li>
diff --git a/docs/index.html b/docs/index.html
index 3e101cb..3ca9ed1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -72,12 +72,25 @@
      	    see the Copyright file in the distribution  for details.<br><br></p>
 <p><b>News</b></p>
 <ul>
+<li>December 5 2009<br>
+	Changes in <a href="download.html">XML Security Library 1.2.14</a> release:
+	<ul>
+<li>XMLSec library is switched from built-in LTDL library to the system 
+	LTDL library on Linux/Unix and native calls on Windows to fix 
+	<a href="https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2009-3736";>security 
+	issue</a> in LTDL.</li>
+	<li>Fixed minor bugs (see <a href="http://git.gnome.org/cgit/xmlsec/log/";>log</a> 
+	for complete list).</li>
+	</ul>
+</li>
+
 <li>September 12 2009<br>
 	Changes in <a href="download.html">XML Security Library 1.2.13</a> release:
 	<ul>
 <li>
-<a href="http://xmlsoft.org/";>LibXML2</a> version 2.7.4 is now required</li>
-	<li>Implemented support for <a href="http://www.w3.org/TR/xml-c14n11/";>C14N version 1.1</a></li>
+	<a href="http://xmlsoft.org/";>LibXML2</a> version 2.7.4 is now required</li>
+	<li>Implemented support for <a href="http://www.w3.org/TR/xml-c14n11/";>C14N version 1.1</a>
+</li>
 	<li>Increase default minimum hmac size to 80 bits</li>
 	<li>Added support for --with-libxml-src and --with-libxslt-src ./configure options</li>
 	<li>Fixed XML dump output</li>
@@ -99,30 +112,6 @@
 	<li>Bug fixes.</li>
 	</ul>
 </li>
-<li>November 6 2007<br>
-	The new <a href="download.html">XML Security Library 1.2.11</a> release
-	includes the following changes:
-	<ul>
-<li>Mingw port (Roumen Petrov).</li>
-	<li>Better support for non micorsoft CSP's (Wouter and Ed Shallow).</li>
-	<li>Bug fixes.</li>
-	</ul>
-</li>
-<li>June 12 2006<br>
-	The new <a href="download.html">XML Security Library 1.2.10</a> release
-	includes the following changes:
-	<ul>
-<li>GOST algorithms support (Dmitry Belyavsky)</li>
-	<li>Ability to disable system trusted certs in xmlsec-mscrypto 
-	(Dmitry Belyavsky)</li>
-	<li>New functions for adding X509IssuerName and X509SerialNumber 
-	nodes to the template (Dmitry Belyavsky)
-	</li>
-<li>Better packaging support for Fedora and Debian (Daniel Veillard, John Belmonte)</li>
-	<li>Cleanups from Coverity tool reports</li>
-	<li>Bug fixes</li>
-	</ul>
-</li>
 
 </ul>
 </td></tr></table></td>
diff --git a/docs/news.html b/docs/news.html
index 75a6839..63d032f 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -47,12 +47,25 @@
       <h1>XML Security Library News</h1>
       </div>
 <ul>
+<li>December 5 2009<br>
+	Changes in <a href="download.html">XML Security Library 1.2.14</a> release:
+	<ul>
+<li>XMLSec library is switched from built-in LTDL library to the system 
+	LTDL library on Linux/Unix and native calls on Windows to fix 
+	<a href="https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2009-3736";>security 
+	issue</a> in LTDL.</li>
+	<li>Fixed minor bugs (see <a href="http://git.gnome.org/cgit/xmlsec/log/";>log</a> 
+	for complete list).</li>
+	</ul>
+</li>
+
 <li>September 12 2009<br>
 	Changes in <a href="download.html">XML Security Library 1.2.13</a> release:
 	<ul>
 <li>
 <a href="http://xmlsoft.org/";>LibXML2</a> version 2.7.4 is now required</li>
-	<li>Implemented support for <a href="http://www.w3.org/TR/xml-c14n11/";>C14N version 1.1</a></li>
+	<li>Implemented support for <a href="http://www.w3.org/TR/xml-c14n11/";>C14N version 1.1</a>
+</li>
 	<li>Increase default minimum hmac size to 80 bits</li>
 	<li>Added support for --with-libxml-src and --with-libxslt-src ./configure options</li>
 	<li>Fixed XML dump output</li>
diff --git a/docs/xmlsec-man.html b/docs/xmlsec-man.html
index 14af046..39b6ab6 100644
--- a/docs/xmlsec-man.html
+++ b/docs/xmlsec-man.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Manpage of XMLSEC1</title>
+<title>Man page of XMLSEC1</title>
 </head>
 <body><table witdh="100%" valign="top"><tr valign="top">
 <td valign="top" align="left" width="210">
@@ -44,14 +44,10 @@
 </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: July 2009<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 - sign, verify, encrypt and decrypt XML documents <a name="lbAC"></a> </p>
-<h2>SYNOPSIS</h2>
-<b>xmlsec</b><i>&lt;command&gt; </i><p>[<i>&lt;options&gt;</i>] [<i>&lt;files&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>
+<br><br><a href="#index">Index</a><a href="/cgi-bin/man/man2html">Return to Main Contents</a><hr>
+<a name="lbAB"> </a><h2>NAME</h2>
+<a name="lbAC"> </a><h2>SYNOPSIS</h2>
+<b>xmlsec</b><i>&lt;command&gt; </i><i>&lt;options&gt;</i><i>&lt;files&gt;</i><a name="lbAD"> </a><h2>DESCRIPTION</h2>
 <dl compact>
 <dt><b>--help</b></dt>
 <dd> display this help information and exit </dd>
@@ -75,7 +71,7 @@
 <dt><b>--decrypt</b></dt>
 <dd> decrypt data from XML document </dd>
 </dl>
-<a name="lbAE"></a><h2>OPTIONS</h2>
+<a name="lbAE"> </a><h2>OPTIONS</h2>
 <dl compact>
 <dt> <b>--ignore-manifests</b> <dt></dt>
 </dt>
@@ -241,6 +237,10 @@
 </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 from the following list: openssl, gnutls, nss, mscrypto (if no crypto engine is specified then the default one is used) </dd>
+</dd>
 <dt> <b>--crypto-config</b> &lt;path&gt; <dt></dt>
 </dt>
 <dd> <dd>path to crypto engine configuration </dd>
@@ -262,15 +262,12 @@
 <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>
+<a name="lbAF"> </a><h2>AUTHOR</h2>
+<a href="mailto:aleksey aleksey com">aleksey aleksey com</a><a name="lbAG"> </a><h2>REPORTING BUGS</h2>
+<a href="http://www.aleksey.com/xmlsec/bugs.html";>http://www.aleksey.com/xmlsec/bugs.html</a><a name="lbAH"> </a><h2>COPYRIGHT</h2>
+<br><p>  </p>
 <hr>
-<a name="index"></a><h2>Index</h2>
+<a name="index"> </a><h2>Index</h2>
 <dl>
 <dt><a href="#lbAB">NAME</a></dt>
 <dd> </dd>
@@ -288,7 +285,7 @@
 <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: 18:00:42 GMT, July 17, 2009 </p>
+<a href="/cgi-bin/man/man2html">man2html</a><br>
 </td></tr></table></td>
 </tr></table></body>
 </html>
diff --git a/docs/xmlsec.xsl b/docs/xmlsec.xsl
index 6cf3328..4cf2aa9 100644
--- a/docs/xmlsec.xsl
+++ b/docs/xmlsec.xsl
@@ -3,6 +3,8 @@
     <xsl:param name="topfolder"></xsl:param>
 
     <xsl:template name="linkto">
+	<xsl:param name="href"/>
+	<xsl:param name="text"/>
 	<xsl:element name="a"> 
 	    <xsl:attribute name="href">
 		<xsl:value-of select="$topfolder"/>
@@ -13,6 +15,8 @@
     </xsl:template>
 
     <xsl:template name="myimg">
+	<xsl:param name="src"/>
+	<xsl:param name="alt"/>
 	<xsl:element name="img"> 
 	    <xsl:attribute name="src">
 		<xsl:value-of select="$topfolder"/>
@@ -24,7 +28,7 @@
 	    <xsl:attribute name="border">0</xsl:attribute>
 	</xsl:element>
     </xsl:template>
-    
+
     <xsl:template match="/">
 
 <html>
diff --git a/man/xmlsec1-config.1 b/man/xmlsec1-config.1
index c8b239e..b5315c5 100644
--- a/man/xmlsec1-config.1
+++ b/man/xmlsec1-config.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
-.TH XMLSEC1-CONFIG "1" "July 2009" "xmlsec1-config 1.2.12" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH XMLSEC1-CONFIG "1" "December 2009" "xmlsec1-config 1.2.13" "User Commands"
 .SH NAME
 xmlsec1-config \- detail installed version of xmlsec library
 .SH SYNOPSIS
@@ -18,7 +18,7 @@ change XMLSEC executable prefix
 print library linking information
 .TP
 \fB\-\-cflags\fR
-print pre-processor and compiler flags
+print pre\-processor and compiler flags
 .TP
 \fB\-\-crypto\fR
 print the default crypto library name
diff --git a/man/xmlsec1.1 b/man/xmlsec1.1
index e42f788..7f9ebde 100644
--- a/man/xmlsec1.1
+++ b/man/xmlsec1.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
-.TH XMLSEC1 "1" "July 2009" "xmlsec1 1.2.13 (openssl)" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH XMLSEC1 "1" "December 2009" "xmlsec1 1.2.13 (openssl)" "User Commands"
 .SH NAME
 xmlsec1 \- sign, verify, encrypt and decrypt XML documents
 .SH SYNOPSIS
@@ -57,7 +57,7 @@ just before calculating signature
 \fB\-\-enabled\-reference\-uris\fR <list>
 .IP
 comma separated list of of the following values:
-"empty", "same-doc", "local","remote" to restrict possible URI
+"empty", "same\-doc", "local","remote" to restrict possible URI
 attribute values for the <dsig:Reference> element
 .HP
 \fB\-\-enable\-visa3d\-hack\fR
@@ -65,7 +65,7 @@ attribute values for the <dsig:Reference> element
 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)
+you use it (also check "\-\-id\-attr" option because you might need it)
 .HP
 \fB\-\-binary\-data\fR <file>
 .IP
@@ -78,13 +78,13 @@ XML <file> to encrypt
 \fB\-\-enabled\-cipher\-reference\-uris\fR <list>
 .IP
 comma separated list of of the following values:
-"empty", "same-doc", "local","remote" to restrict possible URI
+"empty", "same\-doc", "local","remote" to restrict possible URI
 attribute values for the <enc:CipherReference> element
 .HP
-\fB\-\-session\-key\fR <keyKlass>-<keySize>
+\fB\-\-session\-key\fR <keyKlass>\-<keySize>
 .IP
 generate new session <keyKlass> key of <keySize> bits size
-(for example, "--session des-192" generates a new 192 bits
+(for example, "\-\-session des\-192" generates a new 192 bits
 DES key for DES3 encryption)
 .HP
 \fB\-\-output\fR <filename>
@@ -107,7 +107,7 @@ load the specified file as the DTD
 .IP
 set the operation start point to the node with given <id>
 .HP
-\fB\-\-node\-name\fR [<namespace-uri>:]<name>
+\fB\-\-node\-name\fR [<namespace\-uri>:]<name>
 .IP
 set the operation start point to the first node
 with given <name> and <namespace> URI
@@ -117,32 +117,32 @@ with given <name> and <namespace> URI
 set the operation start point to the first node
 selected by the specified XPath expression
 .HP
-\fB\-\-id\-attr[\fR:<attr-name>] [<node-namespace-uri>:]<node-name>
+\fB\-\-id\-attr[\fR:<attr\-name>] [<node\-namespace\-uri>:]<node\-name>
 .IP
-adds attributes <attr-name> (default value "id") from all nodes
-with<node-name> and namespace <node-namespace-uri> to the list of
+adds attributes <attr\-name> (default value "id") from all nodes
+with<node\-name> and namespace <node\-namespace\-uri> 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),
+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
 .HP
 \fB\-\-enabled\-key\-data\fR <list>
 .IP
 comma separated list of enabled key data (list of
-registered key data klasses is available with "--list-key-data"
+registered key data klasses is available with "\-\-list\-key\-data"
 command); by default, all registered key data are enabled
 .HP
 \fB\-\-enabled\-retrieval\-uris\fR <list>
 .IP
 comma separated list of of the following values:
-"empty", "same-doc", "local","remote" to restrict possible URI
+"empty", "same\-doc", "local","remote" to restrict possible URI
 attribute values for the <dsig:RetrievalMethod> element.
 .HP
-\fB\-\-gen\-key[\fR:<name>] <keyKlass>-<keySize>
+\fB\-\-gen\-key[\fR:<name>] <keyKlass>\-<keySize>
 .IP
 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
+manager (for example, "\-\-gen:mykey rsa\-1024" generates
 a new 1024 bits RSA key and sets it's name to "mykey")
 .HP
 \fB\-\-keys\-file\fR <file>
@@ -223,7 +223,7 @@ load untrusted certificate from DER file <file>
 .HP
 \fB\-\-verification\-time\fR <time>
 .IP
-the local time in "YYYY-MM-DD HH:MM:SS" format
+the local time in "YYYY\-MM\-DD HH:MM:SS" format
 used certificates verification
 .HP
 \fB\-\-depth\fR <number>
@@ -234,6 +234,12 @@ maximum certificates chain depth
 .IP
 skip strict checking of X509 data
 .HP
+\fB\-\-crypto\fR <name>
+.IP
+the name of the crypto engine to use from the following
+list: openssl, gnutls, nss, mscrypto (if no crypto engine is
+specified then the default one is used)
+.HP
 \fB\-\-crypto\-config\fR <path>
 .IP
 path to crypto engine configuration



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]